merge with master

.Rbuildignore

@@ -14,3 +14,6 @@
 ^cran-comments\.Rmd$
 ^CRAN-RELEASE$
 ^CRAN-SUBMISSION$
+^.github$
+^\.vscode$
+^[.]?air[.]toml$

.github/workflows/rhub.yaml

@@ -0,0 +1,95 @@
+# R-hub's generic GitHub Actions workflow file. It's canonical location is at
+# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
+# You can update this file to a newer version using the rhub2 package:
+#
+# rhub::rhub_setup()
+#
+# It is unlikely that you need to modify this file manually.
+
+name: R-hub
+run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"
+
+on:
+  workflow_dispatch:
+    inputs:
+      config:
+        description: 'A comma separated list of R-hub platforms to use.'
+        type: string
+        default: 'linux,windows,macos'
+      name:
+        description: 'Run name. You can leave this empty now.'
+        type: string
+      id:
+        description: 'Unique ID. You can leave this empty now.'
+        type: string
+
+jobs:
+
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      containers: ${{ steps.rhub-setup.outputs.containers }}
+      platforms: ${{ steps.rhub-setup.outputs.platforms }}
+
+    steps:
+    # NO NEED TO CHECKOUT HERE
+    - uses: r-hub/actions/setup@v1
+      with:
+        config: ${{ github.event.inputs.config }}
+      id: rhub-setup
+
+  linux-containers:
+    needs: setup
+    if: ${{ needs.setup.outputs.containers != '[]' }}
+    runs-on: ubuntu-latest
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.containers) }}
+    container:
+      image: ${{ matrix.config.container }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+
+  other-platforms:
+    needs: setup
+    if: ${{ needs.setup.outputs.platforms != '[]' }}
+    runs-on: ${{ matrix.config.os }}
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.platforms) }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/setup-r@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}

.github/workflows/static.yml

@@ -0,0 +1,43 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: '.'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -10,3 +10,5 @@ doc
 .Rdata
 .httr-oauth
 .DS_Store
+
+/.quarto/

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "Posit.air-vscode"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "[r]": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "Posit.air-vscode"
+    },
+    "[quarto]": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "quarto.quarto"
+    }
+}

CRAN-SUBMISSION

@@ -1,3 +1,3 @@
-Version: 1.8.0
-Date: 2023-01-20 09:19:22 UTC
-SHA: bc2651de37613b4351adf40dc2b17f7e87827287
+Version: 2.0.0
+Date: 2025-10-02 16:31:06 UTC
+SHA: f23b8b90b688ac77270b5052454329888875d542

DESCRIPTION

@@ -1,46 +1,46 @@
 Package: dscore
 Type: Package
 Title: D-Score for Child Development
-Version: 1.8.7
+Version: 2.0.5
 Authors@R: c(person("Stef", "van Buuren", email = "stef.vanbuuren@tno.nl", role = c("cre", "aut")), 
              person("Iris", "Eekhout", email = "iris.eekhout@tno.nl", role = "aut"),
-             person("Arjan", "Huizing", email = "arjan.huizing@tno.nl", role = "aut"))
-Description: The D-score is a quantitative measure of child development. 
-    The D-score follows the Rasch model. See Jacobusse, van Buuren and 
-    Verkerk (2006) <doi:10.1002/sim.2351>. The user can convert 
-    milestone scores from many assessment instruments into the D-score 
-    and the DAZ (D-score adjusted for age). Several tools assist in 
-    mapping milestone names into the 9-position Global Scale of Early 
-    Development (GSED) convention. Supports calculation of the D-score 
-    using 'dutch' <doi:10.1177/0962280212473300>, 
-    'gcdg' <doi:10.1136/bmjgh-2019-001724> and 'gsed' conversion keys.
-    The user can calculate DAZ using 'phase1' (default), 'gcdg' and 'dutch' 
-    age-conditional references.
+             person("Arjan", "Huizing", email = "arjan.huizing@tno.nl", role = "aut"),
+             person("Jonathan", "Seiden", email = "jseiden@g.harvard.edu", role = "aut"))
+Description:
+    The D-score summarizes a child's performance on developmental milestones
+    into a single number. Its key feature is its generic nature. The method
+    does not depend on a specific measurement instrument. The statistical
+    method underlying the D-score is described in van Buuren et al. (2025)
+    <doi:10.1177/01650254241294033>. This package implements model keys to
+    convert milestone scores to D-scores; maps instrument-specific item names
+    to a generic 9-position naming convention; computes D-scores and their
+    precision from a child's milestone scores; and converts D-scores to
+    Development-for-Age Z-scores (DAZ) using age-conditional reference
+    standards.
 Depends:
-    R (>= 3.5)
+    R (>= 4.1.0)
 Imports:
     dplyr (>= 1.0.0),
     Rcpp,
     stats,
-    stringr,
-    tidyr (>= 1.0.0),
-    tidyselect (>= 1.0.0)
+    stringi,
+    tidyr (>= 1.0.0)
 LinkingTo: Rcpp, RcppArmadillo
 Suggests:
     ggplot2,
     kableExtra,
     knitr,
     lme4,
+    Matrix,
     patchwork,
     rmarkdown,
     testthat
 Encoding: UTF-8
-License: AGPL-3
+License: Apache License (>= 2)
 LazyData: TRUE
 VignetteBuilder: knitr
 NeedsCompilation: yes
 URL: https://github.com/d-score/dscore, https://d-score.org/dscore/, https://d-score.org/dbook1/
 BugReports: https://github.com/d-score/dscore/issues
-Copyright: Stef van Buuren, Iris Eekhout, Arjan Huizing
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.3