diff --git a/.github/actions/render/action.yml b/.github/actions/render/action.yml index df87d2fad..02f8c0f4f 100644 --- a/.github/actions/render/action.yml +++ b/.github/actions/render/action.yml @@ -6,7 +6,7 @@ inputs: default: 'master' DITA_OT_VERSION: description: 'DITA-OT version used for rendering' - default: '4.0.1' + default: '4.1.2' runs: using: 'composite' steps: @@ -23,7 +23,6 @@ runs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 - - name: Download website plug-in shell: bash run: | @@ -33,7 +32,6 @@ runs: with: path: dita-ot-${{ inputs.DITA_OT_VERSION }} key: ${{ runner.os }}-dita-ot-${{ inputs.DITA_OT_VERSION }} - - name: Download stable DITA-OT shell: bash run: | @@ -44,7 +42,6 @@ runs: echo "Use cached dita-ot-${{ inputs.DITA_OT_VERSION }}" fi dita-ot-${{ inputs.DITA_OT_VERSION }}/bin/dita install org.dita-ot.html.zip --force -v - - name: Get develop DITA-OT ETag shell: bash run: | @@ -66,7 +63,6 @@ runs: echo "Use cached dita-ot-develop" fi echo "DITA_OT_DEV=$(find dita-ot-develop -name 'dita-ot-*@*' -type d | head -1)" >> $GITHUB_ENV - - name: Run DITA-OT shell: bash run: | diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 48553d2d7..3294a8677 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -10,4 +10,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/wrapper-validation-action@v2 diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 2707f3efa..2f90d6b2c 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -23,7 +23,7 @@ jobs: ref: ${{ github.ref }} - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18.x' cache: 'npm' diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 1cd40dffc..8b7f6ff9c 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -29,7 +29,7 @@ jobs: uses: ./.github/actions/render - name: Cache NPM - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} @@ -47,7 +47,7 @@ jobs: rm -fr build - name: Cache gems - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: vendor/bundle key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dca91cd04..1a8bd3145 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,6 @@ # This workflow builds changes to release tag and commits to website repo for release PR name: Generate website release PR - on: workflow_dispatch: inputs: @@ -13,13 +12,12 @@ on: required: true repository_dispatch: types: [release] - jobs: deploy: runs-on: ubuntu-latest env: WEBSITE_PLUGIN_BRANCH: 'master' - DITA_OT_VERSION: '4.0.1' + DITA_OT_VERSION: '4.1.2' steps: - name: Parse arguments run: | @@ -34,35 +32,29 @@ jobs: else echo "TAG=${{ github.event.inputs.docs-tag }}" >> $GITHUB_ENV fi - - name: Check out docs uses: actions/checkout@v4 with: ref: ${{ env.TAG }} - - name: Set variables run: | echo "GITHUB_SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 - - name: Check out website uses: actions/checkout@v4 with: repository: dita-ot/website token: ${{ secrets.COMMITTER_TOKEN }} path: website - - name: Download website plug-in run: | curl -sL https://github.com/dita-ot/org.dita-ot.html/archive/refs/heads/${{ env.WEBSITE_PLUGIN_BRANCH }}.zip -o org.dita-ot.html.zip - - name: Cache render DITA-OT - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: dita-ot-${{ env.DITA_OT_VERSION }} key: ${{ runner.os }}-dita-ot-${{ env.DITA_OT_VERSION }} @@ -75,14 +67,12 @@ jobs: echo "Use cached dita-ot-${{ env.DITA_OT_VERSION }}" fi dita-ot-${{ env.DITA_OT_VERSION }}/bin/dita install org.dita-ot.html.zip --force -v - - name: Download release DITA-OT run: | curl -sL https://github.com/dita-ot/dita-ot/releases/download/$VERSION/dita-ot-$VERSION.zip -o dita-ot-$VERSION.zip unzip dita-ot-$VERSION.zip -d src-dita-ot env: VERSION: ${{ github.event.inputs.dita-ot-version }} - - name: Run DITA-OT run: | ./gradlew site \ @@ -96,9 +86,8 @@ jobs: WEBSITE_DIR: ${{ github.workspace }}/website DITA_HOME: ${{ github.workspace }}/dita-ot-${{ env.DITA_OT_VERSION }} RELEASE_DITA_OT: ${{ github.workspace }}/src-dita-ot/dita-ot-${{ github.event.inputs.dita-ot-version }} - - name: Create release PR - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: branch: release/${{ github.event.inputs.dita-ot-version }} title: 'Update site for ${{ github.event.inputs.dita-ot-version }}' @@ -112,7 +101,46 @@ jobs: commit-message: 'Update ‘${{ env.RELEASE }}’ docs for ${{ github.event.inputs.dita-ot-version }}' committer: 'DITA-OT Bot ' signoff: true - token: ${{ secrets.COMMITTER_TOKEN }} + token: ${{ secrets.DOCS_RELEASE_TOKEN }} path: website labels: | release-updates + + update-ci: + runs-on: ubuntu-latest + steps: + - name: Parse arguments + run: | + if [[ -n "${{ github.event.client_payload.dita_ot_version }}" ]]; then + echo "VERSION=${{ github.event.client_payload.dita_ot_version }}" >> $GITHUB_ENV + else + echo "VERSION=${{ github.event.inputs.dita-ot-version }}" >> $GITHUB_ENV + fi + + - name: Check out docs + uses: actions/checkout@v4 + with: + ref: develop + + - name: Update GitHub Actions release workflow + uses: mikefarah/yq@master + with: + cmd: yq -i '.jobs.deploy.env.DITA_OT_VERSION = "${{ env.VERSION }}"' '.github/workflows/release.yml' + - name: Update GitHub Actions render action + uses: mikefarah/yq@master + with: + cmd: yq -i '.inputs.DITA_OT_VERSION.default = "${{ env.VERSION }}"' '.github/actions/render/action.yml' + + - name: Create release PR + uses: peter-evans/create-pull-request@v6 + with: + branch: feature/update-github-actions-${{ env.VERSION }} + title: 'Update docs GitHub Actions for ${{ env.VERSION }}' + body: | + Update docs GitHub Actions for ${{ env.VERSION }}. + commit-message: 'Update GitHub Actions for ${{ env.VERSION }}' + committer: 'DITA-OT Bot ' + signoff: true + token: ${{ secrets.DOCS_RELEASE_TOKEN }} + labels: | + release-updates diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af21989..2312dc587 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - npx lint-staged diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index d7e86470e..000000000 --- a/.prettierrc.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "arrowParens": "avoid", - "bracketSpacing": false, - "endOfLine": "lf", - "htmlWhitespaceSensitivity": "css", - "bracketSameLine": false, - "printWidth": 120, - "proseWrap": "preserve", - "requirePragma": false, - "semi": true, - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "all", - "useTabs": false, - "vueIndentScriptAndStyle": true, - "xmlSelfClosingSpace": false, - "xmlWhitespaceSensitivity": "strict", - "overrides": [ - { - "files": "external-links.ditamap", - "options": { - "printWidth": 80 - } - }, - { - "files": "source-files.ditamap", - "options": { - "printWidth": 200 - } - }, - { - "files": "*.json", - "options": { - "printWidth": 200 - } - } - ], - "plugins": ["@prettier/plugin-xml"] -} diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 000000000..161990d58 --- /dev/null +++ b/.prettierrc.yml @@ -0,0 +1,35 @@ +# Prettier Configuration File + +# https://prettier.io/docs/en/configuration.html + +arrowParens: avoid +bracketSameLine: false +bracketSpacing: false +endOfLine: lf +htmlWhitespaceSensitivity: css +printWidth: 120 +proseWrap: preserve +requirePragma: false +semi: true +singleQuote: true +tabWidth: 2 +trailingComma: all +useTabs: false +vueIndentScriptAndStyle: true +xmlSelfClosingSpace: false +xmlWhitespaceSensitivity: strict + +# Override configuration for certain files +overrides: + - files: external-links.ditamap + options: + printWidth: 80 + - files: source-files.ditamap + options: + printWidth: 200 + - files: '*.json' + options: + printWidth: 200 + +plugins: + - '@prettier/plugin-xml' diff --git a/README.md b/README.md index 2e32578ea..6f86bfac2 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ You must have a JRE and a local installation of DITA-OT. There is no need to dow 1. Open a command prompt, and change to the directory of your docs repository clone. 2. Type a variant of the following command for your operating system, adjust the path to your DITA-OT installation, and press Enter: - - On Linux or macOS, use `./gradlew`: + - On **Linux**, **macOS**, or **Git Bash**, use `./gradlew`: ./gradlew -PditaHome=/path/to/dita-ot @@ -37,18 +37,31 @@ You must have a JRE and a local installation of DITA-OT. There is no need to dow gradlew.bat -PditaHome=C:\path\to\dita-ot -
- Using a `dita-ot` repository clone +
+Alternative: Using a DITA-OT repository clone + +If you’re using a clone of the [DITA-OT development repository][5] as your toolkit installation alongside your clone of the `docs` repository: + +1. In the root directory of your `dita-ot` repository, run Gradle to compile the Java code and install plugins. + + - On **Linux**, **macOS**, or **Git Bash**, use `./gradlew`. + - On **Windows**, use `gradlew.bat`. + +2. Then run the Gradle build in the `docs` repository to generate topics and build the documentation output. - - If you’re using a clone of the [DITA-OT development repository][5] as your toolkit installation alongside your clone of the docs repository, run the build script on **Linux** or **macOS** like this: + - On **Linux**, **macOS**, or **Git Bash**, run the build script like this: - ./gradlew -PditaHome=../dita-ot/src/main + ./gradlew -PditaHome=../dita-ot/src/main - - You can also specify a single output format. To build HTML output, enter the following on the command line: + - On **Windows**, use `gradlew.bat`: + + gradlew.bat -PditaHome=C:\path\to\dita-ot\src\main + +
- ./gradlew -PditaHome=../dita-ot/src/main html +You can also specify a single output format. To build HTML for example, add `html` to the end of the command: -
+ ./gradlew -PditaHome=/path/to/dita-ot html ### Results @@ -125,7 +138,7 @@ If you'd like to check whether your changes are formatted correctly, or format t [4]: https://www.dita-ot.org [5]: https://github.com/dita-ot/dita-ot [6]: https://s3-eu-west-1.amazonaws.com/dita-ot/dita-ot-develop.zip -[7]: https://github.com/dita-ot/dita-ot/blob/develop/build.gradle#L181-L192 +[7]: https://github.com/dita-ot/dita-ot/blob/develop/build.gradle#L206-L217 [8]: .github/CONTRIBUTING.md [9]: https://github.com/dita-ot/docs/wiki/Coding-guidelines [10]: https://github.com/dita-ot/docs/wiki/Git-workflow#best-practices diff --git a/extension-points/plugin-extension-points-pre-processing.dita b/extension-points/plugin-extension-points-pre-processing.dita index 825bd6cb9..9594bc184 100644 --- a/extension-points/plugin-extension-points-pre-processing.dita +++ b/extension-points/plugin-extension-points-pre-processing.dita @@ -32,7 +32,7 @@ Legacy pre-processing extensions

The following extension points are available in the original preprocess pipeline that was used by default for all transformations prior to DITA-OT 3.0. These extensions are not available in the newer - map-first preprocessing pipeline (preprocess2), which + map-first pre-processing pipeline (preprocess2), which is used in the PDF and HTML Help transformations as of DITA-OT 3.0.

diff --git a/extension-points/plugin-extension-points-xslt-import.dita b/extension-points/plugin-extension-points-xslt-import.dita index 7358add69..2d1653d10 100644 --- a/extension-points/plugin-extension-points-xslt-import.dita +++ b/extension-points/plugin-extension-points-xslt-import.dita @@ -16,7 +16,7 @@ extension points extension points XSLT - preprocessing + pre-processing extension points, XSLT diff --git a/extension-points/plugin-extension-points-xslt-parameters.dita b/extension-points/plugin-extension-points-xslt-parameters.dita index 3bdbc8968..e0b98896d 100644 --- a/extension-points/plugin-extension-points-xslt-parameters.dita +++ b/extension-points/plugin-extension-points-xslt-parameters.dita @@ -11,7 +11,7 @@ XSLT parameters - preprocessing + pre-processing extension points, parameters diff --git a/extension-points/plugin-extension-points.dita b/extension-points/plugin-extension-points.dita index e814d4666..55b2a1574 100644 --- a/extension-points/plugin-extension-points.dita +++ b/extension-points/plugin-extension-points.dita @@ -16,7 +16,7 @@ overview plug-in extension points - preprocessing + pre-processing plugin.xml topicmerge org.dita.pdf2.xsl.topicmerge diff --git a/index.dita b/index.dita index 850b7aa3b..a0abf7339 100644 --- a/index.dita +++ b/index.dita @@ -54,7 +54,7 @@ conkeyref="pdf-customization/shortdesc-ph" />.
  • - explains how to install, remove and discover new + explains how to install, remove, and discover new plug-ins.
  • provides information on extending DITA-OT with diff --git a/package-lock.json b/package-lock.json index 5cc956f9a..3179b60a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,11 +7,11 @@ "name": "docs", "license": "Apache-2.0", "devDependencies": { - "@prettier/plugin-xml": "3.2.1", - "husky": "^8.0.3", - "lint-staged": "14.0.1", - "prettier": "3.0.3", - "stylelint": "^15.10.3", + "@prettier/plugin-xml": "3.2.2", + "husky": "^9.0.10", + "lint-staged": "15.2.1", + "prettier": "3.2.4", + "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-sass-guidelines": "^10.0.0" } @@ -235,9 +235,9 @@ } }, "node_modules/@prettier/plugin-xml": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.2.1.tgz", - "integrity": "sha512-DvwnQPf8FsczapBVDm54IhR+Pryt3DbPZSNtUb9gOuFtgoUUPbPN69f3nQBMF5BEqh4ZjZjTaHBmsVno3UnAXQ==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.2.2.tgz", + "integrity": "sha512-SoE70SQF1AKIvK7LVK80JcdAe6wrDcbodFFjcoqb1FkOqV0G0oSlgAFDwoRXPqkUE5p/YF2nGsnUbnfm6471sw==", "dev": true, "dependencies": { "@xml-tools/parser": "^1.0.11" @@ -284,15 +284,27 @@ } }, "node_modules/ansi-escapes": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", - "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", + "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", "dev": true, "dependencies": { - "type-fest": "^1.0.2" + "type-fest": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true, + "engines": { + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -465,16 +477,16 @@ } }, "node_modules/cli-truncate": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", - "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", + "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", "dev": true, "dependencies": { "slice-ansi": "^5.0.0", - "string-width": "^5.0.0" + "string-width": "^7.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -493,23 +505,23 @@ } }, "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", "dev": true }, "node_modules/cli-truncate/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", "dev": true, "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -561,9 +573,9 @@ "dev": true }, "node_modules/commander": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", - "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", "dev": true, "engines": { "node": ">=16" @@ -572,7 +584,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, "node_modules/cosmiconfig": { @@ -608,12 +620,12 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", - "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", "dev": true, "engines": { - "node": ">=12.22" + "node": ">=12 || >=16" } }, "node_modules/css-tree": { @@ -722,12 +734,6 @@ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "dev": true }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -759,23 +765,23 @@ "dev": true }, "node_modules/execa": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", "onetime": "^6.0.0", - "signal-exit": "^3.0.7", + "signal-exit": "^4.1.0", "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + "node": ">=16.17" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" @@ -822,15 +828,15 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.1.tgz", + "integrity": "sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==", "dev": true, "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^3.1.1" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/fill-range": { @@ -862,28 +868,29 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/flatted": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, "node_modules/function-bind": { @@ -892,28 +899,40 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "node_modules/get-east-asian-width": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", + "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, "engines": { - "node": ">=10" + "node": ">=16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" }, @@ -1055,24 +1074,24 @@ } }, "node_modules/human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, "engines": { - "node": ">=14.18.0" + "node": ">=16.17.0" } }, "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.0.10", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.10.tgz", + "integrity": "sha512-TQGNknoiy6bURzIO77pPRu+XHi6zI7T93rX+QnJsoYFf3xdjKOur+IlfqzJGMHIK/wXrLg+GsvMs8Op7vI2jVA==", "dev": true, "bin": { - "husky": "lib/bin.js" + "husky": "bin.mjs" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" @@ -1124,7 +1143,7 @@ "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, "dependencies": { "once": "^1.3.0", @@ -1254,6 +1273,12 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -1266,6 +1291,15 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -1276,18 +1310,18 @@ } }, "node_modules/known-css-properties": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz", - "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true }, "node_modules/lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", + "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", "dev": true, "engines": { - "node": ">=10" + "node": ">=14" } }, "node_modules/lines-and-columns": { @@ -1297,55 +1331,47 @@ "dev": true }, "node_modules/lint-staged": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-14.0.1.tgz", - "integrity": "sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==", + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.1.tgz", + "integrity": "sha512-dhwAPnM85VdshybV9FWI/9ghTvMLoQLEXgVMx+ua2DN7mdfzd/tRfoU2yhMcBac0RHkofoxdnnJUokr8s4zKmQ==", "dev": true, "dependencies": { "chalk": "5.3.0", - "commander": "11.0.0", + "commander": "11.1.0", "debug": "4.3.4", - "execa": "7.2.0", - "lilconfig": "2.1.0", - "listr2": "6.6.1", + "execa": "8.0.1", + "lilconfig": "3.0.0", + "listr2": "8.0.1", "micromatch": "4.0.5", "pidtree": "0.6.0", "string-argv": "0.3.2", - "yaml": "2.3.1" + "yaml": "2.3.4" }, "bin": { "lint-staged": "bin/lint-staged.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": ">=18.12.0" }, "funding": { "url": "https://opencollective.com/lint-staged" } }, "node_modules/listr2": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", - "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.1.tgz", + "integrity": "sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==", "dev": true, "dependencies": { - "cli-truncate": "^3.1.0", + "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", - "log-update": "^5.0.1", + "log-update": "^6.0.0", "rfdc": "^1.3.0", - "wrap-ansi": "^8.1.0" + "wrap-ansi": "^9.0.0" }, "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" - }, - "peerDependenciesMeta": { - "enquirer": { - "optional": true - } + "node": ">=18.0.0" } }, "node_modules/locate-path": { @@ -1370,19 +1396,19 @@ "dev": true }, "node_modules/log-update": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", - "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", + "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", "dev": true, "dependencies": { - "ansi-escapes": "^5.0.0", + "ansi-escapes": "^6.2.0", "cli-cursor": "^4.0.0", - "slice-ansi": "^5.0.0", - "strip-ansi": "^7.0.1", - "wrap-ansi": "^8.0.1" + "slice-ansi": "^7.0.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -1400,6 +1426,49 @@ "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, + "node_modules/log-update/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-update/node_modules/is-fullwidth-code-point": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", + "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", + "dev": true, + "dependencies": { + "get-east-asian-width": "^1.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/slice-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", + "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, "node_modules/log-update/node_modules/strip-ansi": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", @@ -1634,7 +1703,7 @@ "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "dependencies": { "wrappy": "1" @@ -1727,7 +1796,7 @@ "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -1782,9 +1851,9 @@ } }, "node_modules/postcss": { - "version": "8.4.28", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz", - "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -1863,9 +1932,9 @@ "dev": true }, "node_modules/prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz", + "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -2045,6 +2114,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/restore-cursor/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -2056,9 +2131,9 @@ } }, "node_modules/rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", "dev": true }, "node_modules/rimraf": { @@ -2136,10 +2211,16 @@ } }, "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/slash": { "version": "3.0.0", @@ -2300,9 +2381,9 @@ "dev": true }, "node_modules/stylelint": { - "version": "15.10.3", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz", - "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==", + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, "dependencies": { "@csstools/css-parser-algorithms": "^2.3.1", @@ -2312,12 +2393,12 @@ "balanced-match": "^2.0.0", "colord": "^2.9.3", "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.0", + "css-functions-list": "^3.2.1", "css-tree": "^2.3.1", "debug": "^4.3.4", "fast-glob": "^3.3.1", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^7.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -2326,13 +2407,13 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.28.0", + "known-css-properties": "^0.29.0", "mathml-tag-names": "^2.1.3", "meow": "^10.1.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.27", + "postcss": "^8.4.28", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", "postcss-selector-parser": "^6.0.13", @@ -2568,17 +2649,17 @@ } }, "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", "dev": true, "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" @@ -2609,23 +2690,23 @@ } }, "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", "dev": true }, "node_modules/wrap-ansi/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", "dev": true, "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2649,7 +2730,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "node_modules/write-file-atomic": { @@ -2665,18 +2746,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.1.tgz", - "integrity": "sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -2684,9 +2753,9 @@ "dev": true }, "node_modules/yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", "dev": true, "engines": { "node": ">= 14" @@ -2847,9 +2916,9 @@ } }, "@prettier/plugin-xml": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.2.1.tgz", - "integrity": "sha512-DvwnQPf8FsczapBVDm54IhR+Pryt3DbPZSNtUb9gOuFtgoUUPbPN69f3nQBMF5BEqh4ZjZjTaHBmsVno3UnAXQ==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.2.2.tgz", + "integrity": "sha512-SoE70SQF1AKIvK7LVK80JcdAe6wrDcbodFFjcoqb1FkOqV0G0oSlgAFDwoRXPqkUE5p/YF2nGsnUbnfm6471sw==", "dev": true, "requires": { "@xml-tools/parser": "^1.0.11" @@ -2889,12 +2958,20 @@ } }, "ansi-escapes": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", - "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", + "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", "dev": true, "requires": { - "type-fest": "^1.0.2" + "type-fest": "^3.0.0" + }, + "dependencies": { + "type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true + } } }, "ansi-regex": { @@ -3018,13 +3095,13 @@ } }, "cli-truncate": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", - "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", + "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", "dev": true, "requires": { "slice-ansi": "^5.0.0", - "string-width": "^5.0.0" + "string-width": "^7.0.0" }, "dependencies": { "ansi-regex": { @@ -3034,20 +3111,20 @@ "dev": true }, "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", "dev": true }, "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", "dev": true, "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" } }, "strip-ansi": { @@ -3089,15 +3166,15 @@ "dev": true }, "commander": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", - "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", "dev": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, "cosmiconfig": { @@ -3124,9 +3201,9 @@ } }, "css-functions-list": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", - "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", "dev": true }, "css-tree": { @@ -3199,12 +3276,6 @@ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "dev": true }, - "eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -3233,19 +3304,19 @@ "dev": true }, "execa": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, "requires": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", "onetime": "^6.0.0", - "signal-exit": "^3.0.7", + "signal-exit": "^4.1.0", "strip-final-newline": "^3.0.0" } }, @@ -3284,12 +3355,12 @@ } }, "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.1.tgz", + "integrity": "sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==", "dev": true, "requires": { - "flat-cache": "^3.0.4" + "flat-cache": "^3.1.1" } }, "fill-range": { @@ -3312,25 +3383,26 @@ } }, "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "requires": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" } }, "flatted": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, "function-bind": { @@ -3339,22 +3411,28 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "get-east-asian-width": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", + "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", + "dev": true + }, "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true }, "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } @@ -3456,15 +3534,15 @@ "dev": true }, "human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true }, "husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.0.10", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.10.tgz", + "integrity": "sha512-TQGNknoiy6bURzIO77pPRu+XHi6zI7T93rX+QnJsoYFf3xdjKOur+IlfqzJGMHIK/wXrLg+GsvMs8Op7vI2jVA==", "dev": true }, "ignore": { @@ -3498,7 +3576,7 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, "requires": { "once": "^1.3.0", @@ -3598,6 +3676,12 @@ "argparse": "^2.0.1" } }, + "json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -3610,6 +3694,15 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, + "keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "requires": { + "json-buffer": "3.0.1" + } + }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -3617,15 +3710,15 @@ "dev": true }, "known-css-properties": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz", - "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true }, "lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", + "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", "dev": true }, "lines-and-columns": { @@ -3635,35 +3728,35 @@ "dev": true }, "lint-staged": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-14.0.1.tgz", - "integrity": "sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==", + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.1.tgz", + "integrity": "sha512-dhwAPnM85VdshybV9FWI/9ghTvMLoQLEXgVMx+ua2DN7mdfzd/tRfoU2yhMcBac0RHkofoxdnnJUokr8s4zKmQ==", "dev": true, "requires": { "chalk": "5.3.0", - "commander": "11.0.0", + "commander": "11.1.0", "debug": "4.3.4", - "execa": "7.2.0", - "lilconfig": "2.1.0", - "listr2": "6.6.1", + "execa": "8.0.1", + "lilconfig": "3.0.0", + "listr2": "8.0.1", "micromatch": "4.0.5", "pidtree": "0.6.0", "string-argv": "0.3.2", - "yaml": "2.3.1" + "yaml": "2.3.4" } }, "listr2": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", - "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.1.tgz", + "integrity": "sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==", "dev": true, "requires": { - "cli-truncate": "^3.1.0", + "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", - "log-update": "^5.0.1", + "log-update": "^6.0.0", "rfdc": "^1.3.0", - "wrap-ansi": "^8.1.0" + "wrap-ansi": "^9.0.0" } }, "locate-path": { @@ -3682,16 +3775,16 @@ "dev": true }, "log-update": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", - "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", + "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", "dev": true, "requires": { - "ansi-escapes": "^5.0.0", + "ansi-escapes": "^6.2.0", "cli-cursor": "^4.0.0", - "slice-ansi": "^5.0.0", - "strip-ansi": "^7.0.1", - "wrap-ansi": "^8.0.1" + "slice-ansi": "^7.0.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "dependencies": { "ansi-regex": { @@ -3700,6 +3793,31 @@ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true }, + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", + "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", + "dev": true, + "requires": { + "get-east-asian-width": "^1.0.0" + } + }, + "slice-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", + "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", + "dev": true, + "requires": { + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" + } + }, "strip-ansi": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", @@ -3862,7 +3980,7 @@ "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "requires": { "wrappy": "1" @@ -3925,7 +4043,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true }, "path-key": { @@ -3959,9 +4077,9 @@ "dev": true }, "postcss": { - "version": "8.4.28", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz", - "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { "nanoid": "^3.3.6", @@ -4005,9 +4123,9 @@ "dev": true }, "prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz", + "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==", "dev": true }, "punycode": { @@ -4111,6 +4229,12 @@ "requires": { "mimic-fn": "^2.1.0" } + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true } } }, @@ -4121,9 +4245,9 @@ "dev": true }, "rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", "dev": true }, "rimraf": { @@ -4169,9 +4293,9 @@ "dev": true }, "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true }, "slash": { @@ -4290,9 +4414,9 @@ "dev": true }, "stylelint": { - "version": "15.10.3", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz", - "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==", + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, "requires": { "@csstools/css-parser-algorithms": "^2.3.1", @@ -4302,12 +4426,12 @@ "balanced-match": "^2.0.0", "colord": "^2.9.3", "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.0", + "css-functions-list": "^3.2.1", "css-tree": "^2.3.1", "debug": "^4.3.4", "fast-glob": "^3.3.1", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^7.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -4316,13 +4440,13 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.28.0", + "known-css-properties": "^0.29.0", "mathml-tag-names": "^2.1.3", "meow": "^10.1.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.27", + "postcss": "^8.4.28", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", "postcss-selector-parser": "^6.0.13", @@ -4489,14 +4613,14 @@ } }, "wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", "dev": true, "requires": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "dependencies": { "ansi-regex": { @@ -4512,20 +4636,20 @@ "dev": true }, "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", "dev": true }, "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", "dev": true, "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" } }, "strip-ansi": { @@ -4542,7 +4666,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "write-file-atomic": { @@ -4553,14 +4677,6 @@ "requires": { "imurmurhash": "^0.1.4", "signal-exit": "^4.0.1" - }, - "dependencies": { - "signal-exit": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.1.tgz", - "integrity": "sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==", - "dev": true - } } }, "yallist": { @@ -4570,9 +4686,9 @@ "dev": true }, "yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", "dev": true }, "yargs-parser": { diff --git a/package.json b/package.json index 868919839..739fee594 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "fix:style": "stylelint \"**/*.css\" --fix", "fmt": "npm run format", "format": "prettier --write \"**/*.{css,dita*,json,md,scss,xml,yaml,yml}\"", - "lint-staged": "lint-staged", - "prepare": "husky install", + "lint-staged": "lint-staged --no-stash", + "prepare": "husky", "prettier": "prettier --write \"**/*.{css,dita*,json,md,scss,xml,yaml,yml}\"", "prettier-check": "prettier --check \"**/*.{css,dita*,json,md,scss,xml,yaml,yml}\"", "stylelint": "stylelint \"**/*.css\"", @@ -45,11 +45,11 @@ } }, "devDependencies": { - "@prettier/plugin-xml": "3.2.1", - "husky": "^8.0.3", - "lint-staged": "14.0.1", - "prettier": "3.0.3", - "stylelint": "^15.10.3", + "@prettier/plugin-xml": "3.2.2", + "husky": "^9.0.10", + "lint-staged": "15.2.1", + "prettier": "3.2.4", + "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-sass-guidelines": "^10.0.0" } diff --git a/parameters/dita-command-arguments.dita b/parameters/dita-command-arguments.dita index cfe25873d..36df7941c 100644 --- a/parameters/dita-command-arguments.dita +++ b/parameters/dita-command-arguments.dita @@ -112,7 +112,7 @@ --install will still work.) -
    +
    Arguments --input -i @@ -150,10 +150,20 @@

    + + + --project=file + + Publish a project file with multiple deliverables. + You can add the --deliverable option to specify a single deliverable in the + project. + For more information, see + . +

    -
    +
    Subcommands deliverables subcommand install subcommand @@ -189,6 +199,17 @@ Install a single plug-in ID from the registry at (or a local registry), from a remote URL, or a local ZIP file. + + The --force option can be passed as an additional option to the installation + subcommand to force-install an existing plug-in: dita + install plug-in-zip --force. + + The dita install command uses a network connection to install plug-ins + from the configured registry or process remote referenced resources. In environments where an HTTP proxy + is used to establish a network connection, you can provide the proxy configuration via the + ANT_OPTS environment variable. For more information, see + . + @@ -243,7 +264,7 @@
    -
    +
    Options -o --output @@ -272,27 +293,11 @@ -d Debug logging prints considerably more additional information. The debug log includes all information from - the verbose log, plus details on Java classes, additional Ant properties and overrides, preprocessing + the verbose log, plus details on Java classes, additional Ant properties and overrides, pre-processing filters, parameters, and stages, and the complete build sequence. Debug logging requires additional resources and can slow down the build process, so it should only be enabled when further details are required to diagnose problems. - - - --output=dir - - -o - dir - - -

    Specifies the path of the output directory; the path can be absolute or relative to the current - directory.

    -

    This option corresponds to the common parameter - .

    -

    By default, the output is written to the out subdirectory of the current - directory.

    -     -     --filter=files @@ -314,14 +319,6 @@ - - - --force - - Force-install an existing plug-in. - Passed as an additional option to the installation subcommand: dita - install plug-in-zip --force - --help @@ -339,6 +336,31 @@ Write logging messages to a file. + + + --no-color + + By default, DITA-OT prints certain log messages to the console in color. In terminal environments that do + not support colored output, the ANSI color escape codes will be shown instead. To deactivate colored output, + pass the --no-color option to the dita command, or set the + TERM=dumb or NO_COLOR environment variables. + + + + --output=dir + + -o + dir + + +

    Specifies the path of the output directory; the path can be absolute or relative to the current + directory.

    +

    This option corresponds to the common parameter + .

    +

    By default, the output is written to the out subdirectory of the current + directory.

    +     +     --parameter=value @@ -419,7 +441,15 @@ The temporary directory is where DITA-OT writes intermediate files that are generated during the transformation process. - + + + --theme=file + + Publish PDF output with a theme configuration file. + For more information, see + . + + --verbose diff --git a/parameters/local-properties-file.dita b/parameters/local-properties-file.dita index b3a0a1ee3..61fb33ef9 100644 --- a/parameters/local-properties-file.dita +++ b/parameters/local-properties-file.dita @@ -13,16 +13,16 @@ files local.properties - local.properties file + local.properties file Windows RenderX - local.properties + local.properties file Antenna House - local.properties + local.properties file command line local.properties file Java - local.properties file + local.properties file PDF formatter formatter diff --git a/reference/dita-v2-0-support.dita b/reference/dita-v2-0-support.dita index af6c7d1d3..f46107831 100644 --- a/reference/dita-v2-0-support.dita +++ b/reference/dita-v2-0-support.dita @@ -170,7 +170,7 @@
    DITA-OT 4.1 -

    DITA-OT 4.1 adds support for additional DITA 2.0 features.

    +

    DITA-OT 4.1 added support for additional DITA 2.0 features.

    • DITA 2.0 splits the programming and syntax domains (so you can use one without the other).

      @@ -185,6 +185,13 @@
    +
    + DITA-OT 4.2 +

    DITA-OT 4.2 adds support for additional DITA 2.0 features.

    +
      +
    • +
    +
    Other new or revised features proposed for DITA 2.0 are not yet supported. Additional features will be implemented in future versions of DITA-OT as the specification evolves. diff --git a/reference/implementation-dependent-features.dita b/reference/implementation-dependent-features.dita index 67255ffe4..bcd91ea0a 100644 --- a/reference/implementation-dependent-features.dita +++ b/reference/implementation-dependent-features.dita @@ -85,7 +85,7 @@ images scaling

    If both height and width attributes are given, the image is scaled non-uniformly.

    -

    If the scale attribute is not an unsigned integer, no error or warning is thrown during preprocessing.

    +

    If the scale attribute is not an unsigned integer, no error or warning is thrown during pre-processing.

    Map processing diff --git a/reference/map-first-preprocessing.dita b/reference/map-first-preprocessing.dita index 202929d91..e9f16ca04 100644 --- a/reference/map-first-preprocessing.dita +++ b/reference/map-first-preprocessing.dita @@ -2,26 +2,27 @@ - Map-first preprocessing + Map-first pre-processing - Map-first preprocessing + Map-first pre-processing - DITA-OT 3.0 provides a map-first preprocessing option as an alternative to - the default preprocess operation. The method, which was introduced in DITA-OT 2.5 as an - experimental feature, has been improved and is ready for use in many production scenarios. Map-first-preprocessing - provides the same functionality as the default preprocess, but takes a different + DITA-OT provides a map-first pre-processing option as an alternative to the + default preprocess operation. The method, which was introduced in DITA-OT 2.5 as an experimental + feature, has since been improved and is ready for use in production scenarios. Map-first pre-processing provides + the same functionality as the default preprocess, but takes a different approach. filters - map-first preprocessing - preprocessing + map-first pre-processing + map-first pre-processing + pre-processing map first DITA 1.0 DITA 1.2 DITA 1.3 - effect on preprocessing + effect on pre-processing pipelines map first validate @@ -33,40 +34,40 @@ -

    Whereas the default preprocessing routine handles both maps and topics at the same +

    Whereas the default pre-processing routine handles both maps and topics at the same time, often switching back and forth between map operations and topic operations, the map-first approach only begins processing topics after nearly all map processing is complete. This simplifies the processing logic and creates cleaner module responsibilities, which makes it easier to process only those topics that are actually referenced after filtering, for example, or to only process the map to validate the map structure.

    -

    The current preprocessing architecture was established during the DITA 1.0 era when there were fewer DITA +

    The current pre-processing architecture was established during the DITA 1.0 era when there were fewer DITA features that operated on the map level. Initially, the difference between processing modes was not that great. DITA 1.2 and 1.3 introduced many more map-level features, such as keys and key scopes, that make it difficult to reliably work with topics before all map features have been resolved.

    -

    The original preprocessing operation already handles many map operations first, but this was not the original - design and requires regular refactoring to handle edge cases. The new map-first preprocessing is designed with +

    The original pre-processing operation already handles many map operations first, but this was not the original + design and requires regular refactoring to handle edge cases. The new map-first pre-processing is designed with this model in mind, improving the overall processing flow and making it more formal about the map-first model. The new model also takes advantage of hashed topic file names in the temporary directory, which simplifies many processing steps, and is better able to handle topics referenced outside of the map directory (that case has resulted in a variety of issues with the original model).

    - The map-first preprocessing option is enabled by default in DITA-OT 3.0 for PDF +

    As of DITA-OT 4.2, the map-first pre-processing pipeline also supports additional subject scheme features.

    + The map-first pre-processing option is enabled by default in DITA-OT 3.0 for PDF and HTML Help. These formats were chosen because they generate a compiled result file, so temporarily hashed file - names should all be invisible to the build. After further testing and feedback, the new option will most likely - become the default for other output formats in future versions. Because the DITA-OT development team cannot have - access to all varieties of DITA, all edge cases, or even all the ways DITA-OT itself is extended, the switch to - default map-first preprocessing for other output formats will be smoother for everyone if more people can test and - provide feedback. + names should all be invisible to the build. After further testing and feedback, the new option has been enabled + for HTML5 output as of DITA-OT 4.2.
    - How to use map-first preprocessing -

    To use (or test) map-first preprocessing, call the preprocess2 Ant target in your custom - transformation types instead of using the default preprocess target.

    + How to use map-first pre-processing +

    To use (or test) map-first pre-processing, call the preprocess2 Ant target in your custom + transformation types instead of the preprocess target.

    For example, if you have a custom HTML5 transformation type named "myhtml", then you may have a plug-in extension that looks this:

    <!-- Simple variant: set properties and call default HTML5 --> <target name="dita2myhtml" depends="myhtml.init,dita2html5"/>

    This type of extension is quite common, and is used to set default properties for your environment followed by - a normal build to use those properties. In this case, you'll need to replace dita2html5 with - the normal HTML5 steps, swapping out preprocess for preprocess2:

    + a normal build to use those properties. As of DITA-OT 4.2, this approach will inherit the map-first + pre-processing routine from the HTML5 transformation.

    +

    In earlier versions, you’d need to replace dita2html5 with the normal HTML5 steps, swapping + out preprocess for preprocess2:

    <!-- Simple variant: set properties and call default HTML5 --> @@ -103,10 +104,10 @@ based on the backwards-compatible preprocess modules, but also want to provide your colleagues with a way to test their own documents using preprocess2.

    There are several ways to do this. One fairly straightforward approach would be to create a new custom - transformation type that is exactly the same, except for preprocessing. For example, if you have a local HTML + transformation type that is exactly the same, except for pre-processing. For example, if you have a local HTML variant called myhtml as above, instead of modifying that transformation directly, you could create a second transformation type called myhtml-beta that provides exactly the same support, - but with the new map-first preprocessing:

    + but with the new map-first pre-processing:

    <!-- Original "myhtml" is not modified, used for production --> <target name="dita2myhtml5" depends="myhtml.init,dita2html5"/> @@ -123,8 +124,6 @@
    Known limitations -

    The preprocess2 implementation details are subject to change; dependencies within - preprocess2 may be renamed or removed based on feedback.

     diff --git a/reference/pdf-transform.dita b/reference/pdf-transform.dita index 93ba4ebf7..e03784e9e 100644 --- a/reference/pdf-transform.dita +++ b/reference/pdf-transform.dita @@ -18,7 +18,7 @@ transform.fo2pdf topic.fo PDF - preprocessing + pre-processing targets PDF XSLT @@ -76,7 +76,7 @@
    transform.topic2fo.flagging
    -
    Sets up preprocessing for flagging based on a DITAVAL file. This step generates the file +
    Sets up pre-processing for flagging based on a DITAVAL file. This step generates the file stage1a.xml in the temporary processing directory.
     diff --git a/reference/pdf-transformation-history.dita b/reference/pdf-transformation-history.dita index 31520d7a9..ca9ec9afa 100644 --- a/reference/pdf-transformation-history.dita +++ b/reference/pdf-transformation-history.dita @@ -32,7 +32,7 @@

    When IBM developed the code that later became DITA-OT, it included only a proof-of-concept PDF transformation. IBM had their own processing chain for producing PDFs from SGML, which they had developed over several decades, so - resources were focused primarily on XHTML output and preprocessing.

    + resources were focused primarily on XHTML output and pre-processing.

    Since the initial proof-of-concept transformation was not robust enough for production-grade output, companies began to develop their own PDF transformations. One company, Idiom Technologies, made their transformation (known as the “pdf2” transformation) available as open source on 23 February 2006. The Idiom plug-in was initially diff --git a/reference/preprocess-branch-filter.dita b/reference/preprocess-branch-filter.dita index 0c2e04fd2..71a389870 100644 --- a/reference/preprocess-branch-filter.dita +++ b/reference/preprocess-branch-filter.dita @@ -15,7 +15,7 @@ profiling DITAVAL branch filters - preprocessing + pre-processing branch-filter branch-filter diff --git a/reference/preprocess-chunk.dita b/reference/preprocess-chunk.dita index 26805a2b9..bac913577 100644 --- a/reference/preprocess-chunk.dita +++ b/reference/preprocess-chunk.dita @@ -10,7 +10,7 @@ chunk supported methods - preprocessing + pre-processing chunk chunk Java diff --git a/reference/preprocess-clean-map.dita b/reference/preprocess-clean-map.dita index 386109757..7863a5368 100644 --- a/reference/preprocess-clean-map.dita +++ b/reference/preprocess-clean-map.dita @@ -4,11 +4,11 @@ Map cleanup (<codeph>clean-map</codeph>) The clean-map step removes any elements and attributes that were added to files to support - preprocessing. + pre-processing. - preprocessing + pre-processing clean-map clean-map diff --git a/reference/preprocess-conref.dita b/reference/preprocess-conref.dita index 43b087be7..56f8c59da 100644 --- a/reference/preprocess-conref.dita +++ b/reference/preprocess-conref.dita @@ -16,7 +16,7 @@ id conref resolution xref - preprocessing + pre-processing conref conref XSLT diff --git a/reference/preprocess-conrefpush.dita b/reference/preprocess-conrefpush.dita index 027c94c7c..be8be50b9 100644 --- a/reference/preprocess-conrefpush.dita +++ b/reference/preprocess-conrefpush.dita @@ -9,7 +9,7 @@ - preprocessing + pre-processing conrefpush conrefpush Java diff --git a/reference/preprocess-copy-to.dita b/reference/preprocess-copy-to.dita index 3d6de8240..b72245163 100644 --- a/reference/preprocess-copy-to.dita +++ b/reference/preprocess-copy-to.dita @@ -9,7 +9,7 @@ copy-to - preprocessing + pre-processing copy-to copy-to diff --git a/reference/preprocess-copyfiles.dita b/reference/preprocess-copyfiles.dita index 0438028ec..992f57a41 100644 --- a/reference/preprocess-copyfiles.dita +++ b/reference/preprocess-copyfiles.dita @@ -11,7 +11,7 @@ DITAVAL copy-files preprocess step - preprocessing + pre-processing copy-files copy-files images diff --git a/reference/preprocess-debugfilter.dita b/reference/preprocess-debugfilter.dita index 79bf7148d..57785bff9 100644 --- a/reference/preprocess-debugfilter.dita +++ b/reference/preprocess-debugfilter.dita @@ -14,7 +14,7 @@ xtrc DITAVAL debug-filter preprocess step - preprocessing + pre-processing debug-filter debug-filter debugging diff --git a/reference/preprocess-flagging.dita b/reference/preprocess-flagging.dita index 754de8380..896eec989 100644 --- a/reference/preprocess-flagging.dita +++ b/reference/preprocess-flagging.dita @@ -4,7 +4,7 @@ Flagging (<codeph>flag-module</codeph>) Beginning with DITA-OT 1.7, flagging support is implemented as a common flag-module - preprocessing step. The module evaluates the DITAVAL against all flagging attributes, and adds DITA-OT–specific + pre-processing step. The module evaluates the DITAVAL against all flagging attributes, and adds DITA-OT–specific hints to the topic when flags are active. Any extended transformation type may use these hints to support flagging without adding logic to interpret the DITAVAL. @@ -30,7 +30,7 @@ flag-module preprocess step DITA specializations - preprocessing + pre-processing flag-module flag-module flagging diff --git a/reference/preprocess-genlist.dita b/reference/preprocess-genlist.dita index 7d174a93d..6aff4f44e 100644 --- a/reference/preprocess-genlist.dita +++ b/reference/preprocess-genlist.dita @@ -17,7 +17,7 @@ imagefile deprecated features image.file - preprocessing + pre-processing gen-list gen-list conref diff --git a/reference/preprocess-keyref.dita b/reference/preprocess-keyref.dita index 7df8e3f2e..903f69846 100644 --- a/reference/preprocess-keyref.dita +++ b/reference/preprocess-keyref.dita @@ -10,7 +10,7 @@ href - preprocessing + pre-processing keyref keyref diff --git a/reference/preprocess-maplink.dita b/reference/preprocess-maplink.dita index d3726be5c..a2f13d3e3 100644 --- a/reference/preprocess-maplink.dita +++ b/reference/preprocess-maplink.dita @@ -10,15 +10,15 @@ collection-type - preprocessing + pre-processing maplink maplink Java maplink XSLT - maplink preprocessing step + maplink pre-processing step relationship tables - maplink preprocessing step + maplink pre-processing step memory diff --git a/reference/preprocess-mapref.dita b/reference/preprocess-mapref.dita index 59e4d3f17..218bc1ec7 100644 --- a/reference/preprocess-mapref.dita +++ b/reference/preprocess-mapref.dita @@ -9,13 +9,13 @@ map - preprocessing + pre-processing mapref mapref XSLT - mapref preprocessing step + mapref pre-processing step relationship tables - mapref preprocessing step + mapref pre-processing step diff --git a/reference/preprocess-metadata.dita b/reference/preprocess-metadata.dita index e238e7399..d474f13cf 100644 --- a/reference/preprocess-metadata.dita +++ b/reference/preprocess-metadata.dita @@ -17,7 +17,7 @@ type toc print - preprocessing + pre-processing move-meta-entries move-meta-entries Java diff --git a/reference/preprocess-profile.dita b/reference/preprocess-profile.dita index 344afe619..e362676a7 100644 --- a/reference/preprocess-profile.dita +++ b/reference/preprocess-profile.dita @@ -12,7 +12,7 @@ DITAVAL profile preprocess step profiling - preprocessing + pre-processing profile profile diff --git a/reference/preprocess-topic-fragment.dita b/reference/preprocess-topic-fragment.dita index 96ebaa507..2fd6c8e19 100644 --- a/reference/preprocess-topic-fragment.dita +++ b/reference/preprocess-topic-fragment.dita @@ -11,7 +11,7 @@ coderef codeblock - preprocessing + pre-processing topic-fragment topic-fragment Saxon diff --git a/reference/preprocess-topicpull.dita b/reference/preprocess-topicpull.dita index acf36cde4..da1b2ecbf 100644 --- a/reference/preprocess-topicpull.dita +++ b/reference/preprocess-topicpull.dita @@ -12,7 +12,7 @@ link desc linktext - preprocessing + pre-processing topicpull topicpull XSLT diff --git a/reference/preprocessing.dita b/reference/preprocessing.dita index c64a17b7f..e5977d436 100644 --- a/reference/preprocessing.dita +++ b/reference/preprocessing.dita @@ -9,7 +9,7 @@ - preprocessing + pre-processing modules diff --git a/reference/processing-pipeline-modules.dita b/reference/processing-pipeline-modules.dita index f04fb73b7..96ed44b2a 100644 --- a/reference/processing-pipeline-modules.dita +++ b/reference/processing-pipeline-modules.dita @@ -24,7 +24,7 @@ processing modules XSLT processing modules - preprocessing + pre-processing extension points (overview) index sorting diff --git a/reference/processing-structure.dita b/reference/processing-structure.dita index c985a3b02..15aa63da2 100644 --- a/reference/processing-structure.dita +++ b/reference/processing-structure.dita @@ -11,7 +11,7 @@ architecture - preprocessing + pre-processing Eclipse Help HTML Help XHTML @@ -21,7 +21,7 @@ pipelines description of pipelines - preprocessing + pre-processing diff --git a/release-notes/index.dita b/release-notes/index.dita index 37f189c45..2675ad3e0 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -8,8 +8,7 @@ - DITA Open Toolkit is a maintenance release that fixes issues - reported in DITA-OT , which includes . +

    @@ -26,329 +25,126 @@ - - DITA-OT <keyword keyref="maintenance-version"/> - <!--<ph outputclass="small text-muted">released MMMM DD, YYYY</ph>--> - - -

    -

    DITA Open Toolkit is a maintenance release that includes the - following bug fixes.

    -
      - -
    • Various issues in map-first preprocessing have been resolved in this release. - #4237 -
        -
      • Earlier versions failed to expand content references that were specified in key definitions. - In preprocess2, content references are now expanded before key references to ensure - that all topics are available when the map is processed. - #2420, - #4258, - #4261 -
        • -
      • Key references to duplicate topics created via copy-to attributes caused - builds to fail. This issue was initially resolved for the original preprocessing routine in DITA-OT - 3.1.1. The original source information is now also correctly recorded for copy-to targets in - preprocess2, allowing builds to continue. - #3007, - #3015 -
        • -
      • Earlier versions failed to catch certain validation errors in preprocess2. - Map-first preprocessing has been updated to validate files correctly. - #3281 -
        • -
      • In DITA-OT 3.5 to 4.1, map-first preprocessing failed to report unresolved content - references to topics that were not referenced in the map, and any key references they contained were not - expanded. In the past, this issue could be avoided by adding content reference targets to the map with - the processing-role attribute set to resource-only, but this - workaround is no longer necessary. Unresolved references should now be reported, and keys expanded even - if the target topics are not referenced in the map. - #3446, - #3546 -
        • -
      • Map-first preprocessing set incorrect values for the path2project, - path2project-uri, and path2rootmap-uri processing instructions. In - preprocess2, they are now set with correct values that match the original preprocess - output. - #3514, - #4252 -
        • -
      • The map-first preprocessing test code has been simplified to use the same expected output - for the original preprocessing routines and preprocess2. - #4268 -
        • -
      -
      • -
    • Network file URI validation has been fixed to allow builds to continue when cross-references - point to invalid URIs. Up until DITA-OT 3.6, the non-standard 2-slash format could be used to represent the - server name in Windows UNC filenames such as \\server\folder\file.pdf using the - Authority part of the URI as file://server/folder/file.pdf. Recent versions of DITA-OT - required the correct 3-slash notation with an explicitly empty authority component - (file:///server/folder/file.pdf), or builds would fail. Validation has been relaxed - to restore support for the 2-slash format. - #3718, - #4255 -
      • -
    • Chunk-to-content publishing failed on DITA map files whose paths included spaces. The chunk map - reader module now normalizes map file paths to allow publishing to continue in these cases. - #4064, - #4257 -
      • -
    • The HTML5 plug-in has been updated to remove the remaining inline style attributes that - prevented custom plug-ins from overriding the monospace font presentation of teletype - tt elements. These changes move the default teletype styling to CSS to allow - users to override the presentation in custom stylesheets. The output is visually equivalent to the results - generated by previous toolkit versions. - #4254, - #4267 - In publishing environments that do not use the default common CSS files, these styles - may need to be implemented in custom stylesheets. -
      • -
    • Test coverage has been improved to include unit tests for preprocessing, integration tests for - subject schemes, and unit tests for cascading metadata in duplicate topicrefs. - #4259, - #4264, - #4280 -
      • -
    • In earlier versions, cross-references or other links to titles that contained footnotes included - the footnote text. For a link to a target element that has no explicit link text, DITA-OT computes default - link text from the target element. Link text computation now ignores any fn - elements it encounters, so the link shows only the text from the title element. - #4269, - #4276 -
      • -
    • When maps point to the same resource in multiple topic references with different navigation - titles (or other topic metadata), older versions of DITA-OT used the metadata from the first reference for - all subsequent instances. The original code was written to cascade metadata within the map and also collect - metadata to be pushed to topics. This code worked when each topic was only referenced once. When there were - duplicates, only the first topic reference got the correct cascaded metadata; the second reference was - processed with the cascaded metadata, but also with the metadata from the first topicref. The code has been - refactored to separate metadata cascading within maps from the collection of metadata to push to topics, so - subsequent references to the same resource now retain the correct metadata for each instance. - #4275, - #4283, - #4284 -
      • -
    • The bundled XML Resolver has been upgraded to version 5.2.1, which no longer fails on invalid - URI characters like spaces or Windows backslashes, and now also runs in environments with a restrictive - security manager. - #4274, - #4279 -
      • -
    -

    For additional information on the issues resolved since the previous release, see the - 4.1.2 milestone and - - changelog on GitHub.

    -
    - - - - - DITA-OT 4.1.1 - <ph outputclass="small text-muted">released July 20, 2023</ph> - - -
    -

    DITA Open Toolkit 4.1.1 is a maintenance release that includes the following bug fixes.

    -
      - -
    • In previous releases, there were some cases in which a desc element - inside an xref or link element was not annotated with the - expected ditaot usershortdesc processing instruction during preprocessing. These omissions - have been corrected to aid in debugging. (This change is relevant only within preprocessing, as these - processing instructions are deleted when preprocessing completes.) - #4155 -
      • -
    • When building HTML output, earlier versions reported XSLT errors while resolving custom header - files if paths used Windows backslash characters “\” as separators. Path separators in - args.ftr, args.hdf, and args.hdr parameter - values are now converted to the forward slash character “/” to ensure URLs are valid before - they are passed to XSLT. - #4218, - #4226 -
      • -
    • For cross-references to a topic, the target topic’s short description is processed to create a - link description. When that shortdesc element contained another cross-reference, - earlier versions did not process it correctly, and reported DOTX031E (file not available) - errors during processing. This issue is now fixed, and link descriptions are created correctly. - #4221, - #4239 -
      • -
    • Build scripts have been updated to ensure unit tests run correctly during Gradle builds. - #4230 -
      • -
    • The RELAX NG grammar caching changes in DITA-OT 4.0 introduced a configuration bug that - accidentally disabled XML Schema Definition validation. Processing and tests have been updated to ensure - that XSD-based maps and topic files can be published correctly. - #3926, - #4234, - #4238 -
      • -
    • When logging was changed to use processing mode in DITA-OT 4.1, the change logged the exception - without location. Logging code has been corrected to restore the location information to the exception, so - errors once again show the line/column number where the problem appears. - #4187, - #4240, - #4248 -
      • -
    • Several dependencies have been upgraded to include the latest utility versions and fix security issues in - bundled libraries: -
        -
      • Guava 32.1.1 - #4227, - #4245 -
        • -
      • Jackson 2.15.2 - #4216, - #4228 -
        • -
      • Logback 1.4.8 and SLF4J 2.0.7 - #4246, - #4250 -
        • -
      • Saxon 12.3 - #4241, - #4247, - #4250 -
        • -
      -
      • -
    -

    For additional information on the issues resolved since the previous release, see the - 4.1.1 milestone and - - changelog on GitHub.

    -
    -     -     - - + DITA-OT <keyword keyref="release"/> - <ph outputclass="small text-muted">released June 22, 2023</ph> + <ph outputclass="small text-muted"> released February 11, 2024</ph> - + files + .ditaotrc + .ditaotrc file
    -

    DITA Open Toolkit Release includes a new version of the - Lightweight DITA plug-in with significant enhancements to Markdown processing, and updates for the latest - DITA 2.0 draft standard.

    +

    DITA Open Toolkit Release uses map-first pre-processing for HTML5 + output and includes a new local configuration file, better CLI messages with support for overrides, a new + version of the Lightweight DITA plug-in with enhancements to Markdown processing, and updates for the latest + DITA 2.0 draft standard.

    -
    - Plug-in development features - + + + +
    + Map-first HTML5 +

    The HTML5 transformation has been updated to use the map-first pre-processing pipeline that was + previously enabled for PDF and HTML Help in DITA-OT 3.0. For details, see + . + #4225 +

    +
    + +
    + New configuration file +

    A new .ditaotrc configuration file can be used to store DITA-OT runtime configurations + in multiple places.

    +

    DITA-OT now looks for this file in the current directory or any ancestor directory first, then in the user’s + home directory, and finally in the root directory of the DITA-OT installation. These files are read in order + and combined with the contents of the local.properties file in the toolkit directory. The + first occurrence of a property takes precedence. This approach can be used to define multiple layers of + configuration, so personal defaults that apply to multiple projects can be stored in the home folder, with + local overrides in project folders. + #4217, + #4391 +

    +
    + +
    + CLI message improvements +

    The log messages that appear in the command line interface have been revised to use more consistent + language, better explain the cause, and how the issue can be resolved. + #3973, + #4287, + #4376, + #4387 +

    +

    The code that generates CLI error messages has been refactored to make it easier to override and + extend messages. The generated messages file is now sorted by ID to make it easier to locate individual + messages, and any duplicates are removed during the integration process. + #4199 +

    +

    Log messages can now be partially overridden or completely replaced. Custom plug-ins can supply new + messages via the dita.xsl.messages extension point as in previous versions, but now this same + approach can also be used to override the contents or change the severity level of any of the default + messages. + #4362 +

      -
    • Since DITA-OT 3.5, the dita - plugins subcommand shows a list of the currently installed plug-ins by plug-in ID. To - make it easier to determine which version of each plug-in is installed, the output now includes the version - number for each plug-in as specified in the plugin.xml file. - #4137, - #4141 -
      • -
    • Previously only files referenced from the start map could be parsed using a custom parser. The - start map itself was always processed as DITA XML. As of DITA-OT 4.1, processing has been updated to also - allow the start map to use a custom parser. This change allows recent versions of the LwDITA plug-in to - process Markdown maps. - #4159 -
      • -
    • Plug-in developers can now configure custom parsers via SAX properties that provide a list of - formats and processing mode. The LwDITA plug-in uses this mechanism to configure the options supported for - Markdown and MDITA. - #4205 -
      • +
    • The only required information is the id attribute, which is used to identify the message + you are overriding.
      • +
    • To change the message content, specify a new reason or + response.
      • +
    • To change the severity level, set a new value for the type attribute + (INFO, WARN, ERROR, FATAL, or + DEBUG).
      • +
    • You can omit type, reason or response, + in which case the previous declaration of the message will provide that value.
    Lightweight DITA and Markdown updates

    The org.lwdita plug-in has been updated to version , - which includes performance improvements and updates to Markdown processing to reflect recent changes to the - latest LwDITA drafts from OASIS.

    + which includes a series of bug fixes and support for additional DITA constructs in Markdown output, + including:

      -
    • -

      Markdown output

      -
        -
      • When generating Markdown output, the less-than “<” and greater-than “>” characters are now added - to xmlelement content as in HTML and PDF output.
        • -
      • Markdown output now treats programming and software domain elements as code spans and wraps the - content in backtick quotes (`) for better correspondence with HTML5 output, which wraps - these elements in code.
        • -
      • -
    • -

      Markdown input

      -
        -
      • Standard Markdown syntax can now be used to indicate a span of code by wrapping it with backtick - quotes (`). In Markdown DITA input, these constructs are converted to DITA - codeph elements on import, and rendered as code - elements in HTML output. In MDITA input, backtick code spans are parsed as teletype - tt elements to align with LwDITA, which supports teletype highlighting in - XDITA.
        • -
      • The LwDITA plug-in supports a new $schema key in the YAML front matter block. This - key can be used to define parsing options in topic files for more control over how Markdown content is - converted to DITA. For more information, see - .
        • -
      • Earlier versions of the plug-in failed to parse certain Markdown tables correctly. Table parsing has - been improved to ensure these cases are properly processed.
        • -
      • The MDITA core profile can now be specified via the new schema key in the YAML front matter - block.
        • -
      • Any linefeed processing instructions in Markdown input are now converted to line feeds - in HTML5 and PDF output.
        • -
      • Markdown DITA supports both loose and - tight list - spacing (with no blank lines between list items). MDITA treats all lists as loose, and wraps each list - item in a paragraph: <li><p>item</p></li>.
        • -
      • DITA maps can now be written in Markdown using standard Markdown syntax for links and lists. -
          -
        • In Markdown DITA, the schema key in the YAML front matter block is used to define the file as a - map. Unordered list items create topicref elements, and ordered list items - create topicref elements with - collection-type=. List items without a link are treated - as topic heads.
          • -
        • In MDITA, maps use the file name extension mditamap to define the file as a - map. Both ordered and unordered list items create topicref, and any - unlinked topic heads are ignored.
          • -
        -
        • -
      -
      • -
    • -

      The flexmark Markdown parsing library has been updated to version 0.64.

      • -
    • -

      The XDITA plug-in has been updated to version , which includes - recent changes to the grammar files from OASIS (as of ). - #4214 -

      -
      • +
    • list parsing performance improvement
      • +
    • admonition blocks in list items
      • +
    • HDITA note elements
      • +
    • multimedia element types
      • +
    • tight task lists
      • +
    • footnotes
      • +
    • block content in tables
    +

    The XDITA plug-in has been updated to version , which includes recent + changes to the grammar files from OASIS (as of ). This version + removes deprecated catalog entries, and resolves + #4233. + #4366 +

    Updated DITA 2.0 preview

    In addition to the - provided in DITA-OT 3.5 – 4.0, this release includes updated processing for + provided in DITA-OT 3.5 – 4.1, this release includes updated processing for the latest draft versions of the DITA 2.0 grammar files from OASIS (as of ). + />). + #4359

    -
      +
    @@ -356,62 +152,124 @@

    DITA Open Toolkit Release includes the following enhancements and changes to existing features:

    - +
      -
    • When publishing to HTML and PDF, email links no longer include the mailto: - prefix in the default link text. - #4020, - #4089 -
      • -
    • When filtering profiled content with DITAVAL files that exclude content by default, the - DOTJ031I message no longer appears when no rule is specified for a certain attribute. - #4048, - #4073 -
      • -
    • The Java code has been refactored to use new language and library features from recent Java - versions. These changes make the code more future-proof and easier to maintain. - #4090, - #4091, - #4092, - #4121 -
      • -
    • The following bundled plug-ins have been upgraded to the latest versions: +
    • +
    • Unreferenced XSLT variables in xsl:template blocks have been removed. + #4093 +
      • +
    • Earlier versions of DITA-OT preserved metadata in submaps, but dropped any + topicmeta content defined within mapref elements. Submap + metadata in mapref elements is now preserved in a temporary + mapref-topicmeta-container, which is removed when pre-processing is complete. + #4115 +
      • +
    • Several pre-processing stylesheets have been extended with additional comments to better explain + how processing works, and to mark cases where named templates can be replaced with template modes. + #4151, + #4176, + #4209 +
      • +
    • Subject scheme processing has been refactored to support multiple keys in a single + keys attribute on the subjectdef element. It now uses the S9API + (Saxon’s preferred Java API for XSLT, XQuery, XPath, and XML Schema processing) instead of the Document + Object Model (DOM). A new unit test has been added to verify changes in the subject scheme reader code, and + the map-first pre-processing pipeline now supports additional subject scheme features. + #4296, + #4297, + #4300, + #4302, + #4306 +
      • +
    • The test coverage for the onlytopic.in.map parameter has been improved + using unit tests instead of integration tests. + #4310 +
      • +
    • The tasks that run after the map-first pre-processing pipeline have been refactored to a + dedicated preprocess2.post target to make it easier to add custom steps in between the + built-in steps. + #4313 +
      • +
    • The plug-in integration code has been refactored to remove the redundant Ant layer from the + install and uninstall processes. + #4329 +
      • +
    • For HTML-based output formats, a new dita2html:is-heading-level template mode + allows plug-ins to declare their own elements that contribute to heading levels (h1 through + h6). For example, a specialization of bodydiv could declare + itself as a heading level and create its own HTML heading (by calling + dita2html:section-heading with the defaulttitle parameter), and any + section or example elements inside will adjust their + heading levels accordingly. As part of this change, the parameter interface of the template for + (section|example)/title elements has changed — the headLevel parameter + is now an integer (1 through 6) instead of a string (h1 through h6). + Existing custom code that uses this interface must be modified. + #4330, + #4368 +
      • +
    • XSLT stylesheet headers have been updated from XSLT version 1.0 and 2.0 to version 3.0 to make + way for the use of XSLT3 features in future toolkit versions. This is a backwards-compatible change, as + there are no changes to the actual code; only the stylesheet headers have been modified for now. To ensure + plug-ins remain compatible with future versions of DITA-OT and Saxon-HE, the DITA Open Toolkit project + recommends upgrading all stylesheets to XSLT 3.0. + #4338 +
      • +
    • The CLI no longer uses colors when it's connected to a pipe or output is redirected to a file. + #4393 +
      • +
    • +

    • The following bundled plug-ins have been upgraded to the latest versions:

        -
      • The Normalized DITA plug-in version 1.1 now removes unnecessary key artefacts like - keys, keyref or keydef after key - resolution, and ditavalref elements after branch filter resolution. - #4140 +
      • The Normalized DITA plug-in version 2.0 now uses map-first pre-processing for normalization. + #4382
        • -
      • The Lightweight DITA plug-in version 5.5 includes the +
      • The Lightweight DITA plug-in version 5.7 includes the described above. - #4167, - #4178, - #4210 + #4388
        • -
      • The PDF Theme plug-in version 0.7.0 adds support for tasks, and the hazard, highlight, - markup, UI, and XML domains, so you can now style these elements in a YAML theme file without building a - custom PDF plug-in. - #4194 +
      • The PDF Theme plug-in version 0.7.2 applies the body line-height attribute + to block elements and provides basic styling support for table entries and cover page subtitles or + alternative titles. + #4389
      • -
    • Several bundled dependencies have been upgraded to the latest versions: +

    • Several bundled dependencies have been upgraded to the latest versions:

        -
      • Ant 1.10.13 - #4182 -
        • -
      • FOP 2.8 - #4183, - #4011 +
      • The bundled Apache FOP version has been updated to + . + #4272, + #4288 +

        (For details on recent changes, see the + .)

        • -
      • Gradle wrapper 7.6.1 - #4197 -
        • -
      • Saxon 12.2 - #4130 +
      • The logback libraries have been updated to to + resolve a serialization vulnerability in the logback receiver component reported as CVE-2023-6378. + #4346 + #4361
      • +
    • Several Java dependencies have been upgraded to include the latest utility versions and fix security issues in + bundled libraries. + #4390 +
        +
      • Ant 1.10.14
        • +
      • ICU4J 74.2
        • +
      • Jackson 2.16.1
        • +
      • Jing 20220510
        • +
      • JUnit 5.10.2
        • +
      • Saxon 12.4
        • +
      • SLF4J 2.0.12
        • +
      • XML Resolver 5.2.3
        • +
      +
    @@ -419,63 +277,70 @@ Bug fixes

    DITA Open Toolkit Release provides fixes for the following bugs:

    - +
      -
    • Earlier versions of - (preprocess2) failed to copy non-DITA files to the output directory. - Processing has been updated to copy media files and other linked assets. - #3242, - #3966, - #4132 -
      • -
    • When a map contained references to nested subtopics within the same topic file, earlier versions - would process the file multiple times during branch filtering. The output was correct but runtime was - increased. This issue has been fixed so that the topic file is only filtered once. - #3903, - #4152 -
      • -
    • In earlier versions, cross-references to fn footnote elements without - target text were rendered with two levels of sup superscript formatting in XHTML - and HTML5 output. Now, these links are only superscripted once. - #3967, - #3968 -
      • -
    • When generating PDF output, earlier versions failed with the PDFX005F error - when topic references targeted external resources with the scope attribute set to - external. Processing has been updated to properly recognize external resources and allow - builds to complete. - #4131 -
      • -
    • Earlier versions included DITA 2.0 grammar files from OASIS that referenced non-public URNs. The - files have been updated to the latest versions (as of ), which - include updated references in the RELAX NG files. - #4144, - #4177 -
      • -
    • Earlier versions reported errors when processing DITA 2.0 content with empty - specializations attribute values. Processing has been updated to handle these cases - correctly. - #4165 -
      • -
    • When generating HTMLHelp with DITA-OT 4.0, builds failed with the DOTA015F - error. HTMLHelp has been updated to replace the outdated preprocess.copy-image.skip - property with the corresponding DITA 4.0 build-step.copy-image property for compatibility - with recent toolkit versions. - #4181, - #4186 -
      • -
    • When topic short descriptions contain cross-reference links that point to one another in - circular references across topics, earlier versions would fail with an infinite-recursion stylesheet loop. - Now, shortdesc descriptions in referenced elements are processed only one level deep. - #4184, - #4185 -
      • -
    • In earlier versions, setting the processing-mode parameter to - would only stop processing if errors were reported from the Java code. Any XSLT - errors were logged to the console, but processing continued. Now, XSLT errors will also stop processing, so - mode is a bit … stricter. - #4187 +
    • For cross-references to a topic, the target topic’s short description is processed to create a + link description. When that shortdesc element contained another cross-reference to + a file in a different directory, the second link’s description would contain *** instead of + the expected link text. Processing has been corrected to ensure that link text is generated as expected. + #4244, + #4266 +
      • +
    • +
    • In earlier versions, builds failed with a NullPointerException under certain conditions in + map-first pre-processing. The issues have been resolved and integration tests have been updated to catch + related errors in the future. + #4305 +
      • +
    • The map-first pre-processing pipeline in earlier versions treated href attribute + values set to -dita-use-conref-target as resources during the initial parse and rewrote + the attribute values. Processing has been corrected to pass these values through unchanged. + #4307 +
      • +
    • Earlier versions of the map-first pre-processing pipeline failed to update the + usr.input.file.list with temporary file names. The list is now generated correctly. + #4311 +
      • +
    • Missing translations for the “on page” variable have been added to the Bosnian, + Finnish, Montenegrin, Romanian, Russian, Swedish, and Simplified Chinese PDF localizations. + #4315, + #4320 +
      • +
    • The classpaths for the install and uninstall subcommands + have been separated to allow plug-ins to be removed even if plug-in JAR files have been opened. Earlier + versions would fail to delete plug-ins in this case. + #4328 +
      • +
    • In earlier versions, the HTML5 transformation published metadata to + meta elements in topic-level HTML files, but not in the table of contents file + index.html. Now, it also adds metadata from the root map’s + topicmeta to the ToC file. + #4351, + #4352 +
      • +
    • Earlier versions did not support non-DITA map references. Processing has been extended to allow + mapref elements to refer to non-DITA maps, such as Markdown maps that are parsed + as DITA. + #4353 +
      • +
    • The docsrc folder in the DITA-OT 4.1.1 and 4.1.2 release packages contained + several unnecessary files. The build scripts have been updated to ensure that these files are no longer + included. + #4357 +
      • +
    • In cases where key definitions were branch-filtered with + dvrResourcePrefix, earlier versions of the map-first pre-processing pipeline + failed to apply the resource prefix to the target file names. Key resolution code has been corrected to use + the filter-copy-to attribute instead of the href attribute. Once applied, + this temporary pre-processing attribute is removed during the map clean step. + #4369, + #4381 +
      • +
    • The missing --deliverable option has been added to the CLI + help output. This option can be used to publish a single deliverable in the specified + project. + #4386
    @@ -484,21 +349,19 @@ Contributors

    DITA Open Toolkit Release includes by the following people:

    - + NOTE: This lists contributions to the core toolkit, not docs.
    1. Jarno Elovirta
      2. +
    2. Roger Sheen
      3. +
    3. Chris Papademetrious
    4. Robert D Anderson
    5. Radu Coravu
      6. -
    6. Chris Papademetrious
      7. -
    7. Roger Sheen
      8. -
    8. Duna Marius Cosmin
      9. -
    9. Josh Johnson
      10. -
    10. Toshihiko Makita
      11. +
    11. Andrei Pomacu

    For the complete list of changes since the previous release, see the changelog on GitHub.

    @@ -510,34 +373,15 @@ improvements to existing topics, along with new information in the following topics:

    • -
      • +
    • -
      • -
    • -
      • -
    • -
      • -
    • - -
        -
      • -
        • -
      • -
        • -
      • -
        • -
      • -
        • -
      • -
        • -
      -
      • +

    For additional information on documentation issues resolved in DITA Open Toolkit Release , see the milestone in the documentation repository.

    @@ -547,13 +391,12 @@
    1. Roger Sheen
    2. Jarno Elovirta
      3. -
    3. Lief Erickson
      4. -
    4. Darrenn Jackson
      5. -
    5. Mark Giffin
      6. +
    6. Edit Koselak
      7. +
    7. Stefan Jung

    For the complete list of documentation changes since the previous release, see the changelog.

    diff --git a/release-notes/rel4.1.dita b/release-notes/rel4.1.dita new file mode 100644 index 000000000..bb4c302ba --- /dev/null +++ b/release-notes/rel4.1.dita @@ -0,0 +1,563 @@ + + + + + DITA Open Toolkit 4.1 Release Notes + + Release Notes + + + + DITA Open Toolkit 4.1.2 is a maintenance release that fixes issues + reported in DITA-OT 4.1, which includes . +

    + + + + + Requirements: Java 17 + +

    + Add info on new minimum Java version or any other requirements that have changed + since previous release. +

    +

    +

    +     +     + + + DITA-OT 4.1.2 + <ph outputclass="small text-muted">released October 2, 2023</ph> + + +
    +

    DITA Open Toolkit 4.1.2 is a maintenance release that includes the + following bug fixes.

    +
      + +
    • Various issues in map-first preprocessing have been resolved in this release. + #4237 +
        +
      • Earlier versions failed to expand content references that were specified in key definitions. + In preprocess2, content references are now expanded before key references to ensure + that all topics are available when the map is processed. + #2420, + #4258, + #4261 +
        • +
      • Key references to duplicate topics created via copy-to attributes caused + builds to fail. This issue was initially resolved for the original preprocessing routine in DITA-OT + 3.1.1. The original source information is now also correctly recorded for copy-to targets in + preprocess2, allowing builds to continue. + #3007, + #3015 +
        • +
      • Earlier versions failed to catch certain validation errors in preprocess2. + Map-first preprocessing has been updated to validate files correctly. + #3281 +
        • +
      • In DITA-OT 3.5 to 4.1, map-first preprocessing failed to report unresolved content + references to topics that were not referenced in the map, and any key references they contained were not + expanded. In the past, this issue could be avoided by adding content reference targets to the map with + the processing-role attribute set to resource-only, but this + workaround is no longer necessary. Unresolved references should now be reported, and keys expanded even + if the target topics are not referenced in the map. + #3446, + #3546 +
        • +
      • Map-first preprocessing set incorrect values for the path2project, + path2project-uri, and path2rootmap-uri processing instructions. In + preprocess2, they are now set with correct values that match the original preprocess + output. + #3514, + #4252 +
        • +
      • The map-first preprocessing test code has been simplified to use the same expected output + for the original preprocessing routines and preprocess2. + #4268 +
        • +
      +
      • +
    • Network file URI validation has been fixed to allow builds to continue when cross-references + point to invalid URIs. Up until DITA-OT 3.6, the non-standard 2-slash format could be used to represent the + server name in Windows UNC filenames such as \\server\folder\file.pdf using the + Authority part of the URI as file://server/folder/file.pdf. Recent versions of DITA-OT + required the correct 3-slash notation with an explicitly empty authority component + (file:///server/folder/file.pdf), or builds would fail. Validation has been relaxed + to restore support for the 2-slash format. + #3718, + #4255 +
      • +
    • Chunk-to-content publishing failed on DITA map files whose paths included spaces. The chunk map + reader module now normalizes map file paths to allow publishing to continue in these cases. + #4064, + #4257 +
      • +
    • The HTML5 plug-in has been updated to remove the remaining inline style attributes that + prevented custom plug-ins from overriding the monospace font presentation of teletype + tt elements. These changes move the default teletype styling to CSS to allow + users to override the presentation in custom stylesheets. The output is visually equivalent to the results + generated by previous toolkit versions. + #4254, + #4267 + In publishing environments that do not use the default common CSS files, these styles + may need to be implemented in custom stylesheets. +
      • +
    • Test coverage has been improved to include unit tests for preprocessing, integration tests for + subject schemes, and unit tests for cascading metadata in duplicate topicrefs. + #4259, + #4264, + #4280 +
      • +
    • In earlier versions, cross-references or other links to titles that contained footnotes included + the footnote text. For a link to a target element that has no explicit link text, DITA-OT computes default + link text from the target element. Link text computation now ignores any fn + elements it encounters, so the link shows only the text from the title element. + #4269, + #4276 +
      • +
    • When maps point to the same resource in multiple topic references with different navigation + titles (or other topic metadata), older versions of DITA-OT used the metadata from the first reference for + all subsequent instances. The original code was written to cascade metadata within the map and also collect + metadata to be pushed to topics. This code worked when each topic was only referenced once. When there were + duplicates, only the first topic reference got the correct cascaded metadata; the second reference was + processed with the cascaded metadata, but also with the metadata from the first topicref. The code has been + refactored to separate metadata cascading within maps from the collection of metadata to push to topics, so + subsequent references to the same resource now retain the correct metadata for each instance. + #4275, + #4283, + #4284 +
      • +
    • The bundled XML Resolver has been upgraded to version 5.2.1, which no longer fails on invalid + URI characters like spaces or Windows backslashes, and now also runs in environments with a restrictive + security manager. + #4274, + #4279 +
      • +
    +

    For additional information on the issues resolved since the previous release, see the + 4.1.2 milestone and + + changelog on GitHub.

    +
    +     +     + + + DITA-OT 4.1.1 + <ph outputclass="small text-muted">released July 20, 2023</ph> + + +
    +

    DITA Open Toolkit 4.1.1 is a maintenance release that includes the following bug fixes.

    +
      + +
    • In previous releases, there were some cases in which a desc element + inside an xref or link element was not annotated with the + expected ditaot usershortdesc processing instruction during preprocessing. These omissions + have been corrected to aid in debugging. (This change is relevant only within preprocessing, as these + processing instructions are deleted when preprocessing completes.) + #4155 +
      • +
    • When building HTML output, earlier versions reported XSLT errors while resolving custom header + files if paths used Windows backslash characters “\” as separators. Path separators in + args.ftr, args.hdf, and args.hdr parameter + values are now converted to the forward slash character “/” to ensure URLs are valid before + they are passed to XSLT. + #4218, + #4226 +
      • +
    • For cross-references to a topic, the target topic’s short description is processed to create a + link description. When that shortdesc element contained another cross-reference, + earlier versions did not process it correctly, and reported DOTX031E (file not available) + errors during processing. This issue is now fixed, and link descriptions are created correctly. + #4221, + #4239 +
      • +
    • Build scripts have been updated to ensure unit tests run correctly during Gradle builds. + #4230 +
      • +
    • The RELAX NG grammar caching changes in DITA-OT 4.0 introduced a configuration bug that + accidentally disabled XML Schema Definition validation. Processing and tests have been updated to ensure + that XSD-based maps and topic files can be published correctly. + #3926, + #4234, + #4238 +
      • +
    • When logging was changed to use processing mode in DITA-OT 4.1, the change logged the exception + without location. Logging code has been corrected to restore the location information to the exception, so + errors once again show the line/column number where the problem appears. + #4187, + #4240, + #4248 +
      • +
    • Several dependencies have been upgraded to include the latest utility versions and fix security issues in + bundled libraries: +
        +
      • Guava 32.1.1 + #4227, + #4245 +
        • +
      • Jackson 2.15.2 + #4216, + #4228 +
        • +
      • Logback 1.4.8 and SLF4J 2.0.7 + #4246, + #4250 +
        • +
      • Saxon 12.3 + #4241, + #4247, + #4250 +
        • +
      +
      • +
    +

    For additional information on the issues resolved since the previous release, see the + 4.1.1 milestone and + + changelog on GitHub.

    +
    +     +     + + + DITA-OT 4.1 + <ph outputclass="small text-muted">released June 22, 2023</ph> + + + + + + + + + +
    +

    DITA Open Toolkit Release 4.1 includes a new version of the + Lightweight DITA plug-in with significant enhancements to Markdown processing, and updates for the latest + DITA 2.0 draft standard.

    +
    +
    + Plug-in development features + +
      +
    • Since DITA-OT 3.5, the dita + plugins subcommand shows a list of the currently installed plug-ins by plug-in ID. To + make it easier to determine which version of each plug-in is installed, the output now includes the version + number for each plug-in as specified in the plugin.xml file. + #4137, + #4141 +
      • +
    • Previously only files referenced from the start map could be parsed using a custom parser. The + start map itself was always processed as DITA XML. As of DITA-OT 4.1, processing has been updated to also + allow the start map to use a custom parser. This change allows recent versions of the LwDITA plug-in to + process Markdown maps. + #4159 +
      • +
    • Plug-in developers can now configure custom parsers via SAX properties that provide a list of + formats and processing mode. The LwDITA plug-in uses this mechanism to configure the options supported for + Markdown and MDITA. + #4205 +
      • +
    +
    + +
    + Lightweight DITA and Markdown updates +

    The org.lwdita plug-in has been updated to version , + which includes performance improvements and updates to Markdown processing to reflect recent changes to the + latest LwDITA drafts from OASIS.

    +
      +
    • +

      Markdown output

      +
        +
      • When generating Markdown output, the less-than “<” and greater-than “>” characters are now added + to xmlelement content as in HTML and PDF output.
        • +
      • Markdown output now treats programming and software domain elements as code spans and wraps the + content in backtick quotes (`) for better correspondence with HTML5 output, which wraps + these elements in code.
        • +
      • +
    • +

      Markdown input

      +
        +
      • Standard Markdown syntax can now be used to indicate a span of code by wrapping it with backtick + quotes (`). In Markdown DITA input, these constructs are converted to DITA + codeph elements on import, and rendered as code + elements in HTML output. In MDITA input, backtick code spans are parsed as teletype + tt elements to align with LwDITA, which supports teletype highlighting in + XDITA.
        • +
      • The LwDITA plug-in supports a new $schema key in the YAML front matter block. This + key can be used to define parsing options in topic files for more control over how Markdown content is + converted to DITA. For more information, see + .
        • +
      • Earlier versions of the plug-in failed to parse certain Markdown tables correctly. Table parsing has + been improved to ensure these cases are properly processed.
        • +
      • The MDITA core profile can now be specified via the new schema key in the YAML front matter + block.
        • +
      • Any linefeed processing instructions in Markdown input are now converted to line feeds + in HTML5 and PDF output.
        • +
      • Markdown DITA supports both loose and + tight list + spacing (with no blank lines between list items). MDITA treats all lists as loose, and wraps each list + item in a paragraph: <li><p>item</p></li>.
        • +
      • DITA maps can now be written in Markdown using standard Markdown syntax for links and lists. +
          +
        • In Markdown DITA, the schema key in the YAML front matter block is used to define the file as a + map. Unordered list items create topicref elements, and ordered list items + create topicref elements with + collection-type=. List items without a link are treated + as topic heads.
          • +
        • In MDITA, maps use the file name extension mditamap to define the file as a + map. Both ordered and unordered list items create topicref, and any + unlinked topic heads are ignored.
          • +
        +
        • +
      +
      • +
    • +

      The flexmark Markdown parsing library has been updated to version 0.64.

      • +
    • +

      The XDITA plug-in has been updated to version , which includes + recent changes to the grammar files from OASIS (as of ). + #4214 +

      +
      • +
    +
    + +
    + Updated DITA 2.0 preview +

    In addition to the + provided in DITA-OT 3.5 – 4.0, this release includes updated processing for + the latest draft versions of the DITA 2.0 grammar files from OASIS (as of ). +

    +
      +
    • +
    +

    + +

    + +
    + Enhancements and changes + +

    DITA Open Toolkit Release 4.1 includes the following enhancements and changes to + existing features:

    + +
      +
    • When publishing to HTML and PDF, email links no longer include the mailto: + prefix in the default link text. + #4020, + #4089 +
      • +
    • When filtering profiled content with DITAVAL files that exclude content by default, the + DOTJ031I message no longer appears when no rule is specified for a certain attribute. + #4048, + #4073 +
      • +
    • The Java code has been refactored to use new language and library features from recent Java + versions. These changes make the code more future-proof and easier to maintain. + #4090, + #4091, + #4092, + #4121 +
      • +
    • The following bundled plug-ins have been upgraded to the latest versions: +
        +
      • The Normalized DITA plug-in version 1.1 now removes unnecessary key artefacts like + keys, keyref or keydef after key + resolution, and ditavalref elements after branch filter resolution. + #4140 +
        • +
      • The Lightweight DITA plug-in version 5.5 includes the + described above. + #4167, + #4178, + #4210 +
        • +
      • The PDF Theme plug-in version 0.7.0 adds support for tasks, and the hazard, highlight, + markup, UI, and XML domains, so you can now style these elements in a YAML theme file without building a + custom PDF plug-in. + #4194 +
        • +
      +
      • +
    • Several bundled dependencies have been upgraded to the latest versions: +
        +
      • Ant 1.10.13 + #4182 +
        • +
      • FOP 2.8 + #4183, + #4011 +
        • +
      • Gradle wrapper 7.6.1 + #4197 +
        • +
      • Saxon 12.2 + #4130 +
        • +
      +
      • +
    +
    + +
    + Bug fixes + +

    DITA Open Toolkit Release 4.1 provides fixes for the following bugs:

    + +
      +
    • Earlier versions of + (preprocess2) failed to copy non-DITA files to the output directory. + Processing has been updated to copy media files and other linked assets. + #3242, + #3966, + #4132 +
      • +
    • When a map contained references to nested subtopics within the same topic file, earlier versions + would process the file multiple times during branch filtering. The output was correct but runtime was + increased. This issue has been fixed so that the topic file is only filtered once. + #3903, + #4152 +
      • +
    • In earlier versions, cross-references to fn footnote elements without + target text were rendered with two levels of sup superscript formatting in XHTML + and HTML5 output. Now, these links are only superscripted once. + #3967, + #3968 +
      • +
    • When generating PDF output, earlier versions failed with the PDFX005F error + when topic references targeted external resources with the scope attribute set to + external. Processing has been updated to properly recognize external resources and allow + builds to complete. + #4131 +
      • +
    • Earlier versions included DITA 2.0 grammar files from OASIS that referenced non-public URNs. The + files have been updated to the latest versions (as of ), which + include updated references in the RELAX NG files. + #4144, + #4177 +
      • +
    • Earlier versions reported errors when processing DITA 2.0 content with empty + specializations attribute values. Processing has been updated to handle these cases + correctly. + #4165 +
      • +
    • When generating HTMLHelp with DITA-OT 4.0, builds failed with the DOTA015F + error. HTMLHelp has been updated to replace the outdated preprocess.copy-image.skip + property with the corresponding DITA 4.0 build-step.copy-image property for compatibility + with recent toolkit versions. + #4181, + #4186 +
      • +
    • When topic short descriptions contain cross-reference links that point to one another in + circular references across topics, earlier versions would fail with an infinite-recursion stylesheet loop. + Now, shortdesc descriptions in referenced elements are processed only one level deep. + #4184, + #4185 +
      • +
    • In earlier versions, setting the processing-mode parameter to + would only stop processing if errors were reported from the Java code. Any XSLT + errors were logged to the console, but processing continued. Now, XSLT errors will also stop processing, so + mode is a bit … stricter. + #4187 +
      • +
    +
    + +
    + Contributors +

    DITA Open Toolkit Release 4.1 includes + by the following people:

    + + NOTE: This lists contributions to the core toolkit, not docs. +
      +
    1. Jarno Elovirta
      2. +
    2. Robert D Anderson
      3. +
    3. Radu Coravu
      4. +
    4. Chris Papademetrious
      5. +
    5. Roger Sheen
      6. +
    6. Duna Marius Cosmin
      7. +
    7. Josh Johnson
      8. +
    8. Toshihiko Makita
      9. +
    +

    For the complete list of changes since the previous release, see the + changelog on GitHub.

    +
    + +
    + Documentation updates +

    The documentation for DITA Open Toolkit Release 4.1 provides corrections and + improvements to existing topics, along with new information in the following topics:

    +
      +
    • +
      • +
    • +
      • +
    • +
      • +
    • +
      • +
    • + +
        +
      • +
        • +
      • +
        • +
      • +
        • +
      • +
        • +
      • +
        • +
      +
      • +
    +

    For additional information on documentation issues resolved in DITA Open Toolkit Release , see the + 4.1 milestone in the documentation repository.

    +

    DITA Open Toolkit Release 4.1 includes + by the following people:

    + NOTE: This lists contributions to docs, not to the core toolkit. +
      +
    1. Roger Sheen
      2. +
    2. Jarno Elovirta
      3. +
    3. Lief Erickson
      4. +
    4. Darrenn Jackson
      5. +
    5. Mark Giffin
      6. +
    +

    For the complete list of documentation changes since the previous release, see the + changelog.

    +
    +     +     +     diff --git a/resources/conref-task.dita b/resources/conref-task.dita index da09423ad..108cdb309 100644 --- a/resources/conref-task.dita +++ b/resources/conref-task.dita @@ -132,7 +132,8 @@ pre-processing. The internal order of preprocessing steps is subject to change between versions of DITA-OT. New versions may remove, reorder, combine, or add steps to - the process, so the extension points within the preprocessing stage should only be used if absolutely + the process, so the extension points within the pre-processing stage should only be used if absolutely necessary. diff --git a/resources/external-links.ditamap b/resources/external-links.ditamap index f81f7105b..e7a82ae51 100644 --- a/resources/external-links.ditamap +++ b/resources/external-links.ditamap @@ -295,6 +295,16 @@ DITA-OT 4.1 Release Notes + + + DITA-OT 4.2 Release Notes + + @@ -447,6 +457,16 @@ Apache FOP 2.3 Release Notes + + + Apache FOP 2.9 Release Notes + + - 4.1 + 4.2 @@ -26,7 +26,7 @@ - 4.1.2 + 4.2 @@ -35,14 +35,14 @@ - April 26, 2023 + January 22, 2024 - June 18, 2023 + January 26, 2024 @@ -53,7 +53,7 @@ - 1.10.13 + 1.10.14 @@ -85,7 +85,7 @@ - 70.1 + 74.2 @@ -93,7 +93,7 @@ - 2.15.2 + 2.16.1 @@ -109,7 +109,7 @@ - 1.4.8 + 1.4.14 @@ -117,7 +117,7 @@ - 5.5 + 5.7 @@ -125,7 +125,7 @@ - 2.0.7 + 2.0.12 @@ -141,7 +141,7 @@ - 2.8 + 2.9 @@ -167,7 +167,7 @@ - 5.2.1 + 5.2.3 @@ -182,7 +182,7 @@ - 12.3 + 12.4 @@ -190,7 +190,7 @@ - 0.3.0 + 0.3.2 diff --git a/resources/reltable.ditamap b/resources/reltable.ditamap index 44159ca7e..803c420da 100644 --- a/resources/reltable.ditamap +++ b/resources/reltable.ditamap @@ -367,6 +367,7 @@ + diff --git a/resources/reusable-components.dita b/resources/reusable-components.dita index b19cbb122..a02608630 100644 --- a/resources/reusable-components.dita +++ b/resources/reusable-components.dita @@ -36,6 +36,31 @@ but the DITA Open Toolkit project recommends upgrading all stylesheets to XSLT 2.0 to ensure plug-ins remain compatible with future versions of DITA-OT and Saxon-HE.
    + +
    + Upgrade stylesheets to XSLT3 + upgrading + Saxon + XSLT + 1.0 + XSLT + 2.0 + XSLT + 3.0 + plug-ins + upgrading +

    DITA-OT 4.2 updates XSLT stylesheet headers from XSLT version 1.0 and 2.0 to version 3.0 to make way for the + use of XSLT3 features in future toolkit versions.

    +

    This is a backwards-compatible change, as there are no changes to the actual code; only the stylesheet headers + have been modified for now. This approach has been chosen to help identify any external or third-party + incompatibilities that might result from switching to XSLT3.

    + The next major version of DITA-OT will upgrade template content to use XSLT3 syntax. +

    To ensure plug-ins remain compatible with future versions of DITA-OT and Saxon-HE, the DITA Open Toolkit + project recommends upgrading all stylesheets to XSLT 3.0.

    +

    Change any occurrences of xsl:stylesheet version="1.0" or xsl:stylesheet + version="2.0" in custom plug-in stylesheets to at least xsl:stylesheet + version="3.0".

    +
    Validating plug-ins @@ -128,8 +153,9 @@ Limitations of map-first pre-processing

    The internal extension points that run before or after individual steps in the original preprocess pipeline (preprocess.*.pre/preprocess.*.post) are not - available in the newer map-first preprocessing pipeline (preprocess2), which is used in the PDF - and HTML Help transformations as of DITA-OT 3.0.

    + available in the newer map-first pre-processing pipeline (preprocess2), which is used in the PDF + and HTML Help transformations as of DITA-OT 3.0, and in HTML5 and Normalized DITA output as of DITA-OT 4.2.

    diff --git a/resources/source-files.ditamap b/resources/source-files.ditamap index 539166909..4b1a61837 100644 --- a/resources/source-files.ditamap +++ b/resources/source-files.ditamap @@ -18,6 +18,7 @@ + @@ -110,6 +111,7 @@ + diff --git a/resources/subjectscheme-outputclass.ditamap b/resources/subjectscheme-outputclass.ditamap index 3b1d02bec..2a7683ed6 100644 --- a/resources/subjectscheme-outputclass.ditamap +++ b/resources/subjectscheme-outputclass.ditamap @@ -64,6 +64,11 @@ + + + + + diff --git a/resources/theme/.gitrepo b/resources/theme/.gitrepo index 9ee487d08..e34c011a3 100644 --- a/resources/theme/.gitrepo +++ b/resources/theme/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/jelovirt/pdf-generator.wiki.git branch = master - commit = 8aa491a8ba27666eedd46e4293de8955020a86e7 - parent = 6122da3959a61d2fd8cf5a1959198189129ae9bc + commit = 21ed9c285776ee1711a6b83e5a241f35b0590e7a + parent = 3a35331db3f1f2b47ef9479d6c2463cca8c98a67 method = merge - cmdver = 0.4.5 + cmdver = 0.4.6 diff --git a/resources/theme/Styles.md b/resources/theme/Styles.md index 6e2e9230a..6b1ed4489 100644 --- a/resources/theme/Styles.md +++ b/resources/theme/Styles.md @@ -85,6 +85,12 @@ The styling properties that can be used are listed in [XSL fo:block](https://www - `content = content-template` +### `cover-titlealt` + +Cover page subtitle or alternative title. + +The styling properties that can be used are listed in [XSL fo:block](https://www.w3.org/TR/xsl11/#fo_block). + ### `section` Section element. diff --git a/samples/ant_sample/build-chm-pdf-hybrid.xml b/samples/ant_sample/build-chm-pdf-hybrid.xml index dc0ff94ef..d8a1253aa 100644 --- a/samples/ant_sample/build-chm-pdf-hybrid.xml +++ b/samples/ant_sample/build-chm-pdf-hybrid.xml @@ -4,7 +4,7 @@ - Preprocessing steps + Pre-processing steps Build the CHM and PDF with the dita command diff --git a/samples/docker/Dockerfile b/samples/docker/Dockerfile index 315d808f2..11afdf72e 100644 --- a/samples/docker/Dockerfile +++ b/samples/docker/Dockerfile @@ -1,5 +1,5 @@ # Use the latest DITA-OT image ↓ as parent: -FROM ghcr.io/dita-ot/dita-ot:4.1.2 +FROM ghcr.io/dita-ot/dita-ot:4.2 # Install a custom plug-in from a remote location: RUN dita --install https://github.com/infotexture/dita-bootstrap/archive/master.zip diff --git a/topics/configuring-proxies.dita b/topics/configuring-proxies.dita new file mode 100644 index 000000000..ea2bb144c --- /dev/null +++ b/topics/configuring-proxies.dita @@ -0,0 +1,73 @@ + + + + + Configuring proxies + Certain commands, for example, the dita install command, use a network connection to + install plug-ins from the configured registry or process remote referenced resources. In environments where an HTTP + proxy is used to establish a network connection, you can provide the proxy configuration via the + ANT_OPTS environment variable. + + + + macOS configuring proxies + Linux configuring proxies + Windows configuring proxies + command line configuring proxies + proxies + HTTP proxies + operating system + Linux + macOS + Windows + Java network + ANT_OPTS + Java + ANT_OPTS + metadata + network connection error + metadata + connection timed out + + + + + + + To configure the proxy for a specific session, from the command prompt, issue the + following command: + + + Platform + Command + + + Linux or macOS  + export ANT_OPTS="-Dhttp.proxySet=true \ + -Dhttps.proxyHost=<HTTPS proxy IP address> \ + -Dhttp.proxyHost=<HTTP proxy IP address> \ + -Dhttp.proxyPort=<HTTP proxy port> \ + -Dhttps.proxyPort=<HTTPS proxy port>" + + + Windows + set ANT_OPTS=%ANT_OPTS% -Dhttp.proxySet=true ^ + -Dhttps.proxyHost=<HTTPS proxy IP address> ^ + -Dhttp.proxyHost=<HTTP proxy IP address> ^ + -Dhttp.proxyPort=<HTTP proxy port> ^ + -Dhttps.proxyPort=<HTTPS proxy port> + + + + + To persistently change the value, change the value allocated to the + ANT_OPTS environment variable on your system. + + + If a command has previously failed due to a connection timeout, issue the command + again. For + example:dita install <plug-in> + + + diff --git a/topics/creating-docker-images.dita b/topics/creating-docker-images.dita index 876f2e5dd..f99ee0c08 100644 --- a/topics/creating-docker-images.dita +++ b/topics/creating-docker-images.dita @@ -96,7 +96,7 @@ Successfully tagged sample-docker-image:1.0 Running the new container

    You can then start a container based on your new image:

    - $ docker container run -it \ + $ docker container run --rm \ -v /path/to/dita-ot-dir/docsrc:/src sample-docker-image:1.0 \ -i /src/userguide.ditamap \ -o /src/out/dita-bootstrap \ diff --git a/topics/dita-resources.ditamap b/topics/dita-resources.ditamap index f128de471..9ff124663 100644 --- a/topics/dita-resources.ditamap +++ b/topics/dita-resources.ditamap @@ -16,7 +16,7 @@ DITA-OT Discussions The DITA-OT Discussions forum on GitHub is a collaborative communication platform that allows members of the community to ask questions, share suggestions, upvote discussions to signal support, and mark questions - as anwered. + as answered.     diff --git a/topics/enabling-debug-mode.dita b/topics/enabling-debug-mode.dita index 62fb6e7de..4a4d05501 100644 --- a/topics/enabling-debug-mode.dita +++ b/topics/enabling-debug-mode.dita @@ -4,7 +4,7 @@ Enabling debug mode Debug logging prints considerably more additional information. The debug log includes all information from - the verbose log, plus details on Java classes, additional Ant properties and overrides, preprocessing filters, + the verbose log, plus details on Java classes, additional Ant properties and overrides, pre-processing filters, parameters, and stages, and the complete build sequence. The debug log can help you determine the root cause of a problem. diff --git a/topics/error-messages-details.xml b/topics/error-messages-details.xml index 769ac28c9..ffacd893a 100644 --- a/topics/error-messages-details.xml +++ b/topics/error-messages-details.xml @@ -71,7 +71,7 @@ An alternate stylesheet was specified to run in place of the default XSLT output process, but that stylesheet could not be loaded. - Please correct the parameter to specify a valid stylesheet. + Correct the parameter value to specify a valid stylesheet. XSLT stylesheet error @@ -89,25 +89,25 @@ The running footer file, which contains content to be added to the bottom of each XHTML output topic, cannot be located or read. This is - usually caused by a typo in the parameter value. You should also ensure that the value is not specified - with "file:" as a prefix. + usually caused by a typo in the parameter value. You should also make sure the value is not specified with + file: as a prefix. The running header file, which contains content to be added to the top of each XHTML output topic, cannot be located or read. This is - usually caused by a typo in the parameter value. You should also ensure that the value is not specified - with "file:" as a prefix. + usually caused by a typo in the parameter value. You should also make sure the value is not specified with + file: as a prefix. The running heading file, which contains content to be added to the head section of each HTML output topic, cannot be located or read. This is usually caused by a typo in the parameter value. You should also ensure - that the value is not specified with "file:" as a prefix. + that the value is not specified with file: as a prefix. An alternate stylesheet was specified to run in place of the default XSL-FO output process, but that stylesheet could not be loaded. - Please correct the parameter to specify a valid stylesheet. + Correct the parameter value to specify a valid stylesheet. @@ -121,51 +121,51 @@ indexterm contains other indexterm children. - Please ensure that the input file - path and file name were entered correctly. + Make sure the input file path and + file name were entered correctly. - The transform was unable to create - files properly during the transform; results may not be as expected. + The transformation was unable to + create certain files; results may not be as expected. This message may indicate an - invalid input file (such as accidentally specifying a PDF file as input rather than a DITA map file), an - input file that uses elements which are not allowed, are not part or a DITA file that has errors and - cannot be parsed as XML. You could also be using a specialized DITA document type that needs external - plug-ins in order to be parsed correctly. The message issued by the XML parser should provide additional - information to help diagnose the cause. + invalid input (such as a PDF accidentally specified as input rather than a DITA map file), an input file + that uses elements that are not allowed, or a DITA file that has errors and cannot be parsed as XML. You + could also be using a specialized DITA document type that needs external plug-ins to be parsed correctly. + The message issued by the XML parser should provide additional information to help diagnose the + cause. This message may indicate a - reference to an invalid file (such as accidentally referencing a PDF or unknown XML file as if it was - DITA), a referenced file that uses elements which are not allowed, or a referenced DITA file that has - errors and cannot be parsed as XML. You could also be using a specialized DITA document type that needs - external plug-ins in order to be parsed correctly. The message issued by the XML parser should provide - additional information to help diagnose the cause. + reference to an invalid file (such as a PDF or unknown XML file referenced as if it was DITA), a file that + uses elements that are not allowed, or a DITA file that has errors and cannot be parsed as XML. You could + also be using a specialized DITA document type that needs external plug-ins to be parsed correctly. The + message issued by the XML parser should provide additional information to help diagnose the cause. An empty - indexterm element was found, and will appear in the index as ***. This index - term should be removed from the source. + indexterm element was found, and will appear in the index as + ***. This index term should be removed from the source. - This will appear when one installed - plug-in requires another in order to function correctly, but the required plug-in is not found. The - installed plug-in will be ignored. + This message appears when one + plug-in requires another to function correctly, but the required dependency is not found. The installed + plug-in will be ignored. This may appear if filter conditions on the root element of a topic cause the entire topic to be filtered out. To remove this - message, you could place any filter conditions on the reference to this file, which will prevent the build - from accessing this file. + message, move any filter conditions to the topic reference to prevent the build from accessing this + resource. - Either the input file or the - ditaval file should change, otherwise your build is explicitly excluding all content. + To remove this message, update the + filtering conditions in the input file or the DITAVAL file to permit access to the content, or move filter + conditions to the topic reference to prevent the build from accessing this resource. Check whether the image exists in @@ -177,7 +177,7 @@ This message should only appear in the following cases:
      -
    • Errors earlier in the transform prevented this step of the transform from running; correct any +
    • Earlier errors in the build prevented this step of the transformation from running; correct any errors and try the build again.
    • An Ant build or plug-in is directly calling the toolkit’s topic merge module, and is doing so improperly; in this case the Ant build or plug-in needs to be fixed.
      • @@ -195,20 +195,20 @@ When referencing a non-DITA file, - the format attribute should indicate the type of file referenced (such as "html" for HTML topics or "pdf" - for PDF files). Otherwise, the transform may attempt to parse the referenced document as a DITA - topic. + the format attribute should indicate the type of file referenced (such as + html for HTML topics or pdf for PDF files). Otherwise, the toolkit may + attempt to parse the referenced document as a DITA topic. - The domains attribute is used in - specialized DITA documents to help determine which domain elements are legal. This message will only - appear if a DITA specialization was not defined properly. + The domains + attribute is used in specialized DITA documents to help determine which domain elements are legal. This + message will only appear if a DITA specialization was not defined properly. All specialized DITA elements must - define a class attribute to provide ancestry information. This message will only appear if a specialized - DITA element did not define a class attribute, or if non-DITA elements are included in a DITA - context. + define a class attribute to provide ancestry information. This message will only appear + if a specialized DITA element did not define a class attribute, or if non-DITA elements + are included in a DITA context. This informational message is @@ -219,47 +219,48 @@ - DITA processing is based on class - attributes defined for every element. Usually these are defaulted in the DTD or Schema; if no DTD or - Schema is used, the class attributes must be explicitly included in the map or topic. + DITA processing is based on + class attributes defined for every element. Usually these are defaulted in the DTD or + schema; if no DTD or schema is used, the class attributes must be explicitly included in + the map or topic. - This will appear when a topic is - outside the scope of the map; for example, if the main input map references + This message appears when a topic + is outside the scope of the map; for example, if the main input map references "../other-directory/some.dita". The result would cause an output file to be created outside of the output directory. See - DITA-OT common parameters (outer.control and generate.copy.outer) - for details. + DITA-OT common parameters (outer.control and + generate.copy.outer) for details. generate.copy.outer - This will appear when a topic is - outside the scope of the map; for example, if the main input map references + This message appears when a topic + is outside the scope of the map; for example, if the main input map references "../other-directory/some.dita". The result would cause an output file to be created - outside of the output directory. If you do not want to see the warning message, please use the Ant - parameter 'outer.control', and set the value to "quiet". Otherwise, move the referenced file into the - input dita/map directory. See + outside of the output directory. If you do not want to see the warning message, use the + outer.control parameter and set the value to . Otherwise, + move the referenced file into the input directory. See DITA-OT common parameters (outer.control and generate.copy.outer) for details. generate.copy.outer - DITA processing is based on class - attributes defined for every element. Usually these are defaulted in the DTD or Schema; if validation - against the DTD or Schema is turned off, the class attributes must be explicitly included in the map or - topic. + DITA processing is based on + class attributes defined for every element. Usually these are defaulted in the DTD or + schema; if no DTD or schema is used, the class attributes must be explicitly included in + the map or topic. This appears to indicate an error - in creating specialized metadata elements. Please verify that the document type you are using is complete - and complies with DITA Specialization rules. + in creating specialized metadata elements. Check that the document type you are using is complete + and complies with DITA specialization rules. metadata specialization error - Please see the topic on + See - Please see the topic on + See - The conref attribute must be a URI - reference to a DITA element. Please see the topic on + The conref + attribute must be a URI reference to a DITA element. See The conref push function was used to replace a single element with two or more alternatives. Only one element may directly replace another - using conref push. See - Conref Push in the DITA specification for more information about - the conref push "replace" function. + using conref push. For more information about the conref pushreplace action, see + The conaction attribute in the DITA specification. The target for a conref push action - does not exist; please make sure that the syntax is correct and that the target exists. See the topic on + does not exist; make sure that the syntax is correct and that the target exists. See - Please see the topic on - Conref Push in the DITA specification for details on expected - syntax for this function. + For details on the expected + syntax for this function, see + The conaction attribute in the DITA specification. This informational message is @@ -338,7 +332,7 @@ A DITA Subject Scheme map was used - to limit values that are available to the specified attribute. Please correct the attribute so that it + to limit values that are available to the specified attribute. Correct the attribute value so that it uses one of the allowed values. @@ -348,26 +342,27 @@ otherEntry as an index term. - The target for a coderef element, - which specifies an external text-based file, could not be located or loaded. Please verify that the - reference is correct. -

      Note that for security reasons, references to code samples outside of the scope of the map directory - are not supported by default, as this could allow a reference to access and display any restricted or - hidden file on the system. If you are certain that the path is valid and the file should be loaded, the - current workaround is to set a parameter to allow these references. See + The target for a + coderef element, which specifies an external text-based file, could not be + located or loaded. Make sure the reference is correct. +

      For security reasons, references to code samples outside of the scope of the map directory are not + supported by default, as this could allow a reference to access and display any restricted or hidden + file on the system. If you are certain that the path is valid and the file should be loaded, the current + workaround is to set a parameter to allow these references. See DITA-OT common parameters (outer.control and generate.copy.outer) for details. generate.copy.outer

             DITA-OT supports a special syntax - on coderef elements to specify the character set of the target document. See + on coderef elements to specify the character set of the target document. See for details on the expected syntax. By default, DITA-OT supports the - extensions "dita" and "xml" for DITA topics, as mandated by the DITA specification. Please verify that - your topics use one of these extensions, or configure the toolkit to allow additional extensions. + .dita and .xml file name extensions for DITA topics, as + mandated by the DITA specification. Make sure your topics use one of these extensions, or configure the + toolkit to allow additional extensions. This message indicates that the @@ -378,9 +373,9 @@ %2. - A conref "mark" action has been - used to mark a target element without a corresponding content reference target. This may occur when the - order of the "mark" element and the pushed element is reversed. + A conref mark + action has been used to mark a target element without a corresponding content reference target. This may + occur when the order of the marked element and the pushed element is reversed. @@ -406,21 +401,21 @@ - Ensure that the DITAVAL file - exists. If more than one DITAVAL file is specified, ensure that the paths are delimited using the file - path separator character appropriate for your operating system (semicolon ‘;’ on Windows, - or colon ‘:’ on macOS or Linux). + Make sure the DITAVAL file exists. + If more than one DITAVAL file is specified, ensure that the paths are delimited using the file path + separator character appropriate for your operating system (semicolon ‘;’ on Windows, or + colon ‘:’ on macOS or Linux). This build uses generated text, - such as the phrase "Related information" (which is generated above many link groups). The toolkit was - unable to locate the string %1 for your specified language, so the string will appear - in the default language. This generally indicates that the toolkit’s strings need to be updated to support - your language, or that your language setting is incorrect. + such as the phrase “Related information” (which is generated above many link groups). The + toolkit was unable to locate the string %1 for your specified language, so the text + will appear in the default language. This generally indicates that the toolkit’s strings need to be + updated to support your language, or that your language setting is incorrect. The Eclipse help system requires a - title in the project files generated from your map. Please add a title to your input map to get valid + title in the project files generated from your map. Add a title to your input map to get valid Eclipse help output. @@ -440,13 +435,15 @@ To remove this message, provide a - navigation title for the referenced object in the map or topic, or ensure that you are referencing a valid + navigation title for the referenced object in the map or topic, or make sure you are referencing a valid local DITA target. - Set the format attribute to - identify the format of the file. If the reference is to a DITA document, ensure that the document uses a - valid DITA extension (default supported extensions are "dita" and "xml"). + Set the format + attribute to identify the format of the file. If the reference is to a DITA document, make sure the + document uses a valid DITA extension. By default, DITA-OT supports the .dita and + .xml file name extensions for DITA topics, as mandated by the DITA + specification. The HTML Help compiler will only @@ -454,13 +451,14 @@ included. - Ensure that the file exists and can - be read. + + To fix the table of contents, - specify a navigation title in your map or ensure that the referenced file is local and can be accessed. - + specify a navigation title in your map or make sure the referenced file is local and can be accessed. table of contents navigation title table of contents @@ -477,24 +475,24 @@ - The conref attribute must be a URI - reference to an existing DITA element. Please see the topic on + The conref + attribute must be a URI reference to an existing DITA element. See URI-based addressing in the DITA specification for details on the - expected syntax. Note that the name of the file in this message may have be - changed to use a standard dita topic file extension ('.dita' or '.xml'), instead of the original - extension used by the file; it may also include a path to the temporary directory rather than to the - original. + expected syntax. The name of the file in this message may have been changed to + use a standard DITA topic file name extension (.dita or .xml) + instead of the original extension used by the file; it may also include a path to the temporary + directory rather than to the original.

      If the target element exists in your source file, check to make sure it is not filtered out of the build with a DITAVAL file (which will remove the target before conref processing runs).

             - When pulling content with a conref - attribute, you may only pull from a single element, but the target ID appears twice in the referenced - topic. + When pulling content with a + conref attribute, you may only pull from a single element, but the target ID appears + twice in the referenced topic. This message is deprecated and @@ -503,13 +501,14 @@ This may appear if (for example) you have a ph element that references another phrase, but that phrase itself - contains a reference to the original. This will result in an infinite loop. The toolkit will stop - following the conref trail when this is detected; you will need to correct the reference in your source - files. + contains a reference to the original. The toolkit will stop following the conref trail when this is + detected; you will need to correct the reference in your source files. - The conref attribute must be a URI - reference to a DITA element. Please see the topic on + The conref + attribute must be a URI reference to a DITA element. See - The conref attribute must be a URI - reference to a DITA element. Please see the topic on + The conref + attribute must be a URI reference to a DITA element. See This warning is intended to catch instances where a non-DITA format setting unexpectedly cascades to a DITA topic, which will prevent the - topic from being processed. To remove this message, set the format attribute directly on the indicated - reference. + topic from being processed. To remove this message, set the format attribute directly on + the indicated reference. - Found a value such as <xref - href="">link text</xref>. The empty href attribute is not serving a purpose and has caused problems - with some tools in the past; you should remove the attribute entirely or specify a value. + Found a value such as + <xref href="">link text</xref>. The empty href attribute value + is not serving a purpose and has caused problems with some tools in the past; you should remove the + attribute entirely or specify a value. - The type attribute in DITA is - intended to describe the type of the target; for example, a reference to a concept topic may use - type="concept". Generally, this attribute is optional, and the DITA-OT build will automatically determine - the value during processing. In this case, the type attribute lists a more general type than what is - actually found. This is not an error but may result in unexpected sorting for links to this topic. + The type attribute + in DITA is intended to describe the type of the target; for example, a reference to a concept topic may + use type="concept". Generally, this attribute is optional, and the DITA-OT build will + automatically determine the value during processing. In this case, the type attribute + lists a more general type than what is actually found. This is not an error, but links to this topic may + not be sorted as expected. - The type attribute in DITA is - intended to describe the type of the target; for example, a reference to a concept topic may use - type="concept". Generally, this attribute is optional, and the DITA-OT build will automatically determine - the value during processing. In this case, the specified type value does not match the target, which may - cause your links to sort inappropriately. + The type attribute + in DITA is intended to describe the type of the target; for example, a reference to a concept topic may + use type="concept". Generally, this attribute is optional, and the DITA-OT build will + automatically determine the value during processing. In this case, the specified type + value does not match the target, so links to this topic may not be sorted as expected. DITA-OT is only able to dynamically @@ -564,24 +565,25 @@ The build was unable to get a title - from the referenced topic; instead, a navigation title will be created based on the specified - linktext element inside of topicmeta. + from the referenced topic; instead, a navigation title will be created based on the content of the + linktext element in topicmeta. If the target is a local DITA - topic, ensure the reference is correct and the topic is available. Otherwise, provide a navigation title, - and ensure the scope and format attributes are set appropriately. + topic, make sure the reference is correct and the topic is available. Otherwise, provide a navigation + title, and ensure the scope and format attributes are set + appropriately. - DITA-OT is only able to dynamically - retrieve titles and link text when the target is a local (not peer or external) DITA resource. + DITA-OT can only retrieve titles + and link text when the target is a local DITA resource (not a peer topic). - DITA-OT is only able to dynamically - retrieve titles when the target is a local DITA resource. + DITA-OT can only retrieve titles + and link text when the target is a local DITA resource (not peer or external). - The referenc to this document did + The reference to this document did not specify any link text for generated map-based links; the navigation title will be used as fallback. @@ -595,76 +597,77 @@ target specified and will not generate a link. - The type attribute in DITA is - intended to describe the type of the target; for example, a reference to a concept topic may use - type="concept". Generally, this attribute is optional, and the DITA-OT build will automatically determine - the value during processing. In this case, the type attribute lists a more general type than what is - actually found. This is not an error but may result in unexpected sorting for links to this topic. + The type attribute + in DITA is intended to describe the type of the target; for example, a reference to a concept topic may + use type="concept". Generally, this attribute is optional, and the DITA-OT build will + automatically determine the value during processing. In this case, the type attribute + lists a more general type than what is actually found. This is not an error, but links to this topic may + not be sorted as expected. - The type attribute in DITA is - intended to describe the type of the target; for example, a reference to a concept topic may use - type="concept". Generally, this attribute is optional, and the DITA-OT build will automatically determine - the value during processing. In this case, the specified type value does not match the target, which may - cause your links to sort inappropriately. + The type attribute + in DITA is intended to describe the type of the target; for example, a reference to a concept topic may + use type="concept". Generally, this attribute is optional, and the DITA-OT build will + automatically determine the value during processing. In this case, the specified type + value does not match the target, so links to this topic may not be sorted as expected. The build attempted to access the - specified file in order to retrive a title or short description, but the file could not be found. If the - file exists, it is possible that a DITAVAL file was used to remove the file’s contents from the build. Be - aware that the path information above may not match the link in your topic. + specified file to retrieve a title or short description, but the file could not be found. If the file + exists, it is possible that a DITAVAL file was used to remove the file’s contents from the build. Be aware + that the path information above may not match the link in your topic. When a link or cross reference does not have content, the build will attempt to pull the target’s title for use as link text. If the target is - unavailable, be sure to set the scope attribute to an appropriate value. If the target does not have a - title (such as when linking to a paragraph), be sure to provide link text inside the cross + unavailable, be sure to set the scope attribute to an appropriate value. If the target + does not have a title (such as when linking to a paragraph), be sure to provide link text inside the cross reference. An xref - element specifies type="li", which indicates a link to a list item, but the item number could not be - determined to use as link text. Please specify link text inside the reference, or ensure that you are + element specifies type="li", which indicates a link to a list item, but the item number + could not be determined to use as link text. Specify link text inside the reference, or make sure you are referencing an available list item. The cross reference goes to a list item in an unordered list. The process could not automatically generate link text because the list item is - not numbered. Please provide link text within the cross reference. + not numbered. Provide link text within the cross reference. An xref - element specifies type="fn", which indicates a link to a footnote, but the footnote number could not be - determined to use as link text. Please specify link text inside the reference, or ensure that you are - referencing an available footnote. + element specifies type="fn", which indicates a link to a footnote, but the footnote + number could not be determined to use as link text. Specify link text inside the reference, or make sure + you are referencing an available footnote. An xref - element specifies type="dlentry", which indicates a link to a definition list entry, but the term could - not be located to use as link text. Please specify link text inside the reference, or ensure that you are - referencing an available definition list entry + element specifies type="dlentry", which indicates a link to a definition list entry, but + the term could not be located to use as link text. Specify link text inside the reference, or make sure + you are referencing an available definition list entry. No title was found for the current - document, so the HTML output file will set the title to "***". This value - generally appears in the title bar at the top of a browser. + document, so the HTML output file will set the title to ***. + This value generally appears in the title bar at the top of a browser. The object - element in HTML does not support using longdescref for accessibility. To make the object accessible, you - may need to add text before or after the element. You may also be able to handle it with a + element in HTML does not support longdescref for accessibility. To make the object + accessible, you may need to add text before or after the element. You may also be able to handle it with a param element inside the object. This message is generated when - creating draft output in order to help you locate all topics that need to be cleaned up; the cleanup items + creating draft output to help you locate all topics that need to be cleaned up; the cleanup items will appear in your output with styling that makes it stand out. The content will be hidden when the draft parameter is not active. This message is generated when - creating draft output in order to help you locate all topics that have draft comments. Each comment will - appear in your HTML output; the comments will be hidden when the draft parameter is not active. + creating draft output to help you locate all topics that have draft comments. Each comment will appear in + your HTML output; the comments will be hidden when the draft parameter is not active. Because of the way XML and DITA are @@ -680,18 +683,19 @@ DITA-OT is able to remove duplicate links in most cases. However, if two links to the same resource use different attributes or link text, it - is possible for them to appear together. For example, if the same link shows up with role="next" and again - with no specified role, it may show up as both the "Next topic" link and as a related link. Note that - links generated from a reltable in a DITA map will have the role attribute set to - "friend". + is possible for them to appear together. For example, if the same link shows up with + role="next" and again with no specified role, it may show up as both the “Next + topic” link and as a related link. Note that links generated from a + reltable in a DITA map will have the role attribute set to + friend. reltable relationship tables The area - element in an image map must provide a link target for the specified area. Please add an - xref element as a child of area and ensure that it + element in an image map must provide a link target for the specified area. Add an + xref element as a child of area and make sure it specifies a link target. image map @@ -706,24 +710,25 @@ as-is through to the area element in the HTML. - The area element is intended to - define a region in an image map; coordinates must be specified in order to define that region. + The area + element is intended to define a region in an image map; coordinates must be specified to define that + region. The build will not look for peer or external topics before compiling your CHM file, so they may not be included. If you are referencing an actual HTML file that will not be available, it cannot be included in the project, and you should set the - toc attribute to "no" on your topicref element. Otherwise, check to be sure your HTML file was included in - the CHM; if it was not, you will need to place it in the correct location with your other output files and - recompile. + toc attribute to on the topicref element. + Otherwise, make sure the HTML file was included in the CHM; if it was not, you will need to place it in + the correct location with your other output files and recompile. table of contents HTML Help The PDF, ODT, and RTF output - processes cannot automatically convert non-DITA content into DITA in order to merge it with the rest of - your content. The referenced items are ignored. + processes cannot automatically convert non-DITA content into DITA to merge it with the rest of your + content. The referenced items are ignored. Eclipse requires that an ID be @@ -732,83 +737,81 @@ The toolkit is attempting to add - generated text, such as the string "Related information" that appears above links. The requested string - could not be found in any language. Your output may contain a meaningful string, or it may contain a code - that was intended to map to a string. This likely indicates an error in a plug-in or XSL override; either - the string was requested incorrectly, or you will need to provide a mapping for the string in all of the - languages you require. + generated text, such as the string “Related information” that appears above links. The + requested string could not be found in any language. Your output may contain a meaningful string, or it + may contain a code that was intended to map to a string. This likely indicates an error in a plug-in or + XSL override; either the string was requested incorrectly, or you will need to provide a mapping for the + string in all of the languages you require. This will occur if a map references - another map, and then that second map (or another further nested map) references the original map. The - result is an infinite nesting of maps; please correct the chain of map references to remove circular - reference. + another map, and then that second map (or another further nested map) references the original map. Correct + the chain of map references to remove circular references. This will occur when a DITAVAL file contains multiple styling rules that apply to the same element. - The "flagit" named template was - deprecated in DITA-OT version 1.4, when the OASIS standard formalized the DITAVAL syntax. The template is - removed in DITA-OT 1.6. Stylesheets that used this template need to be updated. + The flagit named + template was deprecated in DITA-OT version 1.4, when the OASIS standard formalized the DITAVAL syntax. The + template was removed in DITA-OT 1.6. Any stylesheets that use this template must be updated. The build attempted to access the - specified file in order to retrive a title or short description, but the file could not be found. If the - file exists, it is possible that a DITAVAL file was used to remove the file’s contents from the build. - Another possibility is that the file is located outside of the scope of the main input directory, and was - not available because the + specified file to retrieve a title or short description, but the file could not be found. If the file + exists, it is possible that a DITAVAL file was used to remove the file’s contents from the build. Another + possibility is that the file is located outside of the scope of the main input directory, and was not + available because the onlytopic.in.map parameter was specified. Be aware that the path information above may not match the link in your topic. The link appears to use valid - syntax to reference a DITA element, but that element cannot be found. Please verify that the element - exists, and is not removed from the build by DITAVAL based filtering. + syntax to reference a DITA element, but that element cannot be found. Check that the element + exists, and is not removed from the build by DITAVAL filtering. Processing for terms, acronyms, or - abbreviated forms will associate the key from the element’s keyref attribute with a glossentry (glossary - entry) topic. This message will appear if the key was defined, but was not associated with a glossentry - topic. The process will try to use the best available fallback (usually the title of the referenced - topic). + abbreviated forms associates the key from the element’s keyref attribute with a glossary + entry topic. This message appears if the key is defined, but not associated with a + glossentry element. The process will try to use the best available fallback + (usually the title of the referenced topic). Processing for abbreviated form - elements will associate the key from the element’s keyref attribute with a glossentry (glossary entry) - topic. This message will appear if the key was defined, but was not associated with a glossentry topic. - This element is only supported with keys that are associated with glossary topics; the element will not - generate any output. Please correct the reference, or use a different element to reference your - topic. + elements associates the key from the element’s keyref attribute with a glossary entry + topic. This message appears if the key is defined, but not associated with a + glossentry element. This element is only supported with keys that are + associated with glossary topics; the element will not generate any output. Correct the reference, or use a + different element to reference your topic. According to the DITA - Specification, references from maps should either go to DITA Maps, DITA Topics, or any non-DITA resource. - References below the topic level should only be made from cross references (using - xref or similar) inside of a topic. For details, see the href attribute - description in the OASIS standard’s definition of the + specification, references from maps should either point to DITA maps, DITA topics, or non-DITA resources. + References below the topic level should only be made via xref cross references + within topics. For details, see the href attribute description in the topicref element. + >topicref element definition. - This will appear when generating - PDF or ODT output that includes a link to a local topic, but the referenced topic is not part of the map - itself. This will result in a broken link. You should include the topic in your map or remove the link - from the build. + This message appears when + generating PDF or ODT output that includes a link to a local topic, but the referenced topic is not part + of the map itself. This will result in a broken link. You should include the topic in your map or remove + the link from the build. - The copy-to attribute is used to - copy a topic over a document that already exists. Please make sure that any copy-to attributes use a - unique name so that the copy will not overwrite existing content. + Make sure that all + copy-to attributes define unique names. Two different topics are copied to - the same location using copy-to; as a result, one of these files would be over-written. Only the first - instance of this copy-to value will be recognized. Please correct the use of copy-to attributes. + the same location using copy-to attributes. To prevent data loss, only the first instance + will be applied. To create multiple copies, make sure that all copy-to attributes define + unique names. This message indicates that your @@ -818,10 +821,10 @@ This PDF build uses generated text, - such as the phrase "Related information" (which is generated above many link groups). The toolkit was - unable to locate the string %1 for your specified language, so the string will appear - in the default language. This generally indicates that the toolkit’s strings need to be updated to support - your language, or that your language setting is incorrect. + such as the phrase “Related information” (which is generated above many link groups). The + toolkit was unable to locate the string %1 for your specified language, so the text + will appear in the default language. This generally indicates that the toolkit’s strings need to be + updated to support your language, or that your language setting is incorrect. @@ -834,16 +837,17 @@ The PDF index process relies on pre-defined letter headings when sorting terms. The specified term does not begin with a character that - can be mapped to an existing heading. Typically this term would be placed in a "Special characters" - group, but the current language did not specify such a group when setting up the index sort - process. + can be mapped to an existing heading. Typically this term would be placed in a “Special + characters” group, but the current language did not specify such a group when setting up the + index sort process. The PDF index process relies on pre-defined letter headings when sorting terms. The specified term does not begin with a character that can be mapped to an existing heading, so it has been placed under a heading for terms that begin with special characters such as punctuation. If this term should be sorted under a new or existing letter - heading, please open an issue with DITA-OT to correct the sort. + heading, open an issue in the DITA-OT + to correct the sort. Found an diff --git a/topics/implement-saxon-customizations.dita b/topics/implement-saxon-customizations.dita index 2a884ea51..a218f1b14 100644 --- a/topics/implement-saxon-customizations.dita +++ b/topics/implement-saxon-customizations.dita @@ -30,7 +30,7 @@ Saxon XSLT Saxon - preprocessing + pre-processing extension points, Saxon Java ServiceLoader diff --git a/topics/installing.ditamap b/topics/installing.ditamap index b637340f0..379dc9a9e 100644 --- a/topics/installing.ditamap +++ b/topics/installing.ditamap @@ -11,7 +11,7 @@ - Building output + First build diff --git a/topics/logging.dita b/topics/logging.dita index f7131bf2c..f7d296db8 100644 --- a/topics/logging.dita +++ b/topics/logging.dita @@ -47,7 +47,7 @@ --debug.

      Debug logging prints considerably more additional information. The debug log includes all information from the verbose log, plus details on Java classes, additional Ant properties and overrides, - preprocessing filters, parameters, and stages, and the complete build sequence.

      + pre-processing filters, parameters, and stages, and the complete build sequence.

      Debug logging requires additional resources and can slow down the build process, so it should only be enabled when further details are required to diagnose problems. diff --git a/topics/migrating-to-1.6.dita b/topics/migrating-to-1.6.dita index 931fbc2d0..6d378198f 100644 --- a/topics/migrating-to-1.6.dita +++ b/topics/migrating-to-1.6.dita @@ -105,7 +105,7 @@ workdir-uri contains a URI instead of a system path.

    - Preprocessing + Pre-processing

    The following deprecated templates and modes have been removed in topic pull stylesheets:

    • inherit
      • diff --git a/topics/migrating-to-1.7.dita b/topics/migrating-to-1.7.dita index 7818c0fa0..e93917aad 100644 --- a/topics/migrating-to-1.7.dita +++ b/topics/migrating-to-1.7.dita @@ -8,7 +8,7 @@ To 1.7 - In DITA-OT 1.7, a new preprocessing step implements flagging for HTML-based output formats. PDF processing + In DITA-OT 1.7, a new pre-processing step implements flagging for HTML-based output formats. PDF processing was corrected with regard to shortdesc handling, and a new XSLT template mode was introduced for HTML TOC processing. Several stylesheets were moved to plug-in specific folders and deprecated properties and XSLT variables were removed. @@ -61,8 +61,8 @@ instance methods.

    - Preprocessing -

    The preprocessing Ant dependency chain has been cleaned up. Tasks no longer depend on the previous task in the + Pre-processing +

    The pre-processing Ant dependency chain has been cleaned up. Tasks no longer depend on the previous task in the default chain, but rather the whole preprocess dependency chain is defined by the preprocess task.

    diff --git a/topics/migrating-to-1.8.dita b/topics/migrating-to-1.8.dita index d229bb8c9..553cf9f1b 100644 --- a/topics/migrating-to-1.8.dita +++ b/topics/migrating-to-1.8.dita @@ -61,7 +61,7 @@
    - Preprocessing + Pre-processing

    The following deprecated Ant properties have been removed:

    • dita.script.dir, use ${dita.plugin.id.dir} instead
      • @@ -74,7 +74,7 @@
      XHTML

      XSLT Java extension ImgUtils has been removed from stylesheets and been replaced with - preprocessing module ImageMetadataModule. The old ImgUtils Java classes are + pre-processing module ImageMetadataModule. The old ImgUtils Java classes are still included in the build.

      diff --git a/topics/migrating-to-2.1.dita b/topics/migrating-to-2.1.dita index 3677e583a..0e7c3268d 100644 --- a/topics/migrating-to-2.1.dita +++ b/topics/migrating-to-2.1.dita @@ -88,7 +88,7 @@
      - Preprocessing + Pre-processing

      The following Ant properties and generated list files have been deprecated:

      • imagefile property and image.list file
        • @@ -102,7 +102,7 @@ before the copy-subsidiary step in the pre-processing stage.

      A newdita.parser extension point has been added to allow plug-ins to contribute a - custom parser for DITA files. If a custom DITA parser is defined, the preprocessing routines will use it during + custom parser for DITA files. If a custom DITA parser is defined, the pre-processing routines will use it during the gen-list and debug-filter stages to output DITA XML.

      @@ -147,7 +147,7 @@ keydef

      The dita.out.map.xhtml.toc target has been deprecated and should be replaced with the updated dita.map.xhtml.toc equivalent.

      -

      Keydef processing has been removed from the XHTML rendering code. Keys are now resolved in one preprocessing +

      Keydef processing has been removed from the XHTML rendering code. Keys are now resolved in one pre-processing step, whereas in earlier versions of DITA-OT, the XHTML code returned to the keydef.xml file to look up targets for phrase elements and pull in text when needed.

      This change affects non-linking elements that can’t take href attributes, such as diff --git a/topics/migrating-to-2.3.dita b/topics/migrating-to-2.3.dita index df68740e8..01a9a5cf9 100644 --- a/topics/migrating-to-2.3.dita +++ b/topics/migrating-to-2.3.dita @@ -134,7 +134,7 @@

    • conreffile

    -

    The following preprocessing targets have been deprecated: +

    The following pre-processing targets have been deprecated:

    • conref-check
    • coderef
      • diff --git a/topics/migrating-to-3.0.dita b/topics/migrating-to-3.0.dita index 9409692ad..a9d10e375 100644 --- a/topics/migrating-to-3.0.dita +++ b/topics/migrating-to-3.0.dita @@ -9,7 +9,7 @@ DITA-OT 3.0 adds support for Markdown, normalized DITA output, and the alternative - authoring formats proposed for Lightweight DITA. The map-first preprocessing approach provides a modern + authoring formats proposed for Lightweight DITA. The map-first pre-processing approach provides a modern alternative to the default preprocess operation. @@ -66,12 +66,14 @@
    - Map-first preprocessing + Map-first pre-processing

    See - for information on how to use (or test) map-first preprocessing, or revert to - the default preprocess target. + for information on how to use (or test) map-first pre-processing, or revert to + the legacy preprocess target.

    diff --git a/topics/migrating-to-3.6.dita b/topics/migrating-to-3.6.dita index 4342eb2a5..f585c20be 100644 --- a/topics/migrating-to-3.6.dita +++ b/topics/migrating-to-3.6.dita @@ -23,7 +23,7 @@
    Parallel processing parallel processing -

    Preprocessing module code can now be run in parallel by setting the parallel parameter to +

    Pre-processing module code can now be run in parallel by setting the parallel parameter to . The performance benefits this option provides depend heavily on the source file set, the DITA features used in the project, and the computer doing the processing, but under the right circumstances, you may see notable improvements when this option is enabled.

    diff --git a/topics/migrating-to-4.1.dita b/topics/migrating-to-4.1.dita index e4aff13a7..a1092de61 100644 --- a/topics/migrating-to-4.1.dita +++ b/topics/migrating-to-4.1.dita @@ -25,8 +25,8 @@ plug-ins from overriding the monospace font presentation of teletype tt elements.

    These changes move the default teletype styling to CSS to allow users to override the presentation in custom stylesheets. The output is visually equivalent to the results generated by previous toolkit versions.

    - In publishing environments that do not use the default common CSS files, these styles may - need to be implemented in custom stylesheets. + In publishing environments that do not use the default CSS files, these styles may need to + be implemented in custom stylesheets.
    diff --git a/topics/migrating-to-4.2.dita b/topics/migrating-to-4.2.dita new file mode 100644 index 000000000..75fbf7e41 --- /dev/null +++ b/topics/migrating-to-4.2.dita @@ -0,0 +1,95 @@ + + + + + + Migrating to release 4.2 + + To 4.2 + + + DITA-OT 4.2 uses map-first pre-processing for HTML5 output and includes a new local + configuration file, better CLI messages with support for overrides, a new version of the Lightweight DITA plug-in + with enhancements to Markdown processing, and updates for the latest DITA 2.0 draft standard. + + + + + filters + map-first pre-processing + map-first pre-processing + pre-processing + map first + pipelines + map first + + + + + +
    + This topic provides a summary of changes in DITA-OT 4.2 that may require modifications to custom stylesheets + or plug-ins. For more information on changes in this release, see the + . +
    + +
    + Common CSS changes + note__body class + cellrowborder class + row-nocellborder class + cell-norowborder class + nocellnorowborder class + firstcol class +

    DITA-OT 4.2 includes several changes to the cascading style sheets generated by the HTML5 plug-in.

    +
      +
    • HTML5 processing for note elements now wraps the note body in a + div element with the note__body class, allowing it to be styled + separately from the note title. For backwards compatibility, the common CSS files have been updated to display + the note body inline with the note title to avoid a new line break before the content division element. + #3955 +
      • +
    • The DITA standard defines a compact attribute for list elements. Previously, this + attribute was published to XHTML and HTML5 as an HTML compact attribute. However, the + compact attribute was deprecated in HTML4 (over 20 years ago). Now, DITA + compact attributes are published to XHTML and HTML5 as class="compact" + keywords. New rules with the class selectors have been added to the default CSS files. Rules with the legacy + compact list attributes have been marked as deprecated with Sass warn + rules and will be removed from a future version of DITA-OT. Any custom CSS rules referencing the + compact attribute should be updated. + #4298, + #4303, + #4358 +
      • +
    • Legacy table presentation classes that were deprecated in DITA-OT 2.3 have now been removed from + the common CSS files. + #4364 +
        +
      • cellrowborder
        • +
      • row-nocellborder
        • +
      • cell-norowborder
        • +
      • nocellnorowborder
        • +
      • firstcol
        • +
      +
      • +
    + In publishing environments that do not use the default CSS files — or those that include + HTML generated by older versions of DITA-OT — these styles may need to be implemented in custom + stylesheets. +
    + +
    + +
    + Map-first pre-processing +

    +

    + See + for information on how to use (or test) map-first pre-processing, or revert to + the legacy preprocess target. +

    + + + diff --git a/topics/migration.ditamap b/topics/migration.ditamap index 0f856859f..13a076f9b 100644 --- a/topics/migration.ditamap +++ b/topics/migration.ditamap @@ -4,6 +4,7 @@ Migrating customizations + diff --git a/topics/other-errors.dita b/topics/other-errors.dita index 30a5d15a7..8f7fb377e 100644 --- a/topics/other-errors.dita +++ b/topics/other-errors.dita @@ -20,7 +20,7 @@ tools.jar XSLT errors - preprocessing + pre-processing XSLT debugging generate-debug-attributes diff --git a/topics/plugin-antpreprocess.dita b/topics/plugin-antpreprocess.dita index 8fc41dc3a..691a770bb 100644 --- a/topics/plugin-antpreprocess.dita +++ b/topics/plugin-antpreprocess.dita @@ -14,7 +14,7 @@ plug-ins Ant Ant - preprocessing + pre-processing diff --git a/topics/plugin-anttarget.dita b/topics/plugin-anttarget.dita index ede6f3745..0c519da57 100644 --- a/topics/plugin-anttarget.dita +++ b/topics/plugin-anttarget.dita @@ -15,7 +15,7 @@ plug-ins Ant ant.import - preprocessing + pre-processing Ant targets diff --git a/topics/plugin-coding-conventions.dita b/topics/plugin-coding-conventions.dita index c7f9e31f2..c1746ee07 100644 --- a/topics/plugin-coding-conventions.dita +++ b/topics/plugin-coding-conventions.dita @@ -18,7 +18,7 @@ best practices XSLT best practices - preprocessing + pre-processing XSLT diff --git a/topics/plugin-messages.dita b/topics/plugin-messages.dita index b3562f8ac..00144dfa9 100644 --- a/topics/plugin-messages.dita +++ b/topics/plugin-messages.dita @@ -20,7 +20,7 @@ plug-ins XSLT errors - preprocessing + pre-processing XSLT diff --git a/topics/plugin-newextensions.dita b/topics/plugin-newextensions.dita index 76d5b1a56..1c13fdb32 100644 --- a/topics/plugin-newextensions.dita +++ b/topics/plugin-newextensions.dita @@ -26,7 +26,7 @@ creating XSLT extension points - preprocessing + pre-processing XSLT metadata plug-in diff --git a/topics/plugin-overridestyle.dita b/topics/plugin-overridestyle.dita index 953c26818..f8898b9c7 100644 --- a/topics/plugin-overridestyle.dita +++ b/topics/plugin-overridestyle.dita @@ -14,7 +14,7 @@ plug-ins XSLT XSLT - preprocessing + pre-processing XHTML diff --git a/topics/plugin-preprocess-xslt.dita b/topics/plugin-preprocess-xslt.dita index 4c6776638..253681967 100644 --- a/topics/plugin-preprocess-xslt.dita +++ b/topics/plugin-preprocess-xslt.dita @@ -84,7 +84,7 @@ - The filter.xsl stylesheet will transform every DITA topic after preprocessing. + The filter.xsl stylesheet will transform every DITA topic after pre-processing. diff --git a/topics/reducing-processing-time.dita b/topics/reducing-processing-time.dita index 637dffffe..5f55a8e65 100644 --- a/topics/reducing-processing-time.dita +++ b/topics/reducing-processing-time.dita @@ -31,7 +31,7 @@
    Use a fast disk for the temporary directory

    DITA-OT keeps topic and map files as separate files and processes each file multiple times during - preprocessing. Thus reading from disk, parsing XML, serializing XML, and writing to disk makes processing + pre-processing. Thus reading from disk, parsing XML, serializing XML, and writing to disk makes processing quite I/O intensive. Use either an SSD or a RAM disk for @@ -40,7 +40,7 @@

    Enable parallel processing -

    As of DITA-OT 3.6, preprocessing module code can be run in parallel by setting the +

    As of DITA-OT 3.6, pre-processing module code can be run in parallel by setting the parallel parameter to . The performance benefits this option provides depend heavily on the source file set, the DITA features used in the project, and the computer doing the processing, but under the right circumstances, you may see notable improvements when this option diff --git a/topics/referencing-other-plugins.dita b/topics/referencing-other-plugins.dita index e59fd8031..c821d322d 100644 --- a/topics/referencing-other-plugins.dita +++ b/topics/referencing-other-plugins.dita @@ -17,7 +17,7 @@ using file in another plug-in XSLT using another plug-in - preprocessing + pre-processing XSLT catalog referencing diff --git a/topics/troubleshooting.ditamap b/topics/troubleshooting.ditamap index 842b2e8dc..53011bb0b 100644 --- a/topics/troubleshooting.ditamap +++ b/topics/troubleshooting.ditamap @@ -11,5 +11,6 @@ + diff --git a/topics/using-docker-images.dita b/topics/using-docker-images.dita index 4fdf57ad5..36a4643c8 100644 --- a/topics/using-docker-images.dita +++ b/topics/using-docker-images.dita @@ -73,7 +73,7 @@ To build output, map a host directory to a container volume and specify options for the dita command. - $ docker run -it \ + $ docker run --rm \ -v /Users/username/source:/src ghcr.io/dita-ot/dita-ot: \ -i /src/input.ditamap \ -o /src/out \ @@ -92,7 +92,7 @@

    On Windows, if your Users directory is on the C:\ drive, use /c/Users/… to map the host directory:

    - > C:\Users\username> docker run -it ^ + > C:\Users\username> docker run --rm ^ -v /c/Users/username/source:/src ghcr.io/dita-ot/dita-ot: ^ -i /src/input.ditamap ^ -o /src/out ^ diff --git a/topics/web-based-resources.dita b/topics/web-based-resources.dita index a0674edff..704d80b8f 100644 --- a/topics/web-based-resources.dita +++ b/topics/web-based-resources.dita @@ -37,7 +37,7 @@ >DITA-OT Discussions
    The DITA-OT Discussions forum on GitHub is a collaborative communication platform that allows members of - the community to ask questions, share suggestions, upvote discussions to signal support, and mark questions as anwered. + the community to ask questions, share suggestions, upvote discussions to signal support, and mark questions as answered. GitHub Discussions DITA-OT Discussions