diff --git a/.github/workflows/ci_optimize_svgs.yml b/.github/workflows/ci_optimize_svgs.yml deleted file mode 100644 index 3c3bec5bc8..0000000000 --- a/.github/workflows/ci_optimize_svgs.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: SVG Optimization Workflow -on: - push: - # trigger on all branches except for main, release and dependabot-triggered push events - branches-ignore: [main, release, dependabot/**] - tags-ignore: [v*] - paths: - - '**.svg' - -# The minimum required permissions -permissions: - contents: write - -jobs: - svgs: - name: Optimize SVGs - runs-on: ubuntu-latest - if: github.repository_owner == 'webern-unibas-ch' - steps: - - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4.1.3 - - name: Optimize SVGs - uses: ericcornelissen/svgo-action@b8b3198fffbb1210e81aa68cde2ca4e4568d5386 # ratchet:ericcornelissen/svgo-action@v4.0.8 - id: svgo - with: - repo-token: ${{secrets.GITHUB_TOKEN}} - svgo-version: 3 # defaults to 2 - - name: Commit optimizations - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # ratchet:stefanzweifel/git-auto-commit-action@v5.0.1 - if: ${{steps.svgo.outputs.DID_OPTIMIZE}} - with: - commit_message: 'fix(assets): optimize ${{steps.svgo.outputs.OPTIMIZED_COUNT}} SVG(s) with SVGO' diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 974ed9d522..22b7509e67 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -11,66 +11,196 @@ on: branches: [develop] types: [opened, synchronize, reopened] +permissions: + contents: read + # globals env: # general settings MAIN_REPO_OWNER: webern-unibas-ch # Main repo owner (default: webern-unibas-ch; should not be changed) + # dev settings + DEV_REPO: webern-unibas-ch/awg-app-dev + DEV_GH_PAGES_BRANCH: gh-pages + DEV_GH_PAGES_DIR: gh-pages-dir + DIST_DIR: dist + jobs: test: name: Run tests (Node v${{ matrix.node-version }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} + strategy: matrix: os: [ubuntu-latest] node-version: [18.19, 20.9] # TODO (when Angular allows it): 21.x + + outputs: + sha: ${{ steps.get-sha.outputs.SHA }} + steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4.1.3 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5 with: fetch-depth: 0 # Get all history and branches + + - name: Get git sha + id: get-sha + run: echo "SHA=$(git describe)" >> $GITHUB_OUTPUT + + - name: Verify git sha + run: | + echo "SHA: ${{ steps.get-sha.outputs.SHA }}" + - name: Set up node ${{ matrix.node-version}} uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # ratchet:actions/setup-node@v4.0.2 with: node-version: ${{ matrix.node-version }} cache: 'yarn' + - name: yarn install dependencies run: | yarn install + - name: Run CI tests with coverage run: | yarn run test:ci + - name: Upload code coverage if: matrix.node-version == 20.9 # upload coverage report for current node version only - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # ratchet:codecov/codecov-action@v4.3.0 + uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: flags: unittests env_vars: ${{ matrix.os }}, ${{ matrix.node-version }} + - name: Perform SonarCloud Analysis if: matrix.node-version == 20.9 && github.event_name != 'pull_request' && github.repository_owner == env.MAIN_REPO_OWNER # perform SonarCloud analysis only for current node version and not with pull requests or forks(token issue) uses: SonarSource/sonarcloud-github-action@49e6cd3b187936a73b8280d59ffd9da69df63ec9 # ratchet:SonarSource/sonarcloud-github-action@v2.1.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - - name: Test build for GH Pages + + - name: Test build from develop for GH Pages + if: github.ref == 'refs/heads/develop' + run: | + echo "Updating dev-version" + yarn run pre-release --release-as ${{ steps.get-sha.outputs.SHA }} --skip.changelog --skip.commit --skip.tag + echo "Building dev-version" + yarn run build:dev + + - name: Test build from main for GH Pages + if: github.ref == 'refs/heads/main' run: | yarn run build:gh + + - name: Upload build artifacts + if: matrix.node-version == 20.9 # upload build artifacts for current node version only + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # ratchet:actions/upload-artifact@v4.3.3 + with: + name: dist + path: ${{ github.workspace }}/${{ env.DIST_DIR }} + retention-days: 1 + + deploy_dev: + # run only on develop + if: github.ref == 'refs/heads/develop' + + name: Deploy app from develop (Node v${{ matrix.node-version }}, ${{ matrix.os }}) + runs-on: ${{ matrix.os }} + needs: test + + permissions: + contents: write + + env: + SHA: ${{ needs.test.outputs.sha }} + + strategy: + matrix: + os: [ubuntu-latest] + node-version: [20.9] + + steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + + - name: Checkout repository + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5 + with: + # ref (branch, tag or SHA) to check out + ref: ${{ env.DEV_GH_PAGES_BRANCH }} + # relative path under $GITHUB_WORKSPACE to place the repository + path: ${{ env.DEV_GH_PAGES_DIR }} + + - name: Download build artifacts + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # ratchet:actions/upload-artifact@v4.1.7 + with: + name: dist + path: ${{ github.workspace }}/${{ env.DIST_DIR }} + + - name: Copy artifacts to gh-pages + run: | + cp -r ${{ env.DIST_DIR }}/awg-app/. ${{ env.DEV_GH_PAGES_DIR }}/dev/ + + - name: Configure git + working-directory: ${{ env.DEV_GH_PAGES_DIR }} + run: | + echo "Configuring git" + git config user.name "github-actions" + git config user.email "github-actions@users.noreply.github.com" + + - name: Commit files + working-directory: ${{ env.DEV_GH_PAGES_DIR }} + run: | + echo "Running git commit" + git add . + git commit -m "Staging dev (${{ env.SHA }}) on gh-pages" + + - name: Push changes to gh-pages (dry-run mode) + working-directory: ${{ env.DEV_GH_PAGES_DIR }} + run: git push -v --dry-run origin HEAD:$DEV_GH_PAGES_BRANCH + + - name: Push changes to gh-pages + working-directory: ${{ env.DEV_GH_PAGES_DIR }} + run: git push -v origin HEAD:$DEV_GH_PAGES_BRANCH + + - name: Congratulations + if: ${{ success() }} + run: echo "🎉 New develop build deployed 🎊" + deploy: + # run only on main + if: github.ref == 'refs/heads/main' + name: Deploy app from main (Node v${{ matrix.node-version }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} needs: test - # run only on main - if: github.ref == 'refs/heads/main' + permissions: + contents: write + strategy: matrix: os: [ubuntu-latest] node-version: [20.9] + steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4.1.3 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5 - name: Set up node ${{ matrix.node-version}} uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # ratchet:actions/setup-node@v4.0.2 with: @@ -87,25 +217,35 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | yarn run deploy:ci + release: + # run only on tags + if: startsWith(github.ref, 'refs/tags/') + name: Create Release from tag runs-on: ${{ matrix.os }} needs: test - # run only on tags - if: startsWith(github.ref, 'refs/tags/') + permissions: + contents: write + strategy: matrix: os: [ubuntu-latest] node-version: [20.9] steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + - name: Get tag version id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} - name: Create Release id: create_release if: ${{ success() && startsWith(github.ref, 'refs/tags/') }} - uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # ratchet:softprops/action-gh-release@v2.0.4 + uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # ratchet:softprops/action-gh-release@v2.0.5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAG_VERSION: ${{ steps.get_version.outputs.VERSION }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql.yml similarity index 64% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/codeql.yml index d1e2bd0efd..068c567cec 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql.yml @@ -8,6 +8,9 @@ on: pull_request: branches: [develop] +permissions: + contents: read + jobs: analyze: name: Analyze @@ -22,19 +25,24 @@ jobs: language: ['javascript'] steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4.1.3 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: fetch-depth: 2 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # ratchet:github/codeql-action/init@v2.13.4 + uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 with: languages: ${{ matrix.language }} # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # ratchet:github/codeql-action/autobuild@v2.13.4 + uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # ratchet:github/codeql-action/analyze@v2.13.4 + uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 with: category: '/language:${{matrix.language}}' diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 0000000000..eea3e827b9 --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,27 @@ +# Dependency Review Action +# +# This Action will scan dependency manifest files that change as part of a Pull Request, +# surfacing known-vulnerable versions of the packages declared or updated in the PR. +# Once installed, if the workflow run is marked as required, +# PRs introducing known-vulnerable packages will be blocked from merging. +# +# Source repository: https://github.com/actions/dependency-review-action +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + + - name: 'Checkout Repository' + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - name: 'Dependency Review' + uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml new file mode 100644 index 0000000000..2eef15e29d --- /dev/null +++ b/.github/workflows/scorecards.yml @@ -0,0 +1,76 @@ +# This workflow uses actions that are not certified by GitHub. They are provided +# by a third-party and are governed by separate terms of service, privacy +# policy, and support documentation. + +name: Scorecard supply-chain security +on: + # For Branch-Protection check. Only the default branch is supported. See + # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection + branch_protection_rule: + # To guarantee Maintained check is occasionally updated. See + # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained + schedule: + - cron: '20 7 * * 2' + push: + branches: ["develop"] + +# Declare default permissions as read only. +permissions: read-all + +jobs: + analysis: + name: Scorecard analysis + runs-on: ubuntu-latest + permissions: + # Needed to upload the results to code-scanning dashboard. + security-events: write + # Needed to publish results and get a badge (see publish_results below). + id-token: write + contents: read + actions: read + + steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + + - name: "Checkout code" + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + with: + persist-credentials: false + + - name: "Run analysis" + uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 + with: + results_file: results.sarif + results_format: sarif + # (Optional) "write" PAT token. Uncomment the `repo_token` line below if: + # - you want to enable the Branch-Protection check on a *public* repository, or + # - you are installing Scorecards on a *private* repository + # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat. + # repo_token: ${{ secrets.SCORECARD_TOKEN }} + + # Public repositories: + # - Publish results to OpenSSF REST API for easy access by consumers + # - Allows the repository to include the Scorecard badge. + # - See https://github.com/ossf/scorecard-action#publishing-results. + # For private repositories: + # - `publish_results` will always be set to `false`, regardless + # of the value entered here. + publish_results: true + + # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF + # format to the repository Actions tab. + - name: "Upload artifact" + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + with: + name: SARIF file + path: results.sarif + retention-days: 5 + + # Upload the results to GitHub's code scanning dashboard. + - name: "Upload to code-scanning" + uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 + with: + sarif_file: results.sarif diff --git a/.github/workflows/visualize-repo.yml b/.github/workflows/visualize-repo.yml new file mode 100644 index 0000000000..8894752aee --- /dev/null +++ b/.github/workflows/visualize-repo.yml @@ -0,0 +1,30 @@ +name: Visualize repo with diagram + +on: + workflow_dispatch: {} + +permissions: + contents: read + +jobs: + visualize_repo: + permissions: + contents: write # for githubocto/repo-visualizer to commit and push diagrams + runs-on: ubuntu-latest + + steps: + - name: Harden Runner + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + with: + egress-policy: audit + + - name: Checkout repository + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5 + with: + ref: develop + token: ${{ secrets.REPO_TOKEN }} + + - name: Update diagram + uses: githubocto/repo-visualizer@a999615bdab757559bf94bda1fe6eef232765f85 # ratchet:githubocto/repo-visualizer@v0.9.1 + with: + excluded_paths: ".github,.husky,.yarn" diff --git a/.zenodo.json b/.zenodo.json index f6328cc49e..56efb64a5f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -11,6 +11,16 @@ "name": "Thomas Ahrend", "type": "ProjectMember", "affiliation": "@webern-unibas-ch" + }, + { + "name": "Michael Matter", + "type": "ProjectMember", + "affiliation": "@webern-unibas-ch" + }, + { + "name": "Barbara Schingnitz", + "type": "ProjectMember", + "affiliation": "@webern-unibas-ch" } ], "license": "MIT", diff --git a/CHANGELOG.md b/CHANGELOG.md index 60749e5ca4..13c8fb9bef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,140 @@ # Changelog -All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. + +## [0.12.1](https://github.com/webern-unibas-ch/awg-app/compare/v0.12.0...v0.12.1) (2024-05-15) + +### Features + +- **app:** add DSP_API_URL to AppConfig ([e634f0c](https://github.com/webern-unibas-ch/awg-app/commit/e634f0c8b7bfa5a98483152353573a7d77d22874)) +- **assets:** update files for m22 ([33b6944](https://github.com/webern-unibas-ch/awg-app/commit/33b6944deacbe8482f8bdfd16ffb23b8d3e3c738); thanks to [@chael-mi](https://github.com/chael-mi)) +- **core:** add dev preview to footer ([4f24429](https://github.com/webern-unibas-ch/awg-app/commit/4f24429650532a5d5eea4f4994d59b58e1cfed59)) + +### Bug Fixes + +- **app:** use bracket notation to access logos ([f9139e4](https://github.com/webern-unibas-ch/awg-app/commit/f9139e4dc519ecc6f38e3ae61dbf390313cf75ad)) +- **assets:** fix files for m22 ([2e0b73e](https://github.com/webern-unibas-ch/awg-app/commit/2e0b73ed62eb759cb17fd87909aa806876723f0d); thanks to [@chael-mi](https://github.com/chael-mi)) +- **assets:** fix link boxes and textcritics for m22 ([4b12f0e](https://github.com/webern-unibas-ch/awg-app/commit/4b12f0e93dc0dee4a4c0cd176594c39b8604067e)) +- **assets:** fix lost changes in files for m22 ([7bd616a](https://github.com/webern-unibas-ch/awg-app/commit/7bd616a31c528e96794b8f5f968dab8ba46b629c); thanks to [@chael-mi](https://github.com/chael-mi)) +- **assets:** fix source descriptions op12 & 23 ([d559ff0](https://github.com/webern-unibas-ch/awg-app/commit/d559ff0d4b6f1189bb32ac9453e71cfd134676ec)) +- **assets:** fix source evaluation for TF1 of m22 ([#1478](https://github.com/webern-unibas-ch/awg-app/issues/1478)) ([440e4bd](https://github.com/webern-unibas-ch/awg-app/commit/440e4bdbf63429654c00fb63e5c031d704ac09cd); thanks to [@chael-mi](https://github.com/chael-mi)) +- **assets:** pathify svg files for m22 ([#1480](https://github.com/webern-unibas-ch/awg-app/issues/1480)) ([92230c0](https://github.com/webern-unibas-ch/awg-app/commit/92230c05e3ed576b4a2a0db4ca8a01bd47c54763); thanks to [@chael-mi](https://github.com/chael-mi)) +- **assets:** rename and format files for m22 ([fcd18a2](https://github.com/webern-unibas-ch/awg-app/commit/fcd18a25b199a0a98dae65d9ec9554b021c69ab3)) +- **assets:** update files for m22 ([#1491](https://github.com/webern-unibas-ch/awg-app/issues/1491)) ([8caf1df](https://github.com/webern-unibas-ch/awg-app/commit/8caf1dfd3141733d32b8e6e52205cb74ac56bd1b); thanks to [@chael-mi](https://github.com/chael-mi)) +- **assets:** update source description for op12 ([b90d23d](https://github.com/webern-unibas-ch/awg-app/commit/b90d23d37e2c5499ba7e9c6438f9155224dba104); thanks to [@masthom](https://github.com/masthom)) +- **assets:** update source descriptions for AWG I/5 ([d53de7b](https://github.com/webern-unibas-ch/awg-app/commit/d53de7bb7b2b442b56edb401220fcb50da46db5f); thanks to [@masthom](https://github.com/masthom)) +- **core:** remove obsolete app dev url ([9a5e0ca](https://github.com/webern-unibas-ch/awg-app/commit/9a5e0ca72f96348969d53631e0174ed05c35bafb)) +- **home:** fix link to DaSCH mission statement ([c2fce5b](https://github.com/webern-unibas-ch/awg-app/commit/c2fce5b67c55fcae43636d772ecce42908560cc4)) +- **search:** fix html hierarchy in ResourceDetailHeader ([5f0688b](https://github.com/webern-unibas-ch/awg-app/commit/5f0688bb03a9361bb81d6e8654d6cb1ca1211864)) +- **search:** fix tracking id for searchResponse subjects ([643d06a](https://github.com/webern-unibas-ch/awg-app/commit/643d06aca043a0a93228998d14eeaef5d9d7b1e9)) +- **search:** remove additional quotation marks in search results ([5559278](https://github.com/webern-unibas-ch/awg-app/commit/5559278eb3aa8c196423002848bc4036fad81dd2)) + +### Code Refactoring + +- **core:** improve preparation of fulltext search results ([#1495](https://github.com/webern-unibas-ch/awg-app/issues/1495)) ([6ee433d](https://github.com/webern-unibas-ch/awg-app/commit/6ee433d94e5df99afac1ec9d1c99c68f24fd58a1)) +- **core:** improve preparation of fulltext search result text ([936d6f7](https://github.com/webern-unibas-ch/awg-app/commit/936d6f7ba38d7a2961c0642560f5230a83ac553e)) +- **core:** make replaceParagraphTags static method ([a3bf9e9](https://github.com/webern-unibas-ch/awg-app/commit/a3bf9e919d326a083888d05515e716d56a621980)) +- **core:** simplify conversion of richtext values ([fc9ffba](https://github.com/webern-unibas-ch/awg-app/commit/fc9ffba363a430c813581f74b074f8614ebf749f)) + +### Tests + +- **core:** add tests for dev preview ([7685d49](https://github.com/webern-unibas-ch/awg-app/commit/7685d49fa910d3b680e4ce5d074e58ef63f8a27b)) + +### Continuous Integration + +- **gh-actions:** add permissions ([42b9017](https://github.com/webern-unibas-ch/awg-app/commit/42b9017843f6c605508e80f7969a736728cd4217)) +- **gh-actions:** adjust baseHref ([12a1b43](https://github.com/webern-unibas-ch/awg-app/commit/12a1b434cdb5499a208aae1615a0c96f5c11f66a)) +- **gh-actions:** adjust build workflow for dev ([47aa7e4](https://github.com/webern-unibas-ch/awg-app/commit/47aa7e426980c3fcdb1831431bafedfc2e26d5c6)) +- **gh-actions:** adjust gitHead variable ([baf3558](https://github.com/webern-unibas-ch/awg-app/commit/baf35580fe34a1eaee7fa4db5b9f28ee0682c9c3)) +- **gh-actions:** Apply security best practices [StepSecurity] ([a3e6ca0](https://github.com/webern-unibas-ch/awg-app/commit/a3e6ca005d8780ab191e93fffff99e644ba9c24e)) +- **gh-actions:** bring back node setup ([3722f6a](https://github.com/webern-unibas-ch/awg-app/commit/3722f6a157bc4667fdadee209f6218682dcac1b9)) +- **gh-actions:** build dev build once more ([e0741f4](https://github.com/webern-unibas-ch/awg-app/commit/e0741f461729608ffa0e16487e5b1b633a089d51)) +- **gh-actions:** change baseHref for dev build ([e7d8756](https://github.com/webern-unibas-ch/awg-app/commit/e7d87565c7b62494190c9638ecda0c1844b2fa7c)) +- **gh-actions:** copy only content of dist folder ([5454fc5](https://github.com/webern-unibas-ch/awg-app/commit/5454fc5fcea87979bea688cdaa3464dc887261cb)) +- **gh-actions:** create visualize-repo.yml ([3f4dab2](https://github.com/webern-unibas-ch/awg-app/commit/3f4dab20cf9f402013e1e67f85d6ce67195ed89f)) +- **gh-actions:** deploy to website dev ([6699039](https://github.com/webern-unibas-ch/awg-app/commit/669903953ea63002d9d12df45672265a23bbd2f2)) +- **gh-actions:** deploy to website dev (dry-run) ([886a072](https://github.com/webern-unibas-ch/awg-app/commit/886a072638ceb9401f70c76e3e9d53013c1690cf)) +- **gh-actions:** dry run deployment from develop ([2e8b295](https://github.com/webern-unibas-ch/awg-app/commit/2e8b295cb84583d868adca1480f34b3221564eb1)) +- **gh-actions:** fix env variable ([f487bf0](https://github.com/webern-unibas-ch/awg-app/commit/f487bf0a67a2fc399d54cad7ba14c1d61149d7ca)) +- **gh-actions:** fix file syntax ([2ef9f0b](https://github.com/webern-unibas-ch/awg-app/commit/2ef9f0ba97a158ff6d30c2c947b80e1149ba7c2b)) +- **gh-actions:** fix typo ([f5753cc](https://github.com/webern-unibas-ch/awg-app/commit/f5753cc8ad8ca68c2b2ea81f13790d9d62e7f61b)) +- **gh-actions:** fix typoin branch name ([7a39969](https://github.com/webern-unibas-ch/awg-app/commit/7a3996955bdededc6df062afdb8599db49e938da)) +- **gh-actions:** get git sha and fix typo ([a9ab2e5](https://github.com/webern-unibas-ch/awg-app/commit/a9ab2e56f1d439338ec0f4364122ffebfcb75291)) +- **gh-actions:** get sha from describe ([af2f3ab](https://github.com/webern-unibas-ch/awg-app/commit/af2f3ab543aa39f0c431ca7bf8c852568478f1b9)) +- **gh-actions:** move script args to package.json ([2bcafd0](https://github.com/webern-unibas-ch/awg-app/commit/2bcafd00d036b67ad394706cca59488854dfcc22)) +- **gh-actions:** reduce retention period for artifacts ([c288149](https://github.com/webern-unibas-ch/awg-app/commit/c288149d7a0a32399b6778f18569718c7fef9196)) +- **gh-actions:** refactor deploy_dev job ([7f3ddfb](https://github.com/webern-unibas-ch/awg-app/commit/7f3ddfbb4dc54b2870ec5f10266025729e0da95f)) +- **gh-actions:** remove deprecated svgo action ([4bf7a70](https://github.com/webern-unibas-ch/awg-app/commit/4bf7a70c70b49029293e150cf45e8d684caff190)) +- **gh-actions:** remove dry-run ([e622158](https://github.com/webern-unibas-ch/awg-app/commit/e622158cb4db867164f69a56c982a041c7c63244)) +- **gh-actions:** remove dry-run flag ([ef98c75](https://github.com/webern-unibas-ch/awg-app/commit/ef98c757d54ddaa58ae859f8030d4d5e295c4478)) +- **gh-actions:** remove obsolete node setup ([6129f6e](https://github.com/webern-unibas-ch/awg-app/commit/6129f6e4f8c36e637ca2dcdba95d330d2004a52a)) +- **gh-actions:** switch to deploy key ([b6e4957](https://github.com/webern-unibas-ch/awg-app/commit/b6e4957c7b052628e4182cab187b1716e5455777)) +- **gh-actions:** update ci_workflow.yml ([1706573](https://github.com/webern-unibas-ch/awg-app/commit/1706573158538ff5606c3361fccd79085c6094b0)) +- **gh-actions:** update codeql.yml ([8219c4e](https://github.com/webern-unibas-ch/awg-app/commit/8219c4e4b1e8e60b24acef88f7de1bf265b7696f)) +- **gh-actions:** update dev version on build ([ab43248](https://github.com/webern-unibas-ch/awg-app/commit/ab43248e77e78540ad3c0571a09cffb70b975787)) +- **gh-actions:** update scorecards.yml ([5204d88](https://github.com/webern-unibas-ch/awg-app/commit/5204d886db51a1492912f827d2ddca80f39c22cf)) +- **gh-actions:** update visualize-repo.yml ([ecccb8e](https://github.com/webern-unibas-ch/awg-app/commit/ecccb8ee43b90c0b8eb73994242a5b332689a26d)) +- **gh-actions:** upload build artifact only for latest node version ([a1726cf](https://github.com/webern-unibas-ch/awg-app/commit/a1726cfbb8f6840726603eec7774a5d555896a52)) +- **gh-actions:** upload build artifacts ([dbbaa58](https://github.com/webern-unibas-ch/awg-app/commit/dbbaa58dc5214428d1cfa10bfbb50dbc82c4f4b2)) +- **gh-actions:** use correct directory ([f1db97e](https://github.com/webern-unibas-ch/awg-app/commit/f1db97ed409000a6736bf8ac51863464384dd508)) +- **gh-actions:** use dev repo for develop build ([ca5a601](https://github.com/webern-unibas-ch/awg-app/commit/ca5a60172b2b433f9223354c59bdf9dc74201489)) +- **gh-actions:** use different build scripts for develop/main ([49f8b34](https://github.com/webern-unibas-ch/awg-app/commit/49f8b34ecfb59ca8e0da6655662f2af039722485)) +- **gh-actions:** use existing deploy command ([2ff00e9](https://github.com/webern-unibas-ch/awg-app/commit/2ff00e98b21fe9d4cad22e827173923f6e7a0bc6)) +- **gh-actions:** use prebuilt artifacts ([19f0a24](https://github.com/webern-unibas-ch/awg-app/commit/19f0a245f2f5cb91bd20d9dc8c3093aa3a14fe02)) +- **gh-actions:** use script instead of direct command ([acb2a52](https://github.com/webern-unibas-ch/awg-app/commit/acb2a5277964713fe8a3f1e7f989752e570e7522)) + +### Documentation + +- **app:** create SECURITY.md ([ee97005](https://github.com/webern-unibas-ch/awg-app/commit/ee9700566cd919a008a08c5b8f70b972a6bbc29a)) +- **CONTRIBUTING:** update contribution guidelines ([3ec4889](https://github.com/webern-unibas-ch/awg-app/commit/3ec48891f5bbbca61caefa79fa0d3dce483855e7)) +- **README:** add OSSF best pratices badge ([80ee019](https://github.com/webern-unibas-ch/awg-app/commit/80ee019bc1e01f7a52e81adc6f22129d5642ded2)) +- **README:** add sample image of the app ([ff3b009](https://github.com/webern-unibas-ch/awg-app/commit/ff3b0090abd7d534db17f758686e4b0d6ac35f9c)) +- **README:** fix typo in TOC ([39a2a44](https://github.com/webern-unibas-ch/awg-app/commit/39a2a444cd75b2ea361ec7baa3fd7c206bf4a5c6)) +- **README:** update codecov badge ([c652dcd](https://github.com/webern-unibas-ch/awg-app/commit/c652dcd82d3cd5e0957d9b2a142a20cb097bd399)) +- **README:** update README.md ([6f8c4db](https://github.com/webern-unibas-ch/awg-app/commit/6f8c4dbff580c1e4ffe192f7aada5dbd7b269e31)) +- **README:** update README.md ([496b8d4](https://github.com/webern-unibas-ch/awg-app/commit/496b8d4e7c19d9e9ac15e37c5a5cb083cb893825)) +- **README:** update README.md ([44a00af](https://github.com/webern-unibas-ch/awg-app/commit/44a00af977219949da1d4f25a92d31ff9573224b)) + +### Styles + +- **app:** rename class caps -> smallcaps ([#1485](https://github.com/webern-unibas-ch/awg-app/issues/1485)) ([c5a7427](https://github.com/webern-unibas-ch/awg-app/commit/c5a7427f93c55b6d61dea0775f4816f044462ddb)) +- **search:** fix grid and badge classes in search result list ([cf1c29c](https://github.com/webern-unibas-ch/awg-app/commit/cf1c29c98b5cabeaa17a5b337b16e35f158af6fa)) + +### Build System + +- **app:** move build attachments into separate script ([46a0f0b](https://github.com/webern-unibas-ch/awg-app/commit/46a0f0be6c2efb358a5589d31796cc891163b4ef)) +- **app:** update zenodo config file ([8b33b13](https://github.com/webern-unibas-ch/awg-app/commit/8b33b13cc72f66615da26342c3985d88070bb1ff)) +- **deps-dev:** bump @compodoc/compodoc from 1.1.23 to 1.1.24 ([18b5741](https://github.com/webern-unibas-ch/awg-app/commit/18b57411e4dba4ee6d18ca8ab4695ed6e05af084)) +- **deps-dev:** bump @types/node from 18.19.31 to 18.19.32 ([827fb66](https://github.com/webern-unibas-ch/awg-app/commit/827fb66b7dc6101b704d6507f82d90d44bb9dcac)) +- **deps-dev:** bump @types/node from 18.19.32 to 18.19.33 ([8f7bd32](https://github.com/webern-unibas-ch/awg-app/commit/8f7bd3230f95e72e88717c9b5aa3c33d8b1a26c8)) +- **deps-dev:** bump commit-and-tag-version from 12.4.0 to 12.4.1 ([2a75acf](https://github.com/webern-unibas-ch/awg-app/commit/2a75acf30ff113f8abd979f9f65a4a26283cf170)) +- **deps-dev:** bump conventional-recommended-bump from 9.0.0 to 10.0.0 ([f3951cc](https://github.com/webern-unibas-ch/awg-app/commit/f3951cc6366cf07bcf427fc9fe651f15f5865eaa)) +- **deps-dev:** bump eslint-plugin-jsdoc from 48.2.3 to 48.2.4 ([d269688](https://github.com/webern-unibas-ch/awg-app/commit/d269688af5be5d38347a59d8cb86795d2ed22045)) +- **deps-dev:** bump the angular-cli-devkit group with 2 updates ([156cdde](https://github.com/webern-unibas-ch/awg-app/commit/156cdde2e9fe5d710ccc7277cd5e8e5df1d40bb7)) +- **deps-dev:** bump the angular-cli-devkit group with 2 updates ([5f720d0](https://github.com/webern-unibas-ch/awg-app/commit/5f720d02e3ccbd9abecdc07dd02f3b6f635b989f)) +- **deps-dev:** bump the angular-eslint group with 5 updates ([30416a5](https://github.com/webern-unibas-ch/awg-app/commit/30416a5b52fbec24fccd37f6dcf200e8decc2fc4)) +- **deps-dev:** bump the angular-eslint group with 5 updates ([27dff2c](https://github.com/webern-unibas-ch/awg-app/commit/27dff2cd40dd93b3a95b181feab65598dfaebe97)) +- **deps-dev:** bump the typescript-eslint group with 2 updates ([f3eadf1](https://github.com/webern-unibas-ch/awg-app/commit/f3eadf1b79b43a1c6c2c1427551da7f4178d6de2)) +- **deps-dev:** bump the typescript-eslint group with 2 updates ([00bd33b](https://github.com/webern-unibas-ch/awg-app/commit/00bd33b5dde00ece41468b6f3f668bfc397970e8)) +- **deps-dev:** replace deprecated standard-version lib ([08276a5](https://github.com/webern-unibas-ch/awg-app/commit/08276a530f820fc8af0f7b978a1348462cd97011)) +- **deps:** bump actions/checkout from 3.6.0 to 4.1.4 ([ef2ed29](https://github.com/webern-unibas-ch/awg-app/commit/ef2ed29e87490cf67b6cc47ba92162cd0c852145)) +- **deps:** bump actions/checkout from 4.1.3 to 4.1.4 ([e77f141](https://github.com/webern-unibas-ch/awg-app/commit/e77f141e37dc0629fb75ead9122dd7de8fab747c)) +- **deps:** bump actions/checkout from 4.1.4 to 4.1.5 ([c07d798](https://github.com/webern-unibas-ch/awg-app/commit/c07d798ea6df79fd54e92f9d85ba46c87f77824c)) +- **deps:** bump actions/dependency-review-action from 2.5.1 to 4.3.1 ([e177336](https://github.com/webern-unibas-ch/awg-app/commit/e17733654d1ad113648f37cdd4504bb52c58ddbf)) +- **deps:** bump actions/dependency-review-action from 4.3.1 to 4.3.2 ([69f33b6](https://github.com/webern-unibas-ch/awg-app/commit/69f33b6fe33736191adbeef3c636666753b3955d)) +- **deps:** bump actions/upload-artifact from 3.1.3 to 4.3.3 ([9c3ddad](https://github.com/webern-unibas-ch/awg-app/commit/9c3ddadb365737c8f164a250e865bc54930d1d58)) +- **deps:** bump codecov/codecov-action from 4.3.0 to 4.3.1 ([6fb176a](https://github.com/webern-unibas-ch/awg-app/commit/6fb176a8c7a3e889b026e2a2144bd722abb46519)) +- **deps:** bump codecov/codecov-action from 4.3.1 to 4.4.0 ([98642d2](https://github.com/webern-unibas-ch/awg-app/commit/98642d2b36921d84b0b66aceff80005e62b40d79)) +- **deps:** bump ejs from 3.1.9 to 3.1.10 ([36c3416](https://github.com/webern-unibas-ch/awg-app/commit/36c34163d18854800dd7ee566406003bcb875e2a)) +- **deps:** bump github/codeql-action from 3.25.3 to 3.25.4 ([c369f84](https://github.com/webern-unibas-ch/awg-app/commit/c369f848aa4e4d0188546860f21f2466a903531f)) +- **deps:** bump github/codeql-action from 3.25.4 to 3.25.5 ([2c810d2](https://github.com/webern-unibas-ch/awg-app/commit/2c810d2f144455a2daf5d3613d345848b574ce03)) +- **deps:** bump ossf/scorecard-action from 2.0.6 to 2.3.1 ([9be10cf](https://github.com/webern-unibas-ch/awg-app/commit/9be10cfe31b0ac9a4422562c46aff726f170fad3)) +- **deps:** bump ossf/scorecard-action from 2.3.1 to 2.3.3 ([ea380f6](https://github.com/webern-unibas-ch/awg-app/commit/ea380f6e4407a0b7d703f7c8570547ce45e17b56)) +- **deps:** bump softprops/action-gh-release from 2.0.4 to 2.0.5 ([164013a](https://github.com/webern-unibas-ch/awg-app/commit/164013a87cabe4d537f232ae94cd0128a50b1f19)) +- **deps:** bump step-security/harden-runner from 2.7.0 to 2.7.1 ([7bbbc48](https://github.com/webern-unibas-ch/awg-app/commit/7bbbc4891d4d904ecdae193c3dff573c7cfe3da7)) +- **deps:** bump the angular group with 11 updates ([31dcc27](https://github.com/webern-unibas-ch/awg-app/commit/31dcc27e8da6cdc6fe2e941649b0c19032723b93)) +- **deps:** bump the angular group with 11 updates ([4436d0d](https://github.com/webern-unibas-ch/awg-app/commit/4436d0df081e92d87e1bd0a034980eacd816d517)) +- **deps:** bump the angular group with 11 updates ([5bcee59](https://github.com/webern-unibas-ch/awg-app/commit/5bcee59c0d545816fd01c085c33900648222f123)) ## [0.12.0](https://github.com/webern-unibas-ch/awg-app/compare/v0.11.7...v0.12.0) (2024-04-23) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8e9ef2cfa5..650f48359a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,9 +8,13 @@ Please note that this project is released with a [Code of Conduct](CODE_OF_CONDU ## Table of Contents - [Contribution process](#contribution-process) + - [Code Formatting](#code-formatting) + - [Testing](#testing) - [Branching / Git flow](#branching--git-flow) - [Commit Message Schema](#commit-message-schema) + - [Pull Requests](#pull-requests) - [Release Versioning Convention](#release-versioning-convention) + - [Issue Reporting](#issue-reporting) - [Angular quick start guide](#quick-start-guide) - [Prerequisites](#prerequisites) - [Development server](#development-server) @@ -23,6 +27,32 @@ Please note that this project is released with a [Code of Conduct](CODE_OF_CONDU ## Contribution process +### Code Formatting + +This project is set up to use Prettier for code formatting. This should be automatically enabled upon installation. + +Prettier helps enforce a consistent style by parsing your code and re-printing it with its own rules that take the maximum line length into account, wrapping code when necessary. + +In addition to the automatic formatting, you can manually check and fix formatting issues using the following commands: + +- `yarn format-files:check`: This command checks the code for formatting issues. + +- `yarn format-files:fix`: This command fixes any formatting issues that it can. + +### Testing + +This project uses a dynamic testing approach with Jasmine and Karma for unit tests in Angular. Code coverage is measured with CodeCov. + +We encourage contributors to uphold these standards. As such, new contributions are expected to include tests whenever applicable. + +To assist with this, the following commands are provided: + +- `yarn test`: Launches the test runner. + +- `yarn test:cov`: Runs the tests and generates a coverage report. + +- `yarn test:cov:serve`: Runs the tests, generates a coverage report, and serves the coverage report at [http://localhost:9875](http://localhost:9875). + ### Branching / Git flow This project uses the [Gitflow Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) which defines a strict branching model designed around the project releases. Therefore the following branch structure is used @@ -35,15 +65,11 @@ This project uses the [Gitflow Workflow](https://www.atlassian.com/git/tutorials To initialize the GitFlow workflow execute `git flow init` inside your local copy of the repository. -To provide a new feature or changes to the code, create a new feature branch from develop and make a pull request when ready. Keep care of the [Commit Message Schema](#commit-message-schema) described below. - -For more information about pull requests go check out the GitHub Help [About pull requests](https://help.github.com/en/articles/about-pull-requests). - ### Commit Message Schema This project follows the [Conventional Commits Specification](https://conventionalcommits.org) using [commitlint](https://conventional-changelog.github.io/commitlint/#/) based on the [Angular configuration](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-angular) (further explanation can be found in the [Angular commit-message-guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines)). -Using these conventions leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/main/LICENSE.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version) (see "Release Versioning Convention" section below). +Using these conventions leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/main/LICENSE.md) and automate versions by means of [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) (see "Release Versioning Convention" section below). When writing commit messages, we stick to this schema: @@ -72,33 +98,33 @@ Types: Scopes (specific to this project, not part of the Angular convention): -- related to app structure - - `app` - - `assets` - - `contact` - - `core` - - `edition` - - `home` - - `page-not-found` - - `search` - - `shared` - - `side-info` - - `structure` - - `views` - - -- related to build process and tests - - `deps` - - `deps-dev` - - `gh-actions` - - `testing` - - -- related to documentation - - `CHANGELOG` - - `CONTRIBUTING` - - `LICENSE` - - `README` +- related to app structure + + - `app` + - `assets` + - `contact` + - `core` + - `edition` + - `home` + - `page-not-found` + - `search` + - `shared` + - `side-info` + - `structure` + - `views` + +- related to build process and tests + + - `deps` + - `deps-dev` + - `gh-actions` + - `testing` + +- related to documentation + - `CHANGELOG` + - `CONTRIBUTING` + - `LICENSE` + - `README` #### Examples: @@ -113,9 +139,21 @@ feat(edition): add route for resource creation docs(README): add new contributors for data ``` +### Pull Requests + +To provide a new feature or changes to the code, create a new feature branch from develop and make a pull request when ready. Keep care of the [Commit Message Schema](#commit-message-schema) described below. + +For more information about pull requests go check out the GitHub Help [About pull requests](https://help.github.com/en/articles/about-pull-requests). + ### Release Versioning Convention -We use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/main/CHANGELOG.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version). +We use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/main/CHANGELOG.md) and automate versions by means of [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version). See also [README#releases](README.md#releases). + +### Issue Reporting + +If you encounter a bug or any issue with the application, please report it by creating a new issue in the GitHub repository. When creating an issue, try to provide as much information as possible to help us understand and reproduce the problem. + +For security concerns, please do not create a public issue. Instead, send an email directly to , following our [Security Policy](SECURITY.md). We take all security issues seriously and will respond as quickly as possible to resolve the matter. ## Angular quick start guide diff --git a/README.md b/README.md index 8cf9e4705a..99909b6b3e 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,102 @@ ![Node.js version](https://img.shields.io/badge/node.js-%3E=v18.19.0-blue) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/webern-unibas-ch/awg-app) ![CI Workflow](https://github.com/webern-unibas-ch/awg-app/actions/workflows/ci_workflow.yml/badge.svg) -[![codecov](https://codecov.io/gh/webern-unibas-ch/awg-app/branch/main/graph/badge.svg)](https://codecov.io/gh/webern-unibas-ch/awg-app) +[![codecov](https://codecov.io/gh/webern-unibas-ch/awg-app/graph/badge.svg?token=IO5EgI81R6)](https://codecov.io/gh/webern-unibas-ch/awg-app) [![compodoc](https://edition.anton-webern.ch/compodoc/images/coverage-badge-documentation.svg)](https://edition.anton-webern.ch/compodoc/index.html) +[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/webern-unibas-ch/awg-app/badge)](https://scorecard.dev/viewer/?uri=github.com/webern-unibas-ch/awg-app) +[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8862/badge)](https://www.bestpractices.dev/projects/8862) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.1%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4717678.svg)](https://doi.org/10.5281/zenodo.4717678) -A prototype web application for the online edition of the [Anton Webern Gesamtausgabe](https://www.anton-webern.ch), located at the Department of Musicology of the University of Basel. It is written in [Angular](https://angular.io/) and runs on [edition.anton-webern.ch](https://edition.anton-webern.ch). +A prototype web application for the online edition of the [Anton Webern Gesamtausgabe](https://www.anton-webern.ch) (AWG), located at the Department of Musicology of the University of Basel. It is written in [Angular](https://angular.io/) and runs on [edition.anton-webern.ch](https://edition.anton-webern.ch). + +**Project Status**: This project is actively maintained. + +app + + +## Table of Contents + +- [Description](#description) +- [Prerequisites](#prerequisites) +- [Getting Started](#getting-started) +- [Usage](#usage) +- [Building](#building) +- [Releases](#releases) +- [Testing](#testing) +- [Contributing](#contributing) +- [Contributors ✨](#contributors-✨) +- [License](#license) +- [Contact and Issue Reporting](#contact-and-issue-reporting) + +## Description + +This repository houses the source code for the web application that powers the online edition of the Anton Webern Gesamtausgabe (AWG). Our goal is to provide a comprehensive, accessible, and interactive platform for exploring the works of Anton Webern. + +## Prerequisites + +To run the code base yourself, there are only a few prerequisites to take care of. We use [Yarn](https://classic.yarnpkg.com/) for dependency managing, so, before you begin, ensure you have met the following requirements: + +- You have installed the latest version of Node.js. You can check this by running `node -v` in your terminal. If Node.js is not installed, you can download it from [here](https://nodejs.org/). +- You have installed Yarn. You can check this by running `yarn -v` in your terminal. If Yarn is not installed, you can download it from [here](https://classic.yarnpkg.com/). + +## Getting Started + +To get started with this project, follow these steps: + +1. Make sure you meet the prerequisites. +2. Clone the repository: `git clone [repository_url]` +3. Navigate into the project directory: `cd [project_directory]` +4. Install the dependencies: `yarn install` + +## Usage + +In the project directory, you can run the following command to serve the app in development mode: + +- `yarn start`: Serves the app in the development mode. Open [http://localhost:4200](http://localhost:4200) to view it in the browser. + +During the development process, you'll also find the following commands useful for maintaining code quality and understanding the codebase: + +- `yarn lint`: Scans for linting errors using ESLint. + +- `yarn lint:fix`: Lints the project and automatically fixes any fixable issues. + +- `yarn doc:serve`: Generates documentation for the project using Compodoc and serves it at a local server. Open the URL provided in the terminal to view it in your web browser. + +## Building + +To build the app, use the following commands: + +- `yarn build:prod`: Builds the app for production to the `dist` folder. + +- `yarn build:gh`: Same as `yarn build:prod`, but additionally prepares the build for deployment on GitHub Pages (includes base-href setting). + +## Releases + +Releases for this project are automatically managed via Continuous Integration (CI). The following commands are involved in the release process: + +- `yarn pre-release`: Updates the app version and creates a changelog from the commit history. + +- `yarn deploy:ci`: Runs `angular-cli-ghpages` to deploy the app on GitHub Pages. To be used only from CI. + +## Testing + +This project uses a dynamic testing approach with Jasmine and Karma for unit tests in Angular. Code coverage is measured with CodeCov. + +We encourage contributors to uphold these standards. As such, new contributions are expected to include tests whenever applicable. + +To assist with this, the following commands are provided: + +- `yarn test`: Launches the test runner. + +- `yarn test:cov`: Runs the tests and generates a coverage report. + +- `yarn test:cov:serve`: Runs the tests, generates a coverage report, and serves the coverage report at [http://localhost:9875](http://localhost:9875). + +## Contributing + +We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) and [Code of Conduct](CODE_OF_CONDUCT.md) for more details how you may contribute to this project. ## Contributors ✨ @@ -39,12 +128,16 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! -## Contributing - -Please read our [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) and [CONTRIBUTING.md](CONTRIBUTING.md) to see how you may contribute to this project. - ## License The software code of this project is released under [MIT](https://opensource.org/licenses/MIT) license, see [LICENSE.md](https://github.com/webern-unibas-ch/awg-app/blob/main/LICENSE.md). The contents of the webpage are released under [Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA 4.0)](https://creativecommons.org/licenses/by-sa/4.0/), see [Disclaimer](http://edition.anton-webern.ch/contact#awg-disclaimer). + +## Contact and Issue Reporting + +If you encounter a bug or any issue with the application, please report it by creating a new issue in the GitHub repository. When creating an issue, try to provide as much information as possible to help us understand and reproduce the problem. + +For security concerns, please do not create a public issue. Instead, send an email directly to , following our [Security Policy](SECURITY.md). We take all security issues seriously and will respond as quickly as possible to resolve the matter. + +For any other queries or if you wish to reach out directly, please contact us at . diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000000..c2e4e4f6a2 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,39 @@ +# Security Policy + +## Supported Versions + +We are committed to providing security updates for the latest version of our project. Please ensure you are using the most recent release to receive these updates. + +## Reporting a Vulnerability + +We take security issues very seriously. If you discover a security vulnerability in any webern-unibas-ch-owned repository, please report it to us through coordinated disclosure. + +**Please do not report security vulnerabilities through public GitHub issues, discussions, or pull requests.** + +Instead, please send an email to info-awg[@]unibas.ch. + +Please include as much of the information listed below as you can to help us better understand and resolve the issue: + +* The type of issue (e.g., buffer overflow, SQL injection, or cross-site scripting) +* Full paths of source file(s) related to the manifestation of the issue +* The location of the affected source code (tag/branch/commit or direct URL) +* Any special configuration required to reproduce the issue +* Step-by-step instructions to reproduce the issue +* Proof-of-concept or exploit code (if possible) +* Impact of the issue, including how an attacker might exploit the issue + +This information will help us triage your report more quickly. + +## Acknowledgment + +We acknowledge every security vulnerability reported to us and strive to address them in a timely manner. We appreciate your patience as we work to resolve the issue. + +Contributors who report vulnerabilities will be acknowledged in the project's documentation. However, please note that we do not have a bounty program and cannot provide monetary rewards for vulnerability reports. + +Thank you for helping to keep our project secure. + +--- + +This policy is adapted from the policies of: + +* https://github.com/github/template/security/advisories diff --git a/diagram.svg b/diagram.svg new file mode 100644 index 0000000000..03e9cfab58 --- /dev/null +++ b/diagram.svg @@ -0,0 +1 @@ +srcsrctestingtestingassetsassetsappappimgimgdata/editiondata/editionviewsviewsside-infoside-infosharedsharedcorecoreeditioneditionseriesseriesedition-viewedition-viewdata-viewdata-viewapi-objectsapi-objectsservicesservicesseriesseries2/section/2a2/section/2a1/section1/sectionedition-outletsedition-outletsdata-outletsdata-outlets2/section/2a2/section/2a1/section1/section5522edition-complexedition-complex55edition-detailedition-detailedition-sheetsedition-sheetsedition-graphedition-graphedition-a...edition-a...edition-a...graph-visua...graph-visua...graph-visua....2.5.css.gitignore.html.js.json.md.properties.props.scss.sh.svg.ts.ymleach dot sized by file size \ No newline at end of file diff --git a/package.json b/package.json index ce9dd4d598..3ac93d4a12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "awg-app", - "version": "0.12.0", + "version": "0.12.1", "license": "MIT", "author": { "name": "Stefan Münnich", @@ -69,7 +69,9 @@ "-- BUILD --": "", "build:prod": "ng build", "build:watch": "ng build --watch --configuration development", - "build:gh": "yarn build:prod --base-href $npm_package_homepage && yarn compress:dist && yarn doc:build", + "build:attach": "yarn compress:dist && yarn doc:build", + "build:gh": "yarn build:prod --base-href $npm_package_homepage && yarn build:attach", + "build:dev": "yarn build:prod --base-href ${npm_package_homepage}dev/ && yarn build:attach", "compress:dist": "gzipper compress ./dist/awg-app/ --gzip --brotli", "-- ANALYZE --": "", "pre_wpanalyzer": "yarn build:prod --stats-json", @@ -77,21 +79,21 @@ "pre_sourcemap": "yarn build:prod --source-map", "sourcemap": "yarn pre_sourcemap && source-map-explorer dist/awg-app/*.js", "-- DEPLOY --": "", - "pre-release": "standard-version -a", + "pre-release": "commit-and-tag-version -a", "update-appversion": "sh ./version.sh", "deploy:ci": "ng deploy --no-build --message=\"Release $npm_package_name (v$npm_package_version) on gh-pages\"" }, "dependencies": { - "@angular/animations": "^17.3.5", - "@angular/common": "^17.3.5", - "@angular/compiler": "^17.3.5", - "@angular/core": "^17.3.5", - "@angular/forms": "^17.3.5", - "@angular/localize": "^17.3.5", - "@angular/platform-browser": "^17.3.5", - "@angular/platform-browser-dynamic": "^17.3.5", - "@angular/platform-server": "^17.3.5", - "@angular/router": "^17.3.5", + "@angular/animations": "^17.3.8", + "@angular/common": "^17.3.8", + "@angular/compiler": "^17.3.8", + "@angular/core": "^17.3.8", + "@angular/forms": "^17.3.8", + "@angular/localize": "^17.3.8", + "@angular/platform-browser": "^17.3.8", + "@angular/platform-browser-dynamic": "^17.3.8", + "@angular/platform-server": "^17.3.8", + "@angular/router": "^17.3.8", "@codemirror/legacy-modes": "^6.4.0", "@fortawesome/angular-fontawesome": "^0.14.1", "@fortawesome/fontawesome-svg-core": "^6.5.2", @@ -117,30 +119,31 @@ "zone.js": "~0.14.2" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.3.5", - "@angular-eslint/builder": "^17.3.0", - "@angular-eslint/eslint-plugin": "^17.3.0", - "@angular-eslint/eslint-plugin-template": "^17.3.0", - "@angular-eslint/schematics": "^17.3.0", - "@angular-eslint/template-parser": "^17.3.0", - "@angular/cli": "^17.3.5", - "@angular/compiler-cli": "^17.3.5", + "@angular-devkit/build-angular": "^17.3.7", + "@angular-eslint/builder": "^17.4.1", + "@angular-eslint/eslint-plugin": "^17.4.1", + "@angular-eslint/eslint-plugin-template": "^17.4.1", + "@angular-eslint/schematics": "^17.4.1", + "@angular-eslint/template-parser": "^17.4.1", + "@angular/cli": "^17.3.7", + "@angular/compiler-cli": "^17.3.8", "@commitlint/cli": "^19.3.0", "@commitlint/config-angular": "^19.3.0", - "@compodoc/compodoc": "^1.1.23", + "@compodoc/compodoc": "^1.1.24", "@types/d3": "^7.4.3", "@types/jasmine": "~5.1.4", - "@types/node": "^18.19.31", - "@typescript-eslint/eslint-plugin": "^7.7.1", - "@typescript-eslint/parser": "^7.7.1", + "@types/node": "^18.19.33", + "@typescript-eslint/eslint-plugin": "^7.9.0", + "@typescript-eslint/parser": "^7.9.0", "angular-cli-ghpages": "^1.0.7", - "conventional-recommended-bump": "^9.0.0", + "commit-and-tag-version": "^12.4.1", + "conventional-recommended-bump": "^10.0.0", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-angular": "^4.1.0", "eslint-plugin-deprecation": "^2.0.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsdoc": "^48.2.3", + "eslint-plugin-jsdoc": "^48.2.4", "eslint-plugin-prettier": "^5.1.3", "gzipper": "^7.2.0", "husky": "^9.0.11", @@ -153,7 +156,6 @@ "lint-staged": "^15.2.2", "prettier": "^3.2.5", "source-map-explorer": "^2.5.3", - "standard-version": "^9.5.0", "typescript": "~5.2.2", "webpack-bundle-analyzer": "^4.10.2" }, diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 39616e55a0..df90d9fa49 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -124,6 +124,16 @@ export class AppConfig { return 'https://dhlab.philhist.unibas.ch/'; } + /** + * Getter for the URL of the DSP API endpoint + * ({@link http://api.dasch.swiss/v2/}). + * + * @returns {string} + */ + public static get DSP_API_URL(): string { + return 'https://api.dasch.swiss/v2/'; + } + /** * Getter for the URL of the INSERI Instance * ({@link https://apps.inseri.swiss}). @@ -149,7 +159,7 @@ export class AppConfig { * * @returns {string} */ - public static get OSM_LINK_URL() { + public static get OSM_LINK_URL(): string { const osmLinkRoot = 'https://www.openstreetmap.org/'; const osmLinkId = '?mlat=47.55897&mlon=7.58451#map=19/47.55897/7.58451'; return osmLinkRoot + osmLinkId; diff --git a/src/app/app.globals.ts b/src/app/app.globals.ts index 3316895c30..eb0b8a3e0c 100644 --- a/src/app/app.globals.ts +++ b/src/app/app.globals.ts @@ -1,15 +1,15 @@ // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY! -// Generated last time on Tue, Apr 23, 2024 3:51:46 PM +// Generated last time on Wed, May 15, 2024 7:45:56 PM /** * The latest version of the AWG App */ -export const appVersion = '0.12.0'; +export const appVersion = '0.12.1'; /** * The release date of the latest version of the AWG App */ -export const appVersionReleaseDate = '23. April 2024'; +export const appVersionReleaseDate = '15. Mai 2024'; /** * The URL of the AWG App diff --git a/src/app/core/core-data/meta.data.ts b/src/app/core/core-data/meta.data.ts index 802a718167..06dac61509 100644 --- a/src/app/core/core-data/meta.data.ts +++ b/src/app/core/core-data/meta.data.ts @@ -10,6 +10,7 @@ const METAPAGE: MetaPage = { yearStart: 2015, yearCurrent: new Date().getFullYear(), awgAppUrl: AppConfig.AWG_APP_URL, + awgAppDevUrl: AppConfig.AWG_APP_URL + '/dev/', awgProjectUrl: AppConfig.AWG_PROJECT_URL, awgProjectName: AppConfig.AWG_PROJECT_NAME, compodocUrl: AppConfig.AWG_APP_COMPODOC_URL, diff --git a/src/app/core/core-models/meta.model.ts b/src/app/core/core-models/meta.model.ts index 16cdd07479..2cd4fc2a27 100644 --- a/src/app/core/core-models/meta.model.ts +++ b/src/app/core/core-models/meta.model.ts @@ -48,6 +48,11 @@ export class MetaPage { */ awgAppUrl: string; + /** + * The url to the dev version of the AWG edition homepage (awg-app-dev). + */ + awgAppDevUrl: string; + /** * The name of the AWG. */ diff --git a/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts b/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts index 774c9feb2e..03f419ea96 100644 --- a/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts +++ b/src/app/core/footer/footer-copyright/footer-copyright.component.spec.ts @@ -2,7 +2,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { cleanStylesFromDOM } from '@testing/clean-up-helper'; -import { expectToBe, expectToContain, getAndExpectDebugElementByCss } from '@testing/expect-helper'; +import { expectToBe, expectToContain, expectToEqual, getAndExpectDebugElementByCss } from '@testing/expect-helper'; import { METADATA } from '@awg-core/core-data'; import { MetaPage, MetaSectionTypes } from '@awg-core/core-models'; @@ -74,6 +74,10 @@ describe('FooterCopyrightComponent (DONE)', () => { fixture.detectChanges(); }); + it('... should have pageMetaData', () => { + expectToEqual(component.pageMetaData, expectedPageMetaData); + }); + describe('VIEW', () => { it('... should render copyright period', () => { const expectedYearStart = expectedPageMetaData.yearStart; diff --git a/src/app/core/footer/footer-poweredby/footer-poweredby.component.html b/src/app/core/footer/footer-poweredby/footer-poweredby.component.html index 1167af038f..dd4a7f8608 100644 --- a/src/app/core/footer/footer-poweredby/footer-poweredby.component.html +++ b/src/app/core/footer/footer-poweredby/footer-poweredby.component.html @@ -1,6 +1,11 @@
- Built on + Built on
- with and - + with and + + + | +
diff --git a/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts b/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts index c1112e1f64..a1c9960ba4 100644 --- a/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts +++ b/src/app/core/footer/footer-poweredby/footer-poweredby.component.spec.ts @@ -1,6 +1,10 @@ import { Component, DebugElement, Input } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; +import { IconDefinition } from '@fortawesome/fontawesome-svg-core'; +import { faScrewdriverWrench } from '@fortawesome/free-solid-svg-icons'; + import { cleanStylesFromDOM } from '@testing/clean-up-helper'; import { expectToBe, @@ -9,8 +13,8 @@ import { getAndExpectDebugElementByDirective, } from '@testing/expect-helper'; -import { LOGOSDATA } from '@awg-core/core-data'; -import { Logo, Logos } from '@awg-core/core-models'; +import { LOGOSDATA, METADATA } from '@awg-core/core-data'; +import { Logo, Logos, MetaPage, MetaSectionTypes } from '@awg-core/core-models'; import { FooterPoweredbyComponent } from './footer-poweredby.component'; @@ -26,9 +30,12 @@ describe('FooterPoweredbyComponent (DONE)', () => { let compDe: DebugElement; let expectedLogos: Logos; + let expectedPageMetaData: MetaPage; + let expectedScrewdriverWrenchIcon: IconDefinition; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ + imports: [FontAwesomeTestingModule], declarations: [FooterPoweredbyComponent, FooterLogoStubComponent], }).compileComponents(); })); @@ -40,6 +47,8 @@ describe('FooterPoweredbyComponent (DONE)', () => { // Test data expectedLogos = LOGOSDATA; + expectedPageMetaData = METADATA[MetaSectionTypes.page]; + expectedScrewdriverWrenchIcon = faScrewdriverWrench; }); afterAll(() => { @@ -55,6 +64,14 @@ describe('FooterPoweredbyComponent (DONE)', () => { expect(component.logos).toBeUndefined(); }); + it('... should not have pageMetaData', () => { + expect(component.pageMetaData).toBeUndefined(); + }); + + it('... should have fontawesome icon', () => { + expectToEqual(component.faScrewdriverWrench, expectedScrewdriverWrenchIcon); + }); + describe('VIEW', () => { it('... should contain 1 div.awg-powered-by', () => { getAndExpectDebugElementByCss(compDe, 'div.awg-powered-by', 1, 1); @@ -63,6 +80,20 @@ describe('FooterPoweredbyComponent (DONE)', () => { it('... should contain 3 footer logo components (stubbed)', () => { getAndExpectDebugElementByDirective(compDe, FooterLogoStubComponent, 3, 3); }); + + it('... should contain 1 anchor #dev-preview-link with faIcon', () => { + getAndExpectDebugElementByCss(compDe, 'a#dev-preview-link', 1, 1); + + getAndExpectDebugElementByCss(compDe, 'a#dev-preview-link > fa-icon', 1, 1); + }); + + it('... should not render link to devPreview yet', () => { + const devDes = getAndExpectDebugElementByCss(compDe, 'a#dev-preview-link', 1, 1); + const devEl = devDes[0].nativeElement; + + expect(devEl).toBeDefined(); + expectToBe(devEl.href, ''); + }); }); }); @@ -70,6 +101,7 @@ describe('FooterPoweredbyComponent (DONE)', () => { beforeEach(() => { // Simulate the parent setting the input properties component.logos = expectedLogos; + component.pageMetaData = expectedPageMetaData; // Trigger initial data binding fixture.detectChanges(); @@ -79,6 +111,10 @@ describe('FooterPoweredbyComponent (DONE)', () => { expectToEqual(component.logos, expectedLogos); }); + it('... should have pageMetaData', () => { + expectToEqual(component.pageMetaData, expectedPageMetaData); + }); + describe('VIEW', () => { it('... should pass down logos to footer logo components', () => { const footerLogoDes = getAndExpectDebugElementByDirective(compDe, FooterLogoStubComponent, 3, 3); @@ -91,6 +127,21 @@ describe('FooterPoweredbyComponent (DONE)', () => { expectToEqual(footerLogoCmps[1].logo, expectedLogos['angular']); expectToEqual(footerLogoCmps[2].logo, expectedLogos['bootstrap']); }); + + it('... should display screwdriverWrench icon in devPreview link ', () => { + const faIconDe = getAndExpectDebugElementByCss(compDe, 'a#dev-preview-link > fa-icon', 1, 1); + const faIconIns = faIconDe[0].componentInstance.icon; + + expectToEqual(faIconIns, expectedScrewdriverWrenchIcon); + }); + + it('... should render link to devPreview', () => { + const devDes = getAndExpectDebugElementByCss(compDe, 'a#dev-preview-link', 1, 1); + const devEl = devDes[0].nativeElement; + + expect(devEl).toBeDefined(); + expectToBe(devEl.href, expectedPageMetaData.awgAppDevUrl); + }); }); }); }); diff --git a/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts b/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts index 1fb9f6add5..40a349d8c1 100644 --- a/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts +++ b/src/app/core/footer/footer-poweredby/footer-poweredby.component.ts @@ -1,6 +1,8 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { Logos } from '@awg-core/core-models'; +import { faScrewdriverWrench } from '@fortawesome/free-solid-svg-icons'; + +import { Logos, MetaPage } from '@awg-core/core-models'; /** * The FooterPoweredBy component. @@ -21,4 +23,19 @@ export class FooterPoweredbyComponent { */ @Input() logos: Logos; + + /** + * Input variable: pageMetaData. + * + * It keeps the page metadata for the component. + */ + @Input() + pageMetaData: MetaPage; + + /** + * Public variable: faScrewdriverWrench. + * + * It instantiates fontawesome's faScrewdriverWrench icon. + */ + faScrewdriverWrench = faScrewdriverWrench; } diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html index 6db93e891e..a4c2268147 100644 --- a/src/app/core/footer/footer.component.html +++ b/src/app/core/footer/footer.component.html @@ -6,11 +6,11 @@
- +
- - + +
@@ -20,7 +20,7 @@
- +
diff --git a/src/app/core/footer/footer.component.spec.ts b/src/app/core/footer/footer.component.spec.ts index 71a8e22709..1d4ac51bf7 100644 --- a/src/app/core/footer/footer.component.spec.ts +++ b/src/app/core/footer/footer.component.spec.ts @@ -39,6 +39,8 @@ class FooterLogoStubComponent { class FooterPoweredbyStubComponent { @Input() logos: Logos; + @Input() + pageMetaData: MetaPage; } describe('FooterComponent (DONE)', () => { @@ -249,6 +251,20 @@ describe('FooterComponent (DONE)', () => { expectToEqual(footerCopyrightCmp.pageMetaData, expectedPageMetaData); }); + it('... should pass down pageMetaData to footer poweredby component', () => { + const footerPoweredbyDes = getAndExpectDebugElementByDirective( + compDe, + FooterPoweredbyStubComponent, + 1, + 1 + ); + const footerPoweredbyCmp = footerPoweredbyDes[0].injector.get( + FooterPoweredbyStubComponent + ) as FooterPoweredbyStubComponent; + + expectToEqual(footerPoweredbyCmp.pageMetaData, expectedPageMetaData); + }); + it('... should pass down logos to footer poweredby component', () => { const footerPoweredbyDes = getAndExpectDebugElementByDirective( compDe, diff --git a/src/app/core/services/conversion-service/conversion.service.spec.ts b/src/app/core/services/conversion-service/conversion.service.spec.ts index c7abdd4318..b9c58fe6af 100644 --- a/src/app/core/services/conversion-service/conversion.service.spec.ts +++ b/src/app/core/services/conversion-service/conversion.service.spec.ts @@ -1,25 +1,38 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; + +import Spy = jasmine.Spy; import { cleanStylesFromDOM } from '@testing/clean-up-helper'; import { mockSearchResponseJson } from '@testing/mock-data'; +import { expectSpyCall, expectToBe, expectToEqual } from '@testing/expect-helper'; import { AppModule } from '@awg-app/app.module'; +import { SearchResponseWithQuery } from '@awg-views/data-view/models'; import { ConversionService } from './conversion.service'; describe('ConversionService', () => { let conversionService: ConversionService; + let convertStandoffToHTMLSpy: Spy; + let replaceParagraphTagsSpy: Spy; + let replaceSalsahLinkSpy: Spy; + // TODO: add APP_BASE_HREF , see https://angular.io/api/common/APP_BASE_HREF beforeEach(() => { TestBed.configureTestingModule({ - imports: [AppModule, RouterTestingModule], + imports: [AppModule], providers: [ConversionService], }); conversionService = TestBed.inject(ConversionService); + + // Spies for service methods + replaceParagraphTagsSpy = spyOn(ConversionService, 'replaceParagraphTags').and.callThrough(); + + replaceSalsahLinkSpy = spyOn(conversionService, '_replaceSalsahLink').and.callThrough(); + convertStandoffToHTMLSpy = spyOn(conversionService, '_convertStandoffToHTML').and.callThrough(); }); afterAll(() => { @@ -37,4 +50,838 @@ describe('ConversionService', () => { expect(conversionService.filteredOut).toBeDefined(); }); + + describe('#replaceParagraphTags', () => { + it('... should have a static method `replaceParagraphTags`', () => { + expect(ConversionService.replaceParagraphTags).toBeDefined(); + }); + + it('... should replace paragraph tags correctly', () => { + const str = `

Hello World

`; + const expected = `Hello World`; + + const result = ConversionService.replaceParagraphTags(str); + + expectToBe(result, expected); + }); + + it('... should add line breaks correctly', () => { + const str = `

Hello

World

`; + const expected = `Hello
World`; + + const result = ConversionService.replaceParagraphTags(str); + + expectToBe(result, expected); + }); + + it('... should return undefined if input is falsy', () => { + const str = undefined; + + const result = ConversionService.replaceParagraphTags(str); + + expect(result).toBeUndefined(); + }); + }); + + describe('#prepareFullTextSearchResultText', () => { + it('... should have a method `prepareFullTextSearchResultText`', () => { + expect(conversionService.prepareFullTextSearchResultText).toBeDefined(); + }); + + describe('... should return an error message if', () => { + it('... subjects are undefined', () => { + const searchUrl = 'http://example.com'; + const emptySearchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + emptySearchResponseWithQuery.data.subjects = undefined; + const expected = `Die Abfrage ${searchUrl} ist leider fehlgeschlagen. Wiederholen Sie die Abfrage zu einem späteren Zeitpunkt oder überprüfen sie die Suchbegriffe.`; + + const result = conversionService.prepareFullTextSearchResultText( + emptySearchResponseWithQuery, + searchUrl + ); + + expectToBe(result, expected); + }); + + it('... subjects are null', () => { + const searchUrl = 'http://example.com'; + const emptySearchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + emptySearchResponseWithQuery.data.subjects = null; + const expected = `Die Abfrage ${searchUrl} ist leider fehlgeschlagen. Wiederholen Sie die Abfrage zu einem späteren Zeitpunkt oder überprüfen sie die Suchbegriffe.`; + + const result = conversionService.prepareFullTextSearchResultText( + emptySearchResponseWithQuery, + searchUrl + ); + + expectToBe(result, expected); + }); + }); + + it('... should return a string', () => { + const searchUrl = 'http://example.com'; + const searchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + + const result = conversionService.prepareFullTextSearchResultText(searchResponseWithQuery, searchUrl); + + expect(typeof result).toEqual('string'); + }); + + describe('... should return correct text', () => { + it('... for no results (default value for nhits = 0)', () => { + const searchUrl = 'http://example.com'; + const searchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + searchResponseWithQuery.data.subjects = []; + searchResponseWithQuery.data.nhits = undefined; + const subjectsLength = searchResponseWithQuery.data.subjects.length; + const expected = `0 / 0 Ergebnisse`; + + const result = conversionService.prepareFullTextSearchResultText(searchResponseWithQuery, searchUrl); + + expectToBe(result, expected); + }); + + it('... for a single result', () => { + const searchUrl = 'http://example.com'; + const searchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + searchResponseWithQuery.data.subjects = [mockSearchResponseJson.subjects[0]]; + searchResponseWithQuery.data.nhits = '1'; + const expected = `1 / 1 Ergebnis`; + + const result = conversionService.prepareFullTextSearchResultText(searchResponseWithQuery, searchUrl); + + expectToBe(result, expected); + }); + + it('... for multiple results', () => { + const searchUrl = 'http://example.com'; + const searchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + const subjectsLength = searchResponseWithQuery.data.subjects.length; + const expected = `${subjectsLength} / ${searchResponseWithQuery.data.nhits} Ergebnisse`; + + const result = conversionService.prepareFullTextSearchResultText(searchResponseWithQuery, searchUrl); + + expectToBe(result, expected); + }); + + it('... for multiple results with single duplicate filtered out', () => { + conversionService.filteredOut = 1; + + const searchUrl = 'http://example.com'; + const searchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + const subjectsLength = searchResponseWithQuery.data.subjects.length; + const expected = `${subjectsLength} / ${searchResponseWithQuery.data.nhits} Ergebnisse (1 Duplikat entfernt)`; + + const result = conversionService.prepareFullTextSearchResultText(searchResponseWithQuery, searchUrl); + + expectToBe(result, expected); + }); + + it('... for multiple results with multiple duplicates filtered out', () => { + conversionService.filteredOut = 2; + + const searchUrl = 'http://example.com'; + const searchResponseWithQuery = new SearchResponseWithQuery( + JSON.parse(JSON.stringify(mockSearchResponseJson)), + 'Test' + ); + const subjectsLength = searchResponseWithQuery.data.subjects.length; + const expected = `${subjectsLength} / ${searchResponseWithQuery.data.nhits} Ergebnisse (2 Duplikate entfernt)`; + + const result = conversionService.prepareFullTextSearchResultText(searchResponseWithQuery, searchUrl); + + expectToBe(result, expected); + }); + }); + }); + + describe('#_cleanSubjectValueLabels', () => { + it('... should have a method `_cleanSubjectValueLabels`', () => { + expect((conversionService as any)._cleanSubjectValueLabels).toBeDefined(); + }); + + it('... should clean valuelabel and obj_id', () => { + const subject = { + valuelabel: ['Test (Richtext)'], + obj_id: '123_-_local', + }; + + const result = (conversionService as any)._cleanSubjectValueLabels(subject); + + expectToBe(result.valuelabel[0], 'Test'); + expectToBe(result.obj_id, '123'); + }); + + it('... should not modify other properties', () => { + const subject = { + valuelabel: ['Test (Richtext)'], + obj_id: '123_-_local', + otherProp: 'otherValue', + }; + + const result = (conversionService as any)._cleanSubjectValueLabels(subject); + + expectToBe(result.valuelabel[0], 'Test'); + expectToBe(result.obj_id, '123'); + expectToBe(result.otherProp, 'otherValue'); + }); + }); + + describe('#_cleanSubjectValues', () => { + it('... should have a method `_cleanSubjectValues`', () => { + expect((conversionService as any)._cleanSubjectValues).toBeDefined(); + }); + + it('... should clean up richtext values for valuetype_id==14', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + const subject = { + valuetype_id: ['14'], + value: [{ utf8str: str, textattr: JSON.stringify(jsonAttrs) }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._cleanSubjectValues(subject); + + expectToBe(result.value[0], expected); + }); + + it('... should not clean up for other valuetype_ids', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + const subject = { + valuetype_id: ['15'], + value: [{ utf8str: str, textattr: JSON.stringify(jsonAttrs) }], + }; + + const result = (conversionService as any)._cleanSubjectValues(subject); + + expectToEqual(result, subject); + expectToEqual(result.value[0], subject.value[0]); + }); + + it('... should not clean up when no value is given', () => { + const subject = { + valuetype_id: ['14'], + value: [], + }; + + const result = (conversionService as any)._cleanSubjectValues(subject); + + expectToEqual(result, subject); + expect(result.value[0]).toBeUndefined(); + }); + }); + + describe('#_convertRichtextValue', () => { + it('... should have a method `_convertRichtextValue`', () => { + expect((conversionService as any)._convertRichtextValue).toBeDefined(); + }); + + it('... should trigger `_convertStandoffToHTML`', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + const expected = [str, JSON.stringify(jsonAttrs)]; + + (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expectSpyCall(convertStandoffToHTMLSpy, 1, expected); + }); + + it('... should trigger `_replaceSalsahLink`', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + const expected = `

A test string.

`; + + (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expectSpyCall(replaceSalsahLinkSpy, 1, expected); + }); + + it('... should trigger `replaceParagraphTags`', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + const expected = `

A test string.

`; + + (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expectSpyCall(replaceParagraphTagsSpy, 1, expected); + }); + + describe('... should return undefined', () => { + it('... when the input string is empty', () => { + const str = ''; + const jsonAttrs = { italic: [{ start: 5, end: 9 }] }; + + const result = (conversionService as any)._convertRichtextValue(str, jsonAttrs); + + expect(result).toBeUndefined(); + }); + + it('... when the input string is null or undefined', () => { + const str = null; + const jsonAttrs = { italic: [{ start: 5, end: 9 }] }; + + const result = (conversionService as any)._convertRichtextValue(str, jsonAttrs); + + expect(result).toBeUndefined(); + }); + }); + + it('... should return the original string if no attributes are given', () => { + const str = `A test string without attributes.`; + const jsonAttrs = undefined; + const expected = 'A test string without attributes.'; + + const result = (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... should return a string', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + + const result = (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expect(typeof result).toEqual('string'); + }); + + it('... should correctly convert a rich text value with Standoff to HTML', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... should correctly replace salsah links', () => { + const str = `A test string with a link.`; + const jsonAttrs = { + _link: [{ start: 21, end: 25, href: 'http://www.salsah.org/api/resources/11690', resid: '11690' }], + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 26 }], + }; + const expected = `A test string with a link.`; + + const result = (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + expect(result).not.toContain(`class="salsah"`); + }); + + it('... should correctly replace paragraph tags', () => { + const str = `

A test string with p-tags.

`; + const jsonAttrs = { italic: [{ start: 5, end: 9 }] }; + const expected = `A test string with p-tags.`; + + const result = (conversionService as any)._convertRichtextValue(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + }); + + describe('#_convertStandoffToHTML', () => { + it('... should have a method `_convertStandoffToHTML`', () => { + expect((conversionService as any)._convertStandoffToHTML).toBeDefined(); + }); + + describe('... should return undefined', () => { + it('... when the input string is empty', () => { + const str = ''; + const jsonAttrs = { italic: [{ start: 5, end: 9 }] }; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expect(result).toBeUndefined(); + }); + + it('... when the input string is null or undefined', () => { + const str = null; + const jsonAttrs = { italic: [{ start: 5, end: 9 }] }; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expect(result).toBeUndefined(); + }); + }); + + it('... should return the original string if no attributes are given', () => { + const str = `A test string without attributes.`; + const jsonAttrs = undefined; + const expected = 'A test string without attributes.'; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... should return a string', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expect(typeof result).toEqual('string'); + }); + + it('... should correctly convert a rich text value with Standoff to HTML', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + p: [{ start: 0, end: 14 }], + }; + const expected = `

A test string.

`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + describe('... should correctly convert standoff to HTML tags', () => { + it('... bold --> strong', () => { + const str = `A test string.`; + const jsonAttrs = { + bold: [{ start: 2, end: 6 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... underline --> u', () => { + const str = `A test string.`; + const jsonAttrs = { + underline: [{ start: 2, end: 6 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... strikethrough --> s', () => { + const str = `A test string.`; + const jsonAttrs = { + strikethrough: [{ start: 2, end: 6 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... italic --> em', () => { + const str = `A test string.`; + const jsonAttrs = { + italic: [{ start: 2, end: 6 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... h1 --> h1', () => { + const str = `A test string.`; + const jsonAttrs = { + h1: [{ start: 2, end: 6 }], + }; + const expected = `A

test

string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... h2 --> h2', () => { + const str = `A test string.`; + const jsonAttrs = { + h2: [{ start: 2, end: 6 }], + }; + const expected = `A

test

string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... h3 --> h3', () => { + const str = `A test string.`; + const jsonAttrs = { + h3: [{ start: 2, end: 6 }], + }; + const expected = `A

test

string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... h4 --> h4', () => { + const str = `A test string.`; + const jsonAttrs = { + h4: [{ start: 2, end: 6 }], + }; + const expected = `A

test

string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... h5 --> h5', () => { + const str = `A test string.`; + const jsonAttrs = { + h5: [{ start: 2, end: 6 }], + }; + const expected = `A
test
string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... h6 --> h6', () => { + const str = `A test string.`; + const jsonAttrs = { + h6: [{ start: 2, end: 6 }], + }; + const expected = `A
test
string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... ol --> ol', () => { + const str = `A test string.`; + const jsonAttrs = { + ol: [{ start: 2, end: 6 }], + }; + const expected = `A
    test
string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... ul --> ul', () => { + const str = `A test string.`; + const jsonAttrs = { + ul: [{ start: 2, end: 6 }], + }; + const expected = `A
    test
string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... li --> li', () => { + const str = `A test string.`; + const jsonAttrs = { + li: [{ start: 2, end: 6 }], + }; + const expected = `A
  • test
    • string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + + it('... style --> span', () => { + const str = `A test string.`; + const jsonAttrs = { + style: [{ start: 2, end: 6 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToEqual(result, expected); + }); + + it('... p --> p', () => { + const str = `A test string.`; + const jsonAttrs = { + p: [{ start: 2, end: 6 }], + }; + const expected = `A

    test

    string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToEqual(result, expected); + }); + + it('... sup --> sup', () => { + const str = `A test string.`; + const jsonAttrs = { + sup: [{ start: 2, end: 6 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToEqual(result, expected); + }); + + it('... sub --> sub', () => { + const str = `A test string.`; + const jsonAttrs = { + sub: [{ start: 2, end: 6 }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToEqual(result, expected); + }); + + it('... _link --> a', () => { + const str = `A test string.`; + const jsonAttrs = { + _link: [{ start: 2, end: 6, href: 'http://www.salsah.org/api/resources/54623', resid: '54623' }], + }; + const expected = `A test string.`; + + const result = (conversionService as any)._convertStandoffToHTML(str, JSON.stringify(jsonAttrs)); + + expectToBe(result, expected); + }); + }); + }); + + describe('#_distinctSubjects', () => { + it('... should have a method `_distinctSubjects`', () => { + expect((conversionService as any)._distinctSubjects).toBeDefined(); + }); + + it('... should return undefined when subjects are undefined', () => { + const subjects = undefined; + + const result = (conversionService as any)._distinctSubjects(subjects); + + expect(result).toBeUndefined(); + }); + + it('... should return unchanged array when input has no duplicates', () => { + const subjectsWithoutDuplicate = [ + { obj_id: '1', obj_label: 'Label 1' }, + { obj_id: '2', obj_label: 'Label 2' }, + ]; + + const result = (conversionService as any)._distinctSubjects(subjectsWithoutDuplicate); + + expectToEqual(result, subjectsWithoutDuplicate); + }); + + it('... should return distinct array when input has duplicates', () => { + const subjectsWithDuplicate = [ + { obj_id: '1', obj_label: 'Label 1' }, + { obj_id: '2', obj_label: 'Label 2' }, + { obj_id: '1', obj_label: 'Label 1' }, + ]; + + const expected = [ + { obj_id: '1', obj_label: 'Label 1' }, + { obj_id: '2', obj_label: 'Label 2' }, + ]; + + const result = (conversionService as any)._distinctSubjects(subjectsWithDuplicate); + + expectToEqual(result, expected); + }); + + it('... should set filteredOut to correct value when input has duplicates', () => { + const subjectsWithSingleDuplicate = [ + { obj_id: '1', obj_label: 'Label 1' }, + { obj_id: '2', obj_label: 'Label 2' }, + { obj_id: '1', obj_label: 'Label 1' }, + ]; + + (conversionService as any)._distinctSubjects(subjectsWithSingleDuplicate); + + expectToBe(conversionService.filteredOut, 1); + + const subjectsWithMultipleDuplicates = [ + { obj_id: '1', obj_label: 'Label 1' }, + { obj_id: '2', obj_label: 'Label 2' }, + { obj_id: '1', obj_label: 'Label 1' }, + { obj_id: '2', obj_label: 'Label 2' }, + ]; + + (conversionService as any)._distinctSubjects(subjectsWithMultipleDuplicates); + + expectToBe(conversionService.filteredOut, 2); + + const subjectsWithoutDuplicate = [ + { obj_id: '1', obj_label: 'Label 1' }, + { obj_id: '2', obj_label: 'Label 2' }, + ]; + + (conversionService as any)._distinctSubjects(subjectsWithoutDuplicate); + + expectToBe(conversionService.filteredOut, 0); + }); + }); + + describe('#_replaceSalsahLink', () => { + it('... should have a method `_replaceSalsahLink`', () => { + expect((conversionService as any)._replaceSalsahLink).toBeDefined(); + }); + + describe('... should return undefined', () => { + it('... when the input string is empty', () => { + const str = ''; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expect(result).toBeUndefined(); + }); + + it('... when the input string is null or undefined', () => { + const str = null; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expect(result).toBeUndefined(); + }); + }); + + describe('... should return the original string if', () => { + it('... there are no links', () => { + const str = `A test string without any links.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, str); + }); + + it('... there are no salsah links', () => { + const str = `A test string with an Example link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, str); + }); + }); + + describe('... should correctly replace salsah links', () => { + it('... starting with https', () => { + const str = `A test string with a Salsah link.`; + const expected = `A test string with a Salsah link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, expected); + }); + + it('... starting with `https://www.`', () => { + const str = `A test string with a Salsah link.`; + const expected = `A test string with a Salsah link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, expected); + }); + + it('... starting with http', () => { + const str = `A test string with a Salsah link.`; + const expected = `A test string with a Salsah link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, expected); + }); + + it('... starting with `http://www.`', () => { + const str = `A test string with a Salsah link.`; + const expected = `A test string with a Salsah link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, expected); + }); + + it('... with multiple salsah links', () => { + const str = `A test string with a Salsah link and another Salsah link.`; + const expected = `A test string with a Salsah link and another Salsah link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, expected); + }); + + it('... with small resource ids', () => { + const str = `A test string with a Salsah link.`; + const expected = `A test string with a Salsah link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, expected); + }); + + it('... with large resource ids', () => { + const str = `A test string with a Salsah link.`; + const expected = `A test string with a Salsah link.`; + + const result = (conversionService as any)._replaceSalsahLink(str); + + expectToBe(result, expected); + }); + }); + }); }); diff --git a/src/app/core/services/conversion-service/conversion.service.ts b/src/app/core/services/conversion-service/conversion.service.ts index c5d95edbd1..93f01c3918 100644 --- a/src/app/core/services/conversion-service/conversion.service.ts +++ b/src/app/core/services/conversion-service/conversion.service.ts @@ -5,9 +5,8 @@ import { Observable } from 'rxjs'; import { NgxGalleryImage } from '@kolkov/ngx-gallery'; -import { ApiService } from '@awg-core/services/api-service'; - import { GeoNames } from '@awg-core/core-models'; +import { ApiService } from '@awg-core/services/api-service'; import { UtilityService } from '@awg-core/services/utility-service'; import { ContextJson, @@ -88,6 +87,24 @@ export class ConversionService extends ApiService { super(http); } + /** + * Public static method: replaceParagraphTags. + * + * It removes paragraph tags in richtext values + * and replaces line breaks instead for multiple lines. + * + * @param {string} str The given richtext value. + * + * @returns {string} The adjusted richtext value. + */ + public static replaceParagraphTags(str: string): string { + if (!str) { + return undefined; + } + const replacedStr = str.replace(/<\/p>

    /g, '
    ').replace(/

    |<\/p>/g, ''); + return replacedStr; + } + /** * Public method: convertFullTextSearchResults. * @@ -103,70 +120,19 @@ export class ConversionService extends ApiService { return searchResults; } - // TODO: refactor with reduce?? - searchResults.subjects.forEach(subject => { - // Clean value labels - subject.valuelabel[0] = subject.valuelabel[0].replace(' (Richtext)', ''); - subject.obj_id = subject.obj_id.replace('_-_local', ''); - - // =>Chronologie: salsah standoff needs to be converted before displaying - // Valuetype_id 14 = valuelabel 'Ereignis' - if (subject.valuetype_id[0] === '14' && subject.value[0]) { - let htmlstr = ''; - const utf8str: string = subject.value[0].utf8str; - const textattr: string = subject.value[0].textattr; - - // Check if there is standoff, otherwise leave res.value[0] alone - // Because when retrieved from cache the standoff is already converted - if (utf8str && textattr) { - htmlstr = this._convertStandoffToHTML(utf8str, textattr); + searchResults.subjects = searchResults.subjects.reduce((acc, subject) => { + subject = this._cleanSubjectValueLabels(subject); + subject = this._cleanSubjectValues(subject); - // Replace salsah links - htmlstr = this._replaceSalsahLink(htmlstr); + acc.push(subject); + return acc; + }, []); - // Strip & replace

    -tags for displaying - htmlstr = this._replaceParagraphTags(htmlstr); - - subject.value[0] = htmlstr; - } - } - }); // Remove duplicates from response searchResults.subjects = this._distinctSubjects(searchResults.subjects); return searchResults; } - /** - * Public method: prepareFullTextSearchResultText. - * - * It prepares the fulltext search result text - * to be displayed in the search info. - * - * @param {SearchResponseWithQuery} searchResponseWithQuery The given results and query of a search request. - * @param {string} searchUrl The given url of a search request. - * - * @returns {string} The text to be displayed. - */ - prepareFullTextSearchResultText(searchResponseWithQuery: SearchResponseWithQuery, searchUrl: string): string { - let resText: string; - - const searchResults = { ...searchResponseWithQuery.data }; - - if (searchResults.subjects) { - const currentLength = searchResults.subjects.length; - const totalLength = searchResults.nhits; - const resString: string = length === 1 ? 'Ergbnis' : 'Ergebnisse'; - resText = `${currentLength} / ${totalLength} ${resString}`; - if (this.filteredOut > 0) { - resText += ' (Duplikate enfternt)'; - } - } else { - resText = `Die Abfrage ${searchUrl} ist leider fehlgeschlagen. Wiederholen Sie die Abfrage zu einem späteren Zeitpunkt oder überprüfen sie die Suchbegriffe.`; - } - - return resText; - } - /** * Public method: convertObjectProperties. * @@ -219,11 +185,7 @@ export class ConversionService extends ApiService { let htmlstr = ''; // Convert linear salsah standoff to html (using plugin "htmlConverter") - htmlstr = this._convertStandoffToHTML(prop.values[i].utf8str, prop.values[i].textattr); - - // Replace salsah links &

    -tags - htmlstr = this._replaceSalsahLink(htmlstr); - htmlstr = htmlstr.replace('

    ', '').replace('

    ', ''); + htmlstr = this._convertRichtextValue(prop.values[i].utf8str, prop.values[i].textattr); // Trim string propValue[i] = htmlstr.trim(); @@ -263,7 +225,7 @@ export class ConversionService extends ApiService { }); // END forEach PROPS return convObj; - } // END convertObjectProperties (func) + } /** * Public method: convertResourceData. @@ -289,6 +251,34 @@ export class ConversionService extends ApiService { } } + /** + * Public method: prepareFullTextSearchResultText. + * + * It prepares the fulltext search result text + * to be displayed in the search info. + * + * @param {SearchResponseWithQuery} searchResponseWithQuery The given results and query of a search request. + * @param {string} searchUrl The given url of a search request. + * + * @returns {string} The text to be displayed. + */ + prepareFullTextSearchResultText(searchResponseWithQuery: SearchResponseWithQuery, searchUrl: string): string { + const { subjects, nhits: totalLength = 0 } = { ...searchResponseWithQuery?.data }; + + if (subjects) { + const currentLength = subjects.length; + const resString: string = currentLength === 1 ? 'Ergebnis' : 'Ergebnisse'; + let resText = `${currentLength} / ${totalLength} ${resString}`; + if (this.filteredOut > 0) { + const duplicateString = this.filteredOut === 1 ? 'Duplikat' : 'Duplikate'; + resText += ` (${this.filteredOut} ${duplicateString} entfernt)`; + } + return resText; + } else { + return `Die Abfrage ${searchUrl} ist leider fehlgeschlagen. Wiederholen Sie die Abfrage zu einem späteren Zeitpunkt oder überprüfen sie die Suchbegriffe.`; + } + } + /** * Private method: _prepareRestrictedResource. * @@ -531,6 +521,53 @@ export class ConversionService extends ApiService { return prop; } + /** + * Private method: _cleanSubjectValueLabels. + * + * It cleans the value labels of a subject (SubjectItemJson) + * to be displayed via HTML. + * + * @param {SubjectItemJson} subject The given subject. + * + * @returns {SubjectItemJson} The cleaned subject. + */ + _cleanSubjectValueLabels(subject: SubjectItemJson): SubjectItemJson { + let { valuelabel, obj_id } = subject; + + if (valuelabel?.[0]) { + valuelabel[0] = valuelabel[0].replace(' (Richtext)', ''); + } + if (obj_id) { + obj_id = obj_id.replace('_-_local', ''); + } + return { ...subject, valuelabel, obj_id }; + } + + /** + * Private method: _cleanSubjectValues. + * + * It cleans the values of a subject (SubjectItemJson) + * to be displayed via HTML. + * + * @param {SubjectItemJson} subject The given subject. + * + * @returns {SubjectItemJson} The cleaned subject. + */ + _cleanSubjectValues(subject: SubjectItemJson): SubjectItemJson { + let tmpSubject = { ...subject }; + const { valuetype_id, value } = tmpSubject; + const firstValue = value?.[0]; + + if (valuetype_id?.[0] === '14' && firstValue) { + const { utf8str, textattr } = firstValue; + if (utf8str && textattr) { + const htmlstr = this._convertRichtextValue(utf8str, textattr); + tmpSubject.value[0] = htmlstr; + } + } + return tmpSubject; + } + /** * Private method: _convertDateValue. * @@ -679,10 +716,13 @@ export class ConversionService extends ApiService { */ private _convertRichtextValue(str: string, attr: string): string { // Convert salsah standoff to html (using plugin "htmlConverter") - const rtValue: string = this._convertStandoffToHTML(str, attr); + const htmlValue: string = this._convertStandoffToHTML(str, attr); // Replace salsah links - return this._replaceSalsahLink(rtValue); + const replacedLinks = this._replaceSalsahLink(htmlValue); + + // Strip & replace

    -tags for displaying + return ConversionService.replaceParagraphTags(replacedLinks); } /** @@ -744,20 +784,45 @@ export class ConversionService extends ApiService { * to html using plugin 'htmlConverter'. * * @param {string} str The given utf8 string of a rich text property. - * @param {string} attr The given standoff attributes of a richtext property. + * @param {string} jsonAttrs The given standoff (JSON) attributes of a richtext property. * * @returns {string} The converted standoff. - * - * @todo check if it is possible to unify with hlist conversion? */ - private _convertStandoffToHTML(str: string, attr: string): string { + private _convertStandoffToHTML(str: string, jsonAttrs: string): string { if (!str) { return undefined; } - if (!attr) { + if (!jsonAttrs) { return str; } - return htmlConverter(JSON.parse(attr), str); + return htmlConverter(JSON.parse(jsonAttrs), str); + } + + /** + * Private method: _distinctSubjects. + * + * It removes duplicates from an array of subjects (SubjectItemJson[]). + * It uses the `reduce` method to create an object with unique `obj_id` keys, + * then converts this object back to an array. + * + * @param {SubjectItemJson[]} subjects The given subject with possible duplicates. + * + * @returns {SubjectItemJson[]} The distinct subjects. + */ + private _distinctSubjects(subjects: SubjectItemJson[]): SubjectItemJson[] { + if (!subjects) { + return undefined; + } + + const distinctObj = subjects.reduce((acc, subject) => { + acc[subject.obj_id] = subject; + return acc; + }, {}); + const distinctArr = Object.values(distinctObj) as SubjectItemJson[]; + + this.filteredOut = subjects.length - distinctArr.length; + + return distinctArr; } /** @@ -871,85 +936,26 @@ export class ConversionService extends ApiService { } // Regexp for Salsah links - // Including subgroup for object id: /[1-9]\d{0,9}/ (any up-to 10-digit integer greater 0) + // Including subgroup for object id: /[1-9]\d{0,12}/ (any up-to 13-digit integer greater 0) const regLink = - /]*?\s+)?href=(["'])((http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?salsah\.org\/api\/resources\/([1-9]\d{0,9}))\1 class=(["'])salsah-link\5>(.*?)<\/a>/i; + /]*?\s+)?href=(["'])((?:https?:\/\/(?:www\.)?)?salsah\.org\/api\/resources\/([1-9]\d{0,12}))\1 class=(["'])salsah-link\4>(.*?)<\/a>/i; let regArr: RegExpExecArray; // Check for salsah links in str - while (regLink.exec(str)) { - // I.e.: as long as regLink is detected in str do... - regArr = regLink.exec(str); - + while ((regArr = regLink.exec(str))) { // Resource id is in 4th array entry - const resId = regArr[4]; + const resId = regArr[3]; // Link text is stored in last array entry - const resTextContent = regArr[regArr.length - 1]; + const resTextContent = regArr.at(-1); // Replace href attribute with click-directive - const replaceValue = - '' + - resTextContent + - ''; - str = str.replace(regArr[0], replaceValue); - } // END while + const replaceValue = `${resTextContent}`; - return str; - } - - /** - * Private method: _replaceParagraphTags. - * - * It removes paragraph tags in richtext values - * and replaces line breaks instead for multiple lines. - * - * @param {string} str The given richtext value. - * - * @returns {string} The adjusted richtext value. - */ - private _replaceParagraphTags(str: string): string { - if (!str) { - return undefined; - } - str = str - .replace(/<\/p>

    /g, '
    ') - .replace(/

    |<\/p>/g, '') - .replace(str, '«$&»'); - return str; - } - - /** - * Private method: _distinctSubjects. - * - * It removes duplicates from an array (SubjectItemJson[]). - * It checks for every array position (reduce) if the obj_id - * of the entry at the current position (y) is already - * in the array (findIndex). If that is not the case it - * pushes y into x which is initialized as empty array []. - * - * See also {@link https://gist.github.com/telekosmos/3b62a31a5c43f40849bb#gistcomment-2137855}. - * - * @param {SubjectItemJson[]} subjects The given subject with possible duplicates. - * - * @returns {SubjectItemJson[]} The distinct subjects. - */ - private _distinctSubjects(subjects: SubjectItemJson[]): SubjectItemJson[] { - if (!subjects) { - return undefined; + str = str.replace(regArr[0], replaceValue); } - this.filteredOut = 0; - const distinctObj = {}; - let distinctArr = []; - - subjects.forEach((subject: SubjectItemJson) => (distinctObj[subject.obj_id] = subject)); - distinctArr = Object.values(distinctObj); - this.filteredOut = subjects.length - distinctArr.length; - - return distinctArr; + return str; } /** diff --git a/src/app/core/services/gnd-service/gnd.service.spec.ts b/src/app/core/services/gnd-service/gnd.service.spec.ts index 3d7cc7d238..013c0af28e 100644 --- a/src/app/core/services/gnd-service/gnd.service.spec.ts +++ b/src/app/core/services/gnd-service/gnd.service.spec.ts @@ -1,14 +1,14 @@ import { TestBed } from '@angular/core/testing'; +import Spy = jasmine.Spy; import { cleanStylesFromDOM } from '@testing/clean-up-helper'; import { expectSpyCall, expectToBe, expectToEqual } from '@testing/expect-helper'; import { mockConsole, mockLocalStorage, mockSessionStorage, mockWindow } from '@testing/mock-helper'; import { AppConfig } from '@awg-app/app.config'; - import { StorageType } from '@awg-core/services/storage-service'; + import { GndEvent, GndEventType, GndService } from './gnd.service'; -import Spy = jasmine.Spy; describe('GndService (DONE)', () => { let gndService: GndService; diff --git a/src/app/shared/address/address.component.html b/src/app/shared/address/address.component.html index 38d0c85e3d..e73de08fd1 100644 --- a/src/app/shared/address/address.component.html +++ b/src/app/shared/address/address.component.html @@ -1,5 +1,5 @@

    -

    +

    {{ pageMetaData?.awgProjectName }} diff --git a/src/app/views/contact-view/contact-view.component.html b/src/app/views/contact-view/contact-view.component.html index 628958e590..d9b7d39cc5 100644 --- a/src/app/views/contact-view/contact-view.component.html +++ b/src/app/views/contact-view/contact-view.component.html @@ -6,7 +6,7 @@

    -

    Empfohlene Zitierweisen:

    +

    Empfohlene Zitierweisen:

    Website:

    @@ -34,7 +34,7 @@

    - GitHub:
    + GitHub:
    Repository unter: {{ pageMetaData?.githubUrl }} @@ -42,7 +42,7 @@

    - Compodoc:
    + Compodoc:
    Dokumentation von Struktur und Funktionalitäten der Angular App:     awg-app documentation

    @@ -55,7 +55,7 @@

    - Herausgeber:
    + Herausgeber:
    {{ pageMetaData.awgProjectName }}
    {{ contactMetaData.address.institution }}
    {{ contactMetaData.address.street }}
    @@ -64,21 +64,21 @@

    - Konzept:
    + Konzept:
    {{ pageMetaData.awgProjectName }}

    - Texte/Inhalte:
    + Texte/Inhalte:
    Die Verantwortung für die Inhalte der Website liegt bei der {{ pageMetaData.awgProjectName }}. Bei inhaltlichen Fragen wenden Sie sich bitte an die unter Kontakt angegebene Adresse.

    - Materialien, Notentexte und Bilder (vgl. Lizenzierung):
    + Materialien, Notentexte und Bilder (vgl. Lizenzierung):
    Digitales Archiv der {{ pageMetaData.awgProjectName }}
    Online-Edition der {{ pageMetaData.awgProjectName }}

    - Programmierung & Webdesign:
    + Programmierung & Webdesign:
    Stefan Münnich
    Wissenschaftlicher Mitarbeiter der {{ pageMetaData.awgProjectName }}, Basel

    -

    Disclaimer/Haftungserklärung:

    +

    Disclaimer/Haftungserklärung:

    Urheberrecht und Lizenzierung:

    Sämtliche im Rahmen der {{ pageMetaData.awgProjectName }} erarbeiteten und auf ihrer Website oder ihrer diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.html index af63f8ebe7..f91d48104f 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.html +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.html @@ -2,14 +2,11 @@

    -

    -
    +
    +

    -

    -
    - -
    -

    + +
    API-Request: diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.spec.ts index dd6ea0e7a6..4f0658a348 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.spec.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-header/resource-detail-header.component.spec.ts @@ -76,14 +76,13 @@ describe('ResourceDetailHtmlHeaderComponent (DONE)', () => { getAndExpectDebugElementByCss(compDe, 'div.row > div.col-lg-4', 1, 1); }); - it('... should contain one h2.resource-title with div.title and div.subtitle', () => { - getAndExpectDebugElementByCss(compDe, 'div.col-lg-8 > h2.resource-title', 1, 1); - getAndExpectDebugElementByCss(compDe, 'h2.resource-title > div.title', 1, 1); - getAndExpectDebugElementByCss(compDe, 'h2.resource-title > div.subtitle', 1, 1); + it('... should contain one div.resource-title with h2.title', () => { + getAndExpectDebugElementByCss(compDe, 'div.col-lg-8 > div.resource-title', 1, 1); + getAndExpectDebugElementByCss(compDe, 'div.resource-title > h2.title', 1, 1); }); - it('... should contain span in div.title with compile html component with no inner html yet', () => { - const titleDe = getAndExpectDebugElementByCss(compDe, 'h2.resource-title > div.title', 1, 1); + it('... should contain span in h2.title with compile html component with no inner html yet', () => { + const titleDe = getAndExpectDebugElementByCss(compDe, 'div.resource-title > h2.title', 1, 1); // Find DebugElements with an attached CompileHtmlComponent const htmlDes = getAndExpectDebugElementByDirective(titleDe[0], CompileHtmlComponent, 1, 1); diff --git a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html index a01bd2c536..986bfe2568 100644 --- a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html +++ b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.html @@ -60,33 +60,32 @@ @if (!isGridView()) {
    - +
    - - + + - @for ( - subject of searchResponseWithQuery?.data?.subjects; - track trackById($index, subject) - ) { + @for (subject of searchResponseWithQuery?.data?.subjects; track subject.obj_id) { - - } @@ -97,7 +96,7 @@ @if (isGridView()) {
    - @for (subject of searchResponseWithQuery?.data?.subjects; track trackById($index, subject)) { + @for (subject of searchResponseWithQuery?.data?.subjects; track subject.obj_id) {
    @@ -106,7 +105,7 @@
    - +
    diff --git a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts index e5e11eee4c..af0b00769c 100644 --- a/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts +++ b/src/app/views/data-view/data-outlets/search-panel/search-result-list/search-result-list.component.ts @@ -348,20 +348,6 @@ export class SearchResultListComponent implements OnInit, OnDestroy { }); } - /** - * Public method: trackById. - * - * It returns a unique identifier of a given item. - * Angular uses the value returned from - * tracking function to track items identity. - * - * @param {string} item The given item. - * @returns {string} The identifier of the item. - */ - trackById(item): string { - return item.obj_id; - } - /** * Public method: updateSearchParams. * diff --git a/src/app/views/data-view/models/resource-detail-header.model.ts b/src/app/views/data-view/models/resource-detail-header.model.ts index 7517336dc8..87b5b14727 100644 --- a/src/app/views/data-view/models/resource-detail-header.model.ts +++ b/src/app/views/data-view/models/resource-detail-header.model.ts @@ -1,3 +1,4 @@ +import { ConversionService } from '@awg-core/services'; import { ResourceFullResponseJson } from '@awg-shared/api-objects'; /** @@ -80,7 +81,7 @@ export class ResourceDetailHeader { let htmlstr = props['webern-onto:event'].toHtml[0]; // Strip & replace

    -tags for displaying title - htmlstr = ResourceDetailHeader._replaceParagraphTags(htmlstr); + htmlstr = ConversionService.replaceParagraphTags(htmlstr); this.title = htmlstr; break; @@ -139,21 +140,4 @@ export class ResourceDetailHeader { this.title = 'Kein Zugriff auf dieses Objekt möglich'; } } - - /** - * Private static method: _replaceParagraphTags. - * - * It replaces paragraph tags with break lines - * in a resource's rich text area (here: title). - */ - private static _replaceParagraphTags(str: string): string { - if (!str) { - return undefined; - } - str = str - .replace(/<\/p>

    /g, '
    ') - .replace(/

    |<\/p>/g, '') - .replace(str, '«$&»'); - return str; - } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-no-results/sparql-no-results.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-no-results/sparql-no-results.component.html index 224cec0f4b..481f11cdf7 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-no-results/sparql-no-results.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-no-results/sparql-no-results.component.html @@ -3,12 +3,12 @@

    Möglicherweise können Sie Ihre Anfrage anpassen.

    Ausführliche Informationen zu SPARQL finden Sie unter: - {{ logos.sparql.href }}{{ logos?.['sparql'].href }}.

    - - {{ logos.sparql.alt }} + + {{ logos?.['sparql'].alt }}

    diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html index 9d77a957e7..a353fe3473 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html @@ -56,7 +56,7 @@ !sourceDescription.description.writingMaterial ) {

    - Beschreibstoff:  + Beschreibstoff:  @@ -64,7 +64,7 @@ } @if (sourceDescription.description.writingMaterial) {

    - Beschreibstoff:  + Beschreibstoff:  @for ( writingMaterial of sourceDescription?.description?.writingMaterial; @@ -153,7 +153,7 @@ @if (utils.isNotEmptyObject(sourceDescription.description.writingInstruments)) { @if (sourceDescription.description.writingInstruments.main) {

    - Schreibstoff:  + Schreibstoff:  - Titel:  + Titel:  @@ -174,7 +174,7 @@ @if (sourceDescription.description.date) {

    - Datierung:  + Datierung:  @@ -183,7 +183,7 @@ @if (sourceDescription.description.pagination) {

    - Paginierung:  + Paginierung:  @@ -192,7 +192,7 @@ @if (sourceDescription.description.measureNumbers) {

    - Taktzahlen:  + Taktzahlen:  @@ -201,7 +201,7 @@ @if (sourceDescription.description.instrumentation) {

    - Instrumentenvorsatz:  + Instrumentenvorsatz:  @@ -210,7 +210,7 @@ @if (sourceDescription.description.annotations) {

    - Eintragungen:  + Eintragungen:  @@ -219,7 +219,7 @@ @if (utils.isNotEmptyArray(sourceDescription.description.content)) {

    -

    Inhalt:

    +

    Inhalt:

    @for (content of sourceDescription.description.content; track content) {

    diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.spec.ts index fdca60dc4c..0708df29e8 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.spec.ts @@ -361,7 +361,7 @@ describe('SourceDescriptionComponent (DONE)', () => { // Process HTML expression of expected text content const expectedHtmlTextContent = mockDocument.createElement('p'); expectedHtmlTextContent.innerHTML = - 'Beschreibstoff: ' + + 'Beschreibstoff: ' + expectedSourceDescriptionListData.sources[1].description.writingMaterialString + ''; @@ -387,7 +387,7 @@ describe('SourceDescriptionComponent (DONE)', () => { // Process HTML expression of expected text content const expectedHtmlTextContent = mockDocument.createElement('p'); expectedHtmlTextContent.innerHTML = - 'Schreibstoff: ' + + 'Schreibstoff: ' + instruments.main + '; ' + instruments.secondary.join(', ') + diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.html index 4d1cef0ab2..aca5e80120 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.html @@ -18,7 +18,7 @@ @if (utils.isNotEmptyArray(textcritic.description)) {

    -

    Skizzenkommentar:

    +

    Skizzenkommentar:

    -

    Textkritischer Kommentar:

    +

    Textkritischer Kommentar:

    } - Skizzenkommentar: + Skizzenkommentar: @if (selectedTextcritics.description && !utils.isNotEmptyArray(selectedTextcritics.description)) {  --- } @@ -25,7 +25,7 @@
    @if (showTkA) {
    -

    Textkritischer Kommentar:

    +

    Textkritischer Kommentar:

    { expect(iconDes[0].children[0].classes['fa-chevron-up']).toBeTrue(); }); - it('... should contain a span.caps in p with heading for Skizzenkommentar', () => { + it('... should contain a span.smallcaps in p with heading for Skizzenkommentar', () => { const divDes = getAndExpectDebugElementByCss( compDe, 'div.awg-edition-svg-sheet-footer-evaluation', @@ -245,7 +245,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { ); const pDes = getAndExpectDebugElementByCss(divDes[0], 'p', 1, 1); - const spanDes = getAndExpectDebugElementByCss(pDes[0], 'span.caps', 1, 1); + const spanDes = getAndExpectDebugElementByCss(pDes[0], 'span.smallcaps', 1, 1); const spanEl = spanDes[0].nativeElement; expectToBe(spanEl.textContent, 'Skizzenkommentar:'); @@ -311,7 +311,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { getAndExpectDebugElementByCss(compDe, 'div.awg-edition-svg-sheet-footer-textcritics', 1, 1); }); - it('... should contain one p.caps header in textcritics div', () => { + it('... should contain one p.smallcaps header in textcritics div', () => { const divDes = getAndExpectDebugElementByCss( compDe, 'div.awg-edition-svg-sheet-footer-textcritics', @@ -322,7 +322,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { const pEl = pDes[0].nativeElement; expect(pEl.classList).toBeDefined(); - expect(pEl.classList).toContain('caps'); + expect(pEl.classList).toContain('smallcaps'); expectToBe(pEl.textContent, `Textkritischer Kommentar:`); }); diff --git a/src/app/views/home-view/home-view.component.html b/src/app/views/home-view/home-view.component.html index 192a0b6c8f..573dd292f2 100644 --- a/src/app/views/home-view/home-view.component.html +++ b/src/app/views/home-view/home-view.component.html @@ -60,8 +60,7 @@

    aufbereitet, zugänglich gehalten und langfristig aufbewahrt. Das DaSCH garantiert eine Zugänglichkeit der Daten gemäss FAIR-Prinzipien, die Zuweisung von digitalen Identifikatoren, maschinenlesbaren Metadaten und den langfristigen Betrieb der technischen Infrastruktur (vgl. - Mission Statement DaSCH). + Mission Statement DaSCH).

    Der Protoyp simuliert bereits in weiten Teilen eine Datenabfrage über die Programmierschnittstelle (API) von diff --git a/src/app/views/home-view/home-view.component.spec.ts b/src/app/views/home-view/home-view.component.spec.ts index 89f5f38252..92618b0d89 100644 --- a/src/app/views/home-view/home-view.component.spec.ts +++ b/src/app/views/home-view/home-view.component.spec.ts @@ -219,7 +219,7 @@ describe('HomeViewComponent (DONE)', () => { const dspEl = dspDes[0].nativeElement; expect(dspEl).toBeDefined(); - expect(dspEl.href).not.toBeTruthy(); + expectToBe(dspEl.href, ''); }); it('... DaSCH', () => { @@ -227,17 +227,15 @@ describe('HomeViewComponent (DONE)', () => { const daschEl = daschDes[0].nativeElement; expect(daschEl).toBeDefined(); - expect(daschEl.href).not.toBeTruthy(); + expectToBe(daschEl.href, ''); }); it('... DaSCH mission', () => { const daschMissionDes = getAndExpectDebugElementByCss(compDe, 'a#dasch-mission-link', 1, 1); const daschMissionEl = daschMissionDes[0].nativeElement; - const missionRoute = 'visionandmission'; - expect(daschMissionEl).toBeDefined(); - expect(daschMissionEl.href).not.toBeTruthy(); + expectToBe(daschMissionEl.href, ''); }); it('... GitHub', () => { @@ -245,7 +243,7 @@ describe('HomeViewComponent (DONE)', () => { const githubEl = githubDes[0].nativeElement; expect(githubEl).toBeDefined(); - expect(githubEl.href).not.toBeTruthy(); + expectToBe(githubEl.href, ''); }); it('... Compodoc', () => { @@ -253,7 +251,7 @@ describe('HomeViewComponent (DONE)', () => { const compodocEl = compodocDes[0].nativeElement; expect(compodocEl).toBeDefined(); - expect(compodocEl.href).not.toBeTruthy(); + expectToBe(compodocEl.href, ''); }); }); }); @@ -474,7 +472,7 @@ describe('HomeViewComponent (DONE)', () => { const daschMissionDes = getAndExpectDebugElementByCss(compDe, 'a#dasch-mission-link', 1, 1); const daschMissionEl = daschMissionDes[0].nativeElement; - const missionRoute = 'visionandmission'; + const missionRoute = 'mission'; expect(daschMissionEl).toBeDefined(); expectToBe(daschMissionEl.href, expectedPageMetaData.daschUrl + missionRoute); diff --git a/src/assets/data/edition/series/1/section/5/op12/source-description.json b/src/assets/data/edition/series/1/section/5/op12/source-description.json index 23df68b2ef..231f04a9d7 100644 --- a/src/assets/data/edition/series/1/section/5/op12/source-description.json +++ b/src/assets/data/edition/series/1/section/5/op12/source-description.json @@ -1081,7 +1081,7 @@ "date": "", "pagination": "", "measureNumbers": "", - "instrumentation": "", + "instrumentation": "Gesang | Klavier auf Bl. 2r System 1 | 2–3;
    Singst. | Klavier auf Bl. 6r System 1 | 2–3.", "annotations": "Der Tag ist vergangen bei U. E. [Kurrentschrift] auf Bl. 1r System 7 rechts mit Bleistift;
    Notenbeilage zu  [Abstand]  M. A. 35 auf Bl. 2r unten links und Mitte mit Bleistift.", "content": [ { @@ -1471,17 +1471,17 @@ "type": "Autograph von Gleich und Gleich („Ein Blumenglöckchen“) M 216: Textfassung 1.", "location": "GB-Lbl, British Library, O. W. Neighbour Collection.", "description": { - "desc": ["1 Bogen oder 1 Blatt, darauf zwei beschriebene Seiten (##S. [1]–[2]##)."], - "writingMaterialString": "Notenpapier, 12 Systeme mit vier (1 + 2 Systeme ) vorgedruckten Akkoladen, Format: hoch ### × ### mm, Firmenzeichen: ##JE_12## auf ##S. [1]## unten links.", + "desc": ["1 Blatt (Bl. 1). [Beschreibung am Original konnte bislang nicht erfolgen.]"], + "writingMaterialString": "Notenpapier, 12 Systeme mit vier (1 + 2 Systeme ) vorgedruckten Akkoladen, Format: hoch ### × ### mm, Firmenzeichen: ##JE_12## recto unten links.", "writingInstruments": { "main": "schwarze Tinte", - "secondary": ["evt. weitere?"] + "secondary": ["evt. weitere"] }, - "title": "Gleich und Gleich | Goethe [Mitte] | Anton Webern, op. 12 [rechts] auf ##S. [1]## oben.", + "title": "Gleich und Gleich | Goethe [Mitte] | Anton Webern, op. 12 [rechts] recto oben.", "date": "", "pagination": "", "measureNumbers": "", - "instrumentation": "", + "instrumentation": "Gesang | Klavier auf Bl. 1r System 1 | 2–3.", "annotations": "", "content": [ { @@ -1490,7 +1490,7 @@ "itemDescription": "Autograph von Gleich und Gleich („Ein Blumenglöckchen“) M 216: Textfassung 1", "folios": [ { - "folio": "##S. [1]##", + "folio": "1r", "folioLinkTo": "", "folioDescription": "", "systemGroups": [ @@ -1525,7 +1525,7 @@ ] }, { - "folio": "##S. [2]##", + "folio": "1v", "folioLinkTo": "", "folioDescription": "", "systemGroups": [ @@ -1565,7 +1565,7 @@ "main": "", "secondary": [] }, - "title": "„Der Tag ist vergangen…“ [Mitte] | Anton Webern | (aus Op. 12). [rechts] oben.", + "title": "„Der Tag ist vergangen…“ [Mitte] | Anton Webern | (aus Op. 12). [rechts] recto oben.", "date": "", "pagination": "1 recto oben rechts.", "measureNumbers": "", @@ -1642,12 +1642,12 @@ "main": "schwarze Tinte", "secondary": ["Bleistift", "roter Buntstift", "violetter Stempelabdruck"] }, - "title": "Vier Lieder [unterstrichen mit Bleistift] | für [Pfeil zu nächsten Zeile mit Bleistift] | Gesang und Klavier | von | Anton Webern | op. 12 auf Bl. 1r System 3–7 Mitte;
    „Der Tag ist vergangen...“ | (Volkslied) [Mitte] [Abstand] [xxx] | Anton Webern, op. 12 No 1 [rechts] auf Bl. 2r System 1, [xxx] rasiert;
    Die geheimnisvolle Flöte | Li-Tai-Po | (aus Hans Bethges „Chinesischer Flöte“) [Mitte] | Anton Webern, op[.] 12 No 2 auf Bl. 4r [rechts] oben bis System 1, Li-Tai-Po und Anton Webern, op[.] 12 No 2 auf Rasur;
    Schien mirs, als ich sah die Sonne! | (aus August Strindbergs „Gespenstersonate“) | [xxx] [Mitte] Anton Webern, op. 12 No 3 [rechts] auf Bl. 6r oben bis System 1, ! gestrichen mit Bleistift, [xxx] rasiert;
    Gleich und Gleich | (Goethe) [Mitte] Anton Webern, op. 12 No 4 [rechts] auf Bl. 8r oben; Anton Webern | Vier Lieder | [xxx] | für | Gesang und Klavier | op. 12 auf Bl. 10r System 3–7 Mitte mit schwarzer Tinte, [xxx] rasiert, alles gestrichen mit Bleistift.", + "title": "Vier Lieder [unterstrichen mit Bleistift] | für [Pfeil zu nächsten Zeile mit Bleistift] | Gesang und Klavier | von | Anton Webern | op. 12 auf Bl. 1r System 3–7 Mitte;
    „Der Tag ist vergangen...“ | (Volkslied) [Mitte] [Abstand] [xxx] | Anton Webern, op. 12 No 1 [rechts] auf Bl. 2r System 1, [xxx] rasiert;
    Die geheimnisvolle Flöte | Li-Tai-Po | (aus Hans Bethges „Chinesischer Flöte“) [Mitte] | Anton Webern, op[.] 12 No 2 auf Bl. 4r [rechts] oben bis System 1, Li-Tai-Po und Anton Webern, op[.] 12 No 2 auf Rasur;
    Schien mirs, als ich sah die Sonne! | (aus August Strindbergs „Gespenstersonate“) | [xxx] [Mitte] Anton Webern, op. 12 No 3 [rechts] auf Bl. 6r oben bis System 1, ! gestrichen mit Bleistift, [xxx] rasiert;
    Gleich und Gleich | (Goethe) [Mitte] Anton Webern, op. 12 No 4 [rechts] auf Bl. 8r oben;
    Anton Webern | Vier Lieder | [xxx] | für | Gesang und Klavier | op. 12 auf Bl. 10r System 3–7 Mitte mit schwarzer Tinte, [xxx] rasiert, alles gestrichen mit Bleistift.", "date": "", "pagination": "1 bis 4 auf Bl. 2r–3v Außenseiten oben mit Bleistift (nicht identifizierte Hs.);
    1 bis 4 auf Bl. 4r–5v Außenseiten oben mit Bleistift (nicht identifizierte Hs.);
    1 bis 4 auf Bl. 6r–7v Außenseiten oben mit Bleistift (nicht identifizierte Hs.);
    1 bis 4 auf Bl. 8r–9v Außenseiten oben mit Bleistift (nicht identifizierte Hs.).", "measureNumbers": "", - "instrumentation": "", - "annotations": "zum Satz [dreifach unterstrichen] [links] [Pfeil nach rechts] Schrift des Umschlages u. Tittelblattes [sic] | (gleichlautend) wie bei meinen | „geistlichen Lieder“ op. 15 U. E. No. 7629 auf Bl. 1r oben mit Bleistift;
    „Universal-Edition“ A.-G. | WIEN [Stempel] | 2/4 ̅2̅5̅ [Bleistift] | Zum Stich! [Stempel] | U. E. 8o | Stichregeln!! | [Paraphe] [Bleistift] auf Bl. 1r System 3–5 rechts (nicht identifizierte Hs.);
    Aufführungsrechte vorbehalten. [Abstand] Droits d’exécution réserves. [Stempel (schwacher Abdruck)] | Universal-Edition | Wien [Bleistift] Copyright 19<25> by Universal Edition [Stempel, <25> mit Bleistift] New York | U. E. Nr[.] 8257 [Bleistift] auf Bl. 1r System 10–12 Mitte (nicht identifizierte Hs.);
    ARCHIV | [darum im Kreis:] DER UNIVERSAL-EDITION A. G. * [alles in einem Kreis] auf Bl. 1r, 2r, 4r, 5r, 6r, 7r, 8r unten rechts mit violettem Stempelabdruck;
    Aufführungsrechte vorbehalten. | Droits d’exécution réserves. auf Bl. 2r oben links mit Stempelabdruck;
    Copyright 19<25> by Universal Edition auf Bl. 2r unten links als Stempelabdruck, <25> mit Bleistift (nicht identifizierte Hs.);
    Universal Edition Nr. 8257 auf Bl. 2r unten Mitte mit Bleistift (nicht identifizierte Hs.);
    U. E. auf Bl. 2v unten Mitte mit Bleistift (nicht identifizierte Hs.);
    U. E. 8257 auf Bl. 4r, 6r, 8r unten Mitte mit Bleistift (nicht identifizierte Hs.);
    Dispositionsziffern in Nr. I („Der Tag ist vergangen“) nach T. 3 (1), 7 (2), 11 (3), 14 (1), 17 (2), 23 (3) mit Bleistift (nicht identifizierte Hs.).", + "instrumentation": "Gesang | Klavier auf Bl. 2r System 1 | 2–3.", + "annotations": "zum Satz [dreifach unterstrichen] [links] [Pfeil nach rechts] Schrift des Umschlages u. Tittelblattes [sic] | (gleichlautend) wie bei meinen | „geistlichen Lieder“ op. 15 U. E. No. 7629 auf Bl. 1r oben mit Bleistift;
    „Universal-Edition“ A.-G. | WIEN [Stempel] | 2/4 ̅2̅5̅ [Bleistift] | Zum Stich! [Stempel] | U. E. 8o | Stichregeln!! | [Paraphe] [Bleistift] auf Bl. 1r System 3–5 rechts (nicht identifizierte Hs.);
    Aufführungsrechte vorbehalten. [Abstand] Droits d’exécution réserves. [Stempel (schwacher Abdruck)] | Universal-Edition | Wien [Bleistift] Copyright 19<25> by Universal Edition [Stempel, <25> mit Bleistift] New York | U. E. Nr[.] 8257 [Bleistift] auf Bl. 1r System 10–12 Mitte (nicht identifizierte Hs.);
    ARCHIV | [darum im Kreis:] DER UNIVERSAL-EDITION A. G. * [alles in einem Kreis] auf Bl. 1r, 2r, 4r, 5r, 6r, 7r, 8r unten rechts mit violettem Stempelabdruck;
    Aufführungsrechte vorbehalten. | Droits d’exécution réserves. auf Bl. 2r oben links mit Stempelabdruck;
    Copyright 19<25> by Universal Edition auf Bl. 2r unten links als Stempelabdruck, <25> mit Bleistift (nicht identifizierte Hs.);
    Universal Edition Nr. 8257 auf Bl. 2r unten Mitte mit Bleistift (nicht identifizierte Hs.);
    U. E. auf Bl. 2v unten Mitte mit Bleistift (nicht identifizierte Hs.);
    U. E. 8257 auf Bl. 4r, 6r, 8r unten Mitte mit Bleistift (nicht identifizierte Hs.);
    Dispositionsziffern in I nach T. 3 (1), 7 (2), 11 (3), 14 (1), 17 (2), 23 (3) mit Bleistift (nicht identifizierte Hs.).", "content": [ { "item": "", @@ -1657,7 +1657,7 @@ { "folio": "1r", "folioLinkTo": "", - "folioDescription": "Titelseite", + "folioDescription": "Titelseite.", "systemGroups": [] } ] @@ -1994,19 +1994,19 @@ "location": "Wien: Universal Edition, 1925.", "description": { "desc": [ - "9 Seiten (S. [1]–9) in Umschlag (S. [a–d]). Innere Seiten des Umschlags (S. [b] und [c]) nicht bedruckt. S. [d]: Verlagsanzeige mit Werkverzeichnis Weberns." + "10 Seiten (S. [1]–[10]): 2 klammergeheftete ineinander gelegte Bögen (S. [1]|2/9|[10], 3|4/5|6) und 1 mit Klebstoff angeheftetes Blatt (S. 7|8) in Umschlag (S. [a–d]), Format: 306 × 230 mm. S. [10] sowie innere Seiten des Umschlags (S. [b] und [c]) nicht bedruckt. S. [d]: Verlagsanzeige (ARNOLD SCHÖNBERGS WERKE)." ], "writingMaterialString": "", "writingInstruments": { "main": "", "secondary": [] }, - "title": "VIER LIEDER | für Gesang und Klavier | von | ANTON WEBERN | Op. 12 auf S. [1];
    Der Tag ist vergangen | (Volkslied) [Mitte] | Anton Webern, Op. 12 Nr. 1 [rechts] auf S. 2 oben (Kopftitel);
    Die geheimnsivolle Flöte | Li-Tai-Po | (aus Hans Bethges „Chinesischer Flöte“) [Mitte] | Anton Webern, Op.12 Nr. 2 [rechts] auf S. 4 oben (Kopftitel);
    Schien mir’s, als ich sah die Sonne | (aus August Strindbergs „Gespenstersonate“) [Mitte] | Anton Webern, Op. 12 Nr. 3 [rechts] auf S. 6 oben (Kopftitel);
    Gleich und Gleich | (Goethe) [Mitte] | Anton Webern, Op. 12 Nr. 4 [rechts] auf S. 8 oben (Kopftitel).", + "title": "VIER LIEDER | für Gesang und Klavier | von | ANTON WEBERN | Op. 12 auf der vorderen Umschlagseite (S. [a]) sowie auf S. [1];
    Der Tag ist vergangen | (Volkslied) [Mitte] | Anton Webern, Op. 12 Nr. 1 [rechts] auf S. 2 oben (Kopftitel);
    Die geheimnsivolle Flöte | Li-Tai-Po | (aus Hans Bethges „Chinesischer Flöte“) [Mitte] | Anton Webern, Op.12 Nr. 2 [rechts] auf S. 4 oben (Kopftitel);
    Schien mir’s, als ich sah die Sonne | (aus August Strindbergs „Gespenstersonate“) [Mitte] | Anton Webern, Op. 12 Nr. 3 [rechts] auf S. 6 oben (Kopftitel);
    Gleich und Gleich | (Goethe) [Mitte] | Anton Webern, Op. 12 Nr. 4 [rechts] auf S. 8 oben (Kopftitel).", "date": "", "pagination": "2 bis 9 auf S. 2–9 Außenecken oben.", "measureNumbers": "", - "instrumentation": "", - "annotations": "Aufführungsrecht vorbehalten. – Droits d'exécution réservés | UNIVERSAL-EDITION | WIEN Copyright 1925 by Universal-Edition NEW YORK auf S. [1] unten;
    Aufführungsrecht vorbehalten. | Droits d'exécution réservés. auf S. 2 oben links;
    Copyright 1925 by Universal-Edition. [links] | Universal-Edition Nr 8257 [Mitte] auf S. 2 unten;
    U. E. 8257 auf S. 3–9 unten Mitte;
    Stich u. Druck der Waldheim-Eberle A. G. auf S. 9.", + "instrumentation": "Gesang | Klavier auf S. 2 System 1 | 2–3", + "annotations": "UNIVERSAL-EDITION | Nr. 8257 auf der vorderen Umschlagseite (S. [a]) unten;
    Aufführungsrecht vorbehalten. – Droits d'exécution réservés | UNIVERSAL-EDITION | WIEN Copyright 1925 by Universal-Edition NEW YORK auf S. [1] unten;
    Aufführungsrecht vorbehalten. | Droits d'exécution réservés. auf S. 2 oben links;
    Copyright 1925 by Universal-Edition. [links] | Universal-Edition Nr 8257 [Mitte] auf S. 2 unten;
    U. E. 8257 auf S. 3–9 unten Mitte;
    Stich u. Druck der Waldheim-Eberle A. G. auf S. 9 unten rechts.", "content": [ { "item": "", @@ -2328,7 +2328,7 @@ "location": "US-Wc, Moldenhauer Archives, Box-Folder: 59/10.", "description": { "desc": ["Siehe G."], - "annotations": "Januar, 1925 auf S. [1] untere Hälfte links mit Bleistift;
    2 1/2 bis 3 nach Nr. I mit Bleistift;
    3’ nach Nr. II mit Bleistift;
    2 1/2 nach Nr. III mit Bleistift;
    2’ [eingerahmt] 3’ nach Nr. II mit Bleistift, 3’ gestrichen. " + "annotations": "Somer, 1925 auf S. [1] untere Hälfte links mit Bleistift;
    2 1/2 bis 3 nach I mit Bleistift;
    3’ nach II mit Bleistift;
    2 1/2 nach III mit Bleistift;
    2’ [eingerahmt] 3’ nach IV mit Bleistift, 3’ gestrichen. " } } ] diff --git a/src/assets/data/edition/series/1/section/5/op23/source-description.json b/src/assets/data/edition/series/1/section/5/op23/source-description.json index efe73768b0..9512249fbb 100644 --- a/src/assets/data/edition/series/1/section/5/op23/source-description.json +++ b/src/assets/data/edition/series/1/section/5/op23/source-description.json @@ -1548,7 +1548,7 @@ "pagination": "- 1 - bis - 7 -, - 8 - bis - 12 -, - 13 - - bis - 14 - -, - 15 - bis - 16 - auf Bl. 2r–5r, 6r–10r mit schwarzer Tinte.", "measureNumbers": "Taktzahlen zu jedem Takt in I (1 bis 50), in II (1 bis 30) und in III (1 bis 28).", "instrumentation": "", - "annotations": "ARCHIV | [darum im Kreis:] DER UNIVERSAL-EDITION A. G. * [alles in einem Kreis] auf Bl. 1–10 recto unten rechts mit violettem Stempelabdruck;
    10255 auf Bl. 1r unten Mitte mit Bleistift (nicht identifizierte Hs.);
    Dispositionsziffern in I nach T. 3, 6, 8, 10, 12, 14, 16, 18, 20, 23, 26, 29, 30 (1 radiert), 32, 34 (2 radiert), 35, 38, 41, 42 (1 radiert), 44, 46 (2 radiert), 47, 50;
    in II nach T. 4 (1 radiert), 5, 7 (2 radiert), 9, 11 (1), 12, 13 (2 radiert), 16, 19 (4), 20, 21 (1), 22, 23 (2 radiert), 25, 26 (3), 30;
    in III nach T. 2 (1), 3, 4 (2), 5, 6 (3), 8, 10 (2), 11, 12 (3), 13, 14 (4), 15 (4 radiert), 16, 17 (1 radiert), 18 (2), 19, 20 (3), 21, 22 (4), 23, 24 (1), 26, 28
    mit Bleistift oder blauem Buntstift (nicht identifizierte Hs.).", + "annotations": "ARCHIV | [darum im Kreis:] DER UNIVERSAL-EDITION A. G. * [alles in einem Kreis] auf Bl. 1–10 recto unten rechts mit violettem Stempelabdruck;
    10255 auf Bl. 1r unten Mitte mit Bleistift (nicht identifizierte Hs.);
    Der Dichterin zugeeignet auf Bl. 1v System 5;
    Dispositionsziffern in I nach T. 3, 6, 8, 10, 12, 14, 16, 18, 20, 23, 26, 29, 30 (1 radiert), 32, 34 (2 radiert), 35, 38, 41, 42 (1 radiert), 44, 46 (2 radiert), 47, 50;
    in II nach T. 4 (1 radiert), 5, 7 (2 radiert), 9, 11 (1), 12, 13 (2 radiert), 16, 19 (4), 20, 21 (1), 22, 23 (2 radiert), 25, 26 (3), 30;
    in III nach T. 2 (1), 3, 4 (2), 5, 6 (3), 8, 10 (2), 11, 12 (3), 13, 14 (4), 15 (4 radiert), 16, 17 (1 radiert), 18 (2), 19, 20 (3), 21, 22 (4), 23, 24 (1), 26, 28
    mit Bleistift oder blauem Buntstift (nicht identifizierte Hs.).", "content": [ { "item": "", @@ -1564,7 +1564,7 @@ { "folio": "1v", "folioLinkTo": "", - "folioDescription": "Widmung.", + "folioDescription": "Widmung: siehe Eintragungen.", "systemGroups": [] } ] @@ -2038,20 +2038,20 @@ "id": "source_D", "siglum": "D", "siglumAddendum": "", - "type": "Druck von Drei Gesänge aus Viae Inviae von Hildegard Jone op. 23.", + "type": "Druck von Drei Gesänge aus Viae Inviae von Hildegard Jone op. 23.", "location": "Wien: Universal Edition, 1936.", "description": { "desc": [ - "12 Seiten (S. [1]–12): 3 klammergeheftete Bögen in Umschlag (S. [a–d]), Format: hoch 309 × 230 mm. Innere Seiten des Umschlags (S. [b] und [c]) nicht bedruckt. S. [d]: Verlagsanzeige mit Werkverzeichnis Weberns." + "12 Seiten (S. [1]–12): 3 klammergeheftete Bögen in Umschlag (S. [a–d]), Format: hoch 309 × 230 mm. Innere Seiten des Umschlags (S. [b] und [c]) nicht bedruckt. S. [d]: Verlagsanzeige (WERKE VON ANTON WEBERN)." ], "writingMaterialString": "", "writingInstruments": { "main": "", "secondary": [] }, - "title": "ANTON WEBERN·| DREI GESÄNGE | OP. 23 | AUS | VIAE INVIAE | VON | HILDEGARD JONE auf der vorderen Umschlagseite (S. [a]) sowie auf S. [1];
    DER DICHTERIN ZUGEEIGNET | DREI GESÄNGE | AUS „VIAE INVIAE“ VON HILDEGARD JONE | I [Mitte] | Anton Webern, Op. 23 [rechts] auf S. 2 oben;
    II auf S. 7 oben Mitte;
    III auf S. 9 oben Mitte.", - "date": "Nr. 123 IV. 1936 auf der hinteren Umschlagseite (S. [d]) unter Verlagsanzeige WERKE VON ANTON WEBERN links.", - "pagination": "2 bis 12 auf S. 2 bis 12 Außenecken oben.", + "title": "ANTON WEBERN | DREI GESÄNGE | OP. 23 | AUS | VIAE INVIAE | VON | HILDEGARD JONE auf der vorderen Umschlagseite (S. [a]) sowie auf S. [1];
    DER DICHTERIN ZUGEEIGNET | DREI GESÄNGE | AUS „VIAE INVIAE“ VON HILDEGARD JONE | I [Mitte] | Anton Webern, Op. 23 [rechts] auf S. 2 oben;
    II auf S. 7 oben Mitte;
    III auf S. 9 oben Mitte.", + "date": "", + "pagination": "2 bis 12 auf S. 2–12 Außenecken oben.", "measureNumbers": "Taktzahlen zu jedem Takt in I (1 bis 50), in II (1 bis 30) und in III (1 bis 28).", "instrumentation": "Gesang | Klavier auf S. 2 System 1 | 2–3.", "annotations": "UNIVERSAL-EDITION | No. 10.255 auf der vorderen Umschlagseite unten;
    Aufführungsrecht vorbehalten | UNIVERSAL-EDITION | WIEN | Copyright 1936 by Universal-Edition A. G. | Printed in Austria auf S. [1] unten;
    Copyright 1936 by Universal-Edition [links] Universal-Edition Nr. 10255 [Mitte] Aufführungsrecht vorbehalten | Droits d’exécution réservés [rechts] auf S. 2 unten;
    U. E. 10255 auf S. 3–12 unten Mitte;
    Druck der Waldheim-Eberle A. G. auf S. 12 unten rechts.", @@ -2059,7 +2059,7 @@ { "item": "", "itemLinkTo": "", - "itemDescription": "Druck von Drei Gesänge aus Viae Inviae von Hildegard Jone op. 23", + "itemDescription": "Druck von Drei Gesänge aus Viae Inviae von Hildegard Jone op. 23", "folios": [ { "folio": "[1]", @@ -2477,7 +2477,7 @@ "location": "", "description": { "desc": [ - "[Die Beschreibung der Quellen C–D einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der Drei Gesänge aus Viae Inviae von Hildegard Jone op. 23 in AWG I/5.]" + "[Die Beschreibung der in den Quellen gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der Drei Gesänge aus Viae Inviae von Hildegard Jone op. 23 in AWG I/5.]" ] } } diff --git a/src/assets/data/edition/series/1/section/5/op25/source-description.json b/src/assets/data/edition/series/1/section/5/op25/source-description.json index 93f1542a96..e6741a3f1b 100644 --- a/src/assets/data/edition/series/1/section/5/op25/source-description.json +++ b/src/assets/data/edition/series/1/section/5/op25/source-description.json @@ -1758,7 +1758,7 @@ "location": "A-Wue, UEQ 493.", "description": { "desc": [ - "12 Blätter (Bl. 1–12): 1 Bogen (Bl. 1/12) umschließt 2 aufeinander gelegte Bögen (Bl. 2/3, 4/5) und 3 ineinander gelegte Bögen (Bl. 6/11 umschließt Bl. 7/8, 9/10). Bl. 1v, 3v (mit Ausnahme der Paginierung) und 10r–12v unbeschriftet. Paginiert von 1 bis 16 auf Bl. 2r–9v äußere Seitenecken oben mit Bleistift." + "12 Blätter (Bl. 1–12): 1 Bogen (Bl. 1/12) umschließt 2 aufeinander gelegte Bögen (Bl. 2/3, 4/5) und 3 ineinander gelegte Bögen (Bl. 6/11 umschließt Bl. 7/8, 9/10). Bl. 1v, 3v (mit Ausnahme der Paginierung) und 10r–12v unbeschriftet." ], "writingMaterialString": "Notenpapier, hoch 340 × 270 mm, 20 Systeme, Firmenzeichen: J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 6 | 20 linig. auf Bl. 12v (Bl. 1/12);
    Notenpapier, hoch 336 × 267 mm, 12 Systeme, Firmenzeichen: J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 2 | 12 linig. auf Bl. 2r unten links (Bl. 2/3);
    Notenpapier, hoch 340 × 270 mm, 12 Systeme, Firmenzeichen: J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 2 | 12 linig. auf Bl. 4r, 7r, 10r unten links (Bl. 4/5, 7–10);
    Notenpapier, hoch 336 × 267 mm, 14 Systeme, Firmenzeichen: J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 3 | 14 linig. auf Bl. 6r unten links (Bl. 6/11).", "writingInstruments": { @@ -1767,7 +1767,7 @@ }, "title": "Anton Webern || Drei Lieder | nach | Gedichten | von | Hildegard Jone | [xxx] [rasiert] | op. 25 auf Bl. 1r System 2–13;
    I. [oben Mitte] | Anton Webern, op. 25 [System 1 rechts] auf Bl. 2r;
    II. auf Bl. 4r oben Mitte;
    III. auf Bl. 7r oben Mitte.", "date": "", - "pagination": "", + "pagination": " 1 bis 16 auf Bl. 2r–9v äußere Seitenecken oben mit Bleistift.", "measureNumbers": "", "instrumentation": "", "annotations": "", diff --git a/src/assets/data/edition/series/2/section/2a/m22/source-description.json b/src/assets/data/edition/series/2/section/2a/m22/source-description.json new file mode 100644 index 0000000000..6e98527c9c --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m22/source-description.json @@ -0,0 +1,4328 @@ +{ + "sources": [ + { + "id": "source_A", + "siglum": "A", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt: Das Blatt ist Bestandteil (Bl. 4) eines größeren Konvolutes bestehend aus 1 Blatt (Bl. 1), 1 Bogen (Bl. 2/3) und 1 Blatt (Bl. 4). Horizontale Knickfalte. Stockflecken unten mittig-rechts. Ecke unten links abgerissen (inkl. Firmenzeichen auf 1r). Rissspuren am linken Rand: von Bogen abgetrennt." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 343 × 264 mm, Firmenzeichen abgerissen.", + "writingInstruments": { + "main": "schwarze Tinte", + "secondary": ["Bleistift"] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M* 408", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 408)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "2–5", + "measure": "1–9", + "linkTo": "" + } + ], + [ + { + "system": "7–10", + "measure": "10–17", + "linkTo": "" + } + ], + [ + { + "system": "12–15", + "measure": "18–25", + "linkTo": "" + } + ], + [ + { + "system": "17–20", + "measure": "26–32", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk1", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk1" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Thema)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22–23", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 411 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 411)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24–25", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "26a–27a", + "measure": "12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 411 Sk1.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 411)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26b–27b", + "measure": "15–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 412 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 412)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26c–27c", + "measure": "1–8", + "linkTo": "" + } + ], + [ + { + "system": "22b–23b", + "measure": "9–11", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk2", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk2" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. I)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "28–27", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk3", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk3a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. II)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26–25", + "measure": "{1A}, 1B, 2–4, {5A}, 5B, 6", + "linkTo": "M_22_Sk3a" + } + ], + [ + { + "system": "24–23", + "measure": "7–8", + "linkTo": "M_22_Sk3b" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk4", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk4a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. III)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22–21", + "measure": "1–4, {5A}, 5B, 6(1–2/4)", + "linkTo": "M_22_Sk4a" + } + ], + [ + { + "system": "20–19", + "measure": "6(3/4)–8", + "linkTo": "M_22_Sk4b" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk5", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk5" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. IV)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18a–17a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk6", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk6" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. V)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16a–15a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk7", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk7" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VI)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14a–13a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk22", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk22a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VIII)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–13b", + "measure": "1–5(1–2/4)", + "linkTo": "M_22_Sk22a" + } + ], + [ + { + "system": "16b–15b", + "measure": "5(3/4)–6", + "linkTo": "M_22_Sk22b" + } + ], + [ + { + "system": "18b–17b", + "measure": "7–8", + "linkTo": "M_22_Sk22c" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk8", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk8" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12–11", + "measure": "1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk9", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk9a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VII)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–9", + "measure": "{1A–2A}, 1B–2B, 1C–2C, 3–4", + "linkTo": "M_22_Sk9a" + } + ], + [ + { + "system": "7a–6", + "measure": "5–8", + "linkTo": "M_22_Sk9b" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk10", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk10" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. IX)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8–7b", + "measure": "{1–3}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk11", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk11" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. IX)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–4", + "measure": "1–4, {5A}, 5B, 6, {7A–8A}, 7B–8B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk12", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk12" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. X)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3–2", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_B", + "siglum": "B", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt. Rissspuren am linken Rand: von Bogen abgetrennt. Horizontale und vertikale Knickfalte, diagonale Knickfalte unten rechts." + ], + "writingMaterialString": "Notenpapier, 18 Systeme, Format: hoch 347 × 267 mm, Firmenzeichen ### unten links auf Bl. 1r.", + "writingInstruments": { + "main": "schwarze Tinte", + "secondary": ["Bleistift"] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk13", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk13" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "{1A}, 1B, 2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 414 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 414)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "1–4", + "linkTo": "" + } + ], + [ + { + "system": "3c–4c", + "measure": "5–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk14", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk14" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–4a", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk15", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk15" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5a–6a", + "measure": "1A–3A, 4, 1B–3B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 414 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 414)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7a–8a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk23", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk23a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "1–2", + "linkTo": "M_22_Sk23a" + } + ], + [ + { + "system": "5b–6b", + "measure": "3–4", + "linkTo": "M_22_Sk23b" + } + ], + [ + { + "system": "7b–8b", + "measure": "5–6", + "linkTo": "M_22_Sk23c" + } + ], + [ + { + "system": "3d–4d", + "measure": "7", + "linkTo": "M_22_Sk23d" + } + ] + ] + } + ] + }, + { + "item": "M* 413 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 413)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "9–10", + "measure": "1–6, {7A, 7B}, 7C", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk16", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk16" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11–12", + "measure": "1–3, 4A, 4B, 5–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk17", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk17" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "13a–14a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk18", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk18a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15–16", + "measure": "1–6", + "linkTo": "M_22_Sk18a" + } + ], + [ + { + "system": "13b–14b", + "measure": "7", + "linkTo": "M_22_Sk18b" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk19", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk19" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17a–18a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk21", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk21a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XV)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17b–18b", + "measure": "T. 1–4", + "linkTo": "M_22_Sk21a" + } + ] + ] + }, + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16c–17c", + "measure": "5–6", + "linkTo": "M_22_Sk21b" + } + ], + [ + { + "system": "16a–17a", + "measure": "7–8", + "linkTo": "M_22_Sk21c" + } + ] + ] + } + ] + }, + { + "item": "M 32", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 32 Textfassung 2)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "21–29", + "linkTo": "" + } + ], + [ + { + "system": "3–4", + "measure": "30–37", + "linkTo": "" + } + ], + [ + { + "system": "5a–6a", + "measure": "38–41", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5b–6b", + "measure": "{30–32}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk4", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "21–29", + "linkTo": "" + } + ], + [ + { + "system": "12b–15c", + "measure": "30–33", + "linkTo": "" + } + ], + [ + { + "system": "10–11", + "measure": "34–39, {40A–41A}", + "linkTo": "" + } + ], + [ + { + "system": "12a–13a", + "measure": "40B–41B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk5", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14a–15b", + "measure": "48–51", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk4.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–15b", + "measure": "32+x bis 33+x", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk20", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk20" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XV)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–17b", + "measure": "{1A}, 1B, 2–3", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_C", + "siglum": "C", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt. Horizontale Knickfalte. Zahlreiche Risse und Knicke am rechten, oberen und unteren Rand. Rötliche Verfärbung oben links und rechts. Rissspuren am linken Rand: von Bogen abgetrennt." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 347 × 264 mm, Firmenzeichen ### unten links auf Bl. 1r.", + "writingInstruments": { + "main": "Bleistift", + "secondary": [] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk24", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk24" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk27.1", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk27_1a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "5–6", + "linkTo": "M_22_Sk27_1a" + } + ], + [ + { + "system": "3–4a", + "measure": "7–8", + "linkTo": "M_22_Sk27_1b" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk25", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk25a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "4–5", + "measure": "{1–5}", + "linkTo": "M_22_Sk25a" + } + ], + [ + { + "system": "6–7", + "measure": "{6–8}", + "linkTo": "M_22_Sk25b" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk26", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk26a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8–9", + "measure": "1–5", + "linkTo": "M_22_Sk26a" + } + ], + [ + { + "system": "10a–11a", + "measure": "6–8", + "linkTo": "M_22_Sk26b" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk27", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk27" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10b–14", + "measure": "1–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk30", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk30" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–17", + "measure": "1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–4, {5–8}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk1.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–4a", + "measure": "6(1–2/4)–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "5–10", + "linkTo": "" + } + ], + [ + { + "system": "5–6", + "measure": "11–20", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "21–30", + "linkTo": "" + } + ], + [ + { + "system": "9–10", + "measure": "{31A}, 31B, 32–33", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12–15", + "measure": "1–9", + "linkTo": "" + } + ], + [ + { + "system": "17–20", + "measure": "10–17", + "linkTo": "" + } + ], + [ + { + "system": "22–25", + "measure": "18–24", + "linkTo": "" + } + ], + [ + { + "system": "26–28", + "measure": "25", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_D", + "siglum": "D", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt: Linke obere Ecke mit Bleistift eingefärbt. Rissspuren am rechten Rand: von Bogen abgetrennt. Horizontale und vertikale Knickfalte." + ], + "writingMaterialString": "Notenpapier, 18 Systeme, Format: hoch 347 × 266 mm, Firmenzeichen: [J.E. & Co.] | No. 5 | 18 linig. unten links auf Bl. 1v.", + "writingInstruments": { + "main": "Bleistift", + "secondary": [] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk29", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk29" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XX)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 400 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 400)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3–4", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "11–19", + "linkTo": "" + } + ], + [ + { + "system": "9a–10a", + "measure": "20–24", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11a–12a", + "measure": "x+1 bis x+3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11b–12b", + "measure": "{x+1A}, x+1B, x+2 bis x+5", + "linkTo": "" + } + ], + [ + { + "system": "13a", + "measure": "{x+6}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 415 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 415)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18–17", + "measure": "{1A}, 1B, 2–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 416 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 416)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–15", + "measure": "{1A}, 1B, 2–8, x+1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk28", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk28a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIX)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–13b", + "measure": "{1A–2A}, 1B–2B, 3–6", + "linkTo": "M_22_Sk28a" + } + ], + [ + { + "system": "10b–9b", + "measure": "7–8", + "linkTo": "M_22_Sk28b" + } + ] + ] + } + ] + }, + { + "item": "M* 401 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 401)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "3a–4a", + "measure": "12–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 401 Sk1.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 401)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "13–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 401 Sk1.2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 401)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "9–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk4", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "9–10", + "measure": "11–18, {19A–20A}", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "{21A}, 19B–21B, 22, {23A}, 23B, 24–26", + "linkTo": "" + } + ], + [ + { + "system": "13–14", + "measure": "32, {33A–34A}, {33B(2–3/4)}, 33C, 34B", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_E", + "siglum": "E", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Bogen (Bl. 1/2): Der Bogen ist Bestandteil (Bl. 1/2) eines größeren Konvoluts aus 2 Bögen (Bl. 1/2, 3/4), 1 Blatt (Bl. 5) und 1 Bogen (Bl. 6/7). Horizontale und vertikale Knickfalte, seitlich leicht eingerissen." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 342 × 264 mm, Firmenzeichen: [J.E. & Co.] | No. 9 | 28 linig. unten links auf Bl. 11–2r.", + "writingInstruments": { + "main": "Bleistift", + "secondary": [] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk31", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk31a" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–7", + "linkTo": "M_22_Sk31a" + } + ], + [ + { + "system": "3a–4a", + "measure": "8", + "linkTo": "M_22_Sk31b" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Thema)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–6", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "11–12, nach T. 12 Liedtext", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk28.1", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk28_1" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIX)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "6–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk32", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk32" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–11", + "measure": "1A, 1B, 2–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk32.1", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk32_1" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12a–13a", + "measure": "6, {7A–8A}, 7B–8B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk32.1.1", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk32_1_1" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12b–13b", + "measure": "7", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk33", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_Sk33" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–15", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 417 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 417)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16a–18a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 418 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 418)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–18b", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 419 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 419)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19a–21", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. I)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19b–20b", + "measure": "1–3", + "linkTo": "" + } + ], + [ + { + "system": "22–23", + "measure": "4–9", + "linkTo": "" + } + ], + [ + { + "system": "12c–13c", + "measure": "10–11", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 420 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 420)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24a–25a", + "measure": "{1A}, 1B, 2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 421 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 421)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24b–25b", + "measure": "{1A, 1B}, 1C, 2A, {1D}", + "linkTo": "" + } + ], + [ + { + "system": "26a–27a", + "measure": "1E, 2B, 3–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 422 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 422)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26b–27b", + "measure": "{1A–2A, 1B}, 1C, 2B, 3–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Thema)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 433 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 433)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 434 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 434)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–4b", + "measure": "1–3, {4A}, 4B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 434 Sk1.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 434)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "{3–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 435 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 435)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 436 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Palmsonntag-Tractus M* 436)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "6a", + "measure": "", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 437 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 437)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6b", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. I)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "{1A, 1B}, 1C, 2–6", + "linkTo": "" + } + ], + [ + { + "system": "9a–10a", + "measure": "7–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk2.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. I)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "9b–10b", + "measure": "2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11–12", + "measure": "1–3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk4", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "13a–14a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk5", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15a–16", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk6", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12b–13b", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk7", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–15b", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk8", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. II)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17–18", + "measure": "{1A–4A}, 1B–4B, 5–11, {12A}", + "linkTo": "" + } + ], + [ + { + "system": "19a–20a", + "measure": "12B, 13–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk9", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19b–20b", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk10", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. III)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21a–22a", + "measure": "1–5", + "linkTo": "" + } + ], + [ + { + "system": "19c–20c", + "measure": "6–8", + "linkTo": "" + } + ] + ] + }, + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "9–13", + "linkTo": "" + } + ], + [ + { + "system": "3–4", + "measure": "14–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 438 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 438)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23a–24a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 439 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 439)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21b–22b", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "23b–24b", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 440 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 440)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23c–26e", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "25a–26a", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25b–26b", + "measure": "1–3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25c–26c", + "measure": "{1A–2A, 1B, 1C, 2B, 3}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25c–26c", + "measure": "{1A}", + "linkTo": "" + } + ], + [ + { + "system": "27a–28a", + "measure": "{1B, 2–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk4", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "27b–28b", + "measure": "{1A, 1B, 1C, 1D}, 1E, 2–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk11", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "{1–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk4.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "{3–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 442 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 442)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "5–6", + "measure": "7A–8A, 7B–8B, 9, 7C–8C", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 443 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 443)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7a–8a", + "measure": "1–3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7b–10", + "measure": "1–2, {3A–4A}, 3B–4B, 5–6", + "linkTo": "" + } + ], + [ + { + "system": "12a–13a", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12b–13b", + "measure": "1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12c", + "measure": "1(2–4/4)", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12d–13c", + "measure": "8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 444 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 444)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15a–16a", + "measure": "{1–5}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk13", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15b–16b", + "measure": "1A–2A, 1B–2B, 3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 445 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 445)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17–18", + "measure": "1–9", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.4", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19a–20a", + "measure": "2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 446 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 446)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19b–20b", + "measure": "1–7", + "linkTo": "" + } + ], + [ + { + "system": "21a–22a", + "measure": "8–10", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk14.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. V)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21b–22b", + "measure": "5–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk14", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. V)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23–24", + "measure": "1–5, {6A}, 6B, 7–10", + "linkTo": "" + } + ], + [ + { + "system": "25a–26a", + "measure": "11–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 447 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 447)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25b–26b", + "measure": "1, {2–5}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 448 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 448)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–6, {7A–8A, 7B–8B} 7C", + "linkTo": "" + } + ], + [ + { + "system": "3a–4", + "measure": "8C, 9A–10A, 9B–10B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk15.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VI)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b", + "measure": "5–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 449 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 449)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "x+1 bis x+3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk15", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VI)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "1–8", + "linkTo": "" + } + ], + [ + { + "system": "7a–8a", + "measure": "9–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk2.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7b–8b", + "measure": "5–11", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "9a–10a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "9b–10b", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk16", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VI)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11a–13a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk2.2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11b", + "measure": "{x+1 bis x+3}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 451 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 451)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14a–15a", + "measure": "1, 2A, {3A–4A}, 2B–4B, 5–7", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 451 Sk3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 451)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–15b", + "measure": "1–4, 5A", + "linkTo": "" + } + ], + [ + { + "system": "12b–13b", + "measure": "5B, 6–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 451 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 451)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–17", + "measure": "1–4, 5A, 5B, 6, 7A–8A, 7B–8B, 9, 7C–8C", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk17", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VII)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18–19", + "measure": "1–7", + "linkTo": "" + } + ], + [ + { + "system": "20a–21a", + "measure": "8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk17.1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VII)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "20b–21b", + "measure": "3–7", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 65 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu „Hochsommernacht“ M 65)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23–26", + "measure": "1–11", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_F", + "siglum": "F", + "siglumAddendum": "", + "type": "Tintenniederschrift.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt (Bl. 1), 1 Bogen (Bl. 2/3): Blatt und Bogen sind Bestandteil (Bl. 1, 2/3) eines größeren Konvolutes bestehend aus 1 Blatt (Bl. 1), 1 Bogen (Bl. 2/3) und 1 Blatt (Bl. 4). Horizontale Knickfalte auf Blatt und Bogen. Kleiner Stockfleck oben rechts auf Blatt und Bogen. Ecke unten rechts von Bl. 1 abgerissen. Bogen unten in der Falte eingerissen." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 343 × 264 mm, Firmenzeichen ### unten links auf Bl. 1r–3r.", + "writingInstruments": { + "main": "schwarze Tinte", + "secondary": ["Bleistift"] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M* 409", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 409 Textfassung 1)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "2–3", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "5a–6a", + "measure": "12–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 409", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 409 Textfassung 2)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5b–6b", + "measure": "2–4", + "linkTo": "" + } + ], + [ + { + "system": "5c–6c", + "measure": "6–8/14–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 410", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 410)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8–9", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "10–11b", + "measure": "11B", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "12–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22", + "itemLinkTo": { + "complexId": "m22", + "sheetId": "M_22_TF1" + }, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 22)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–15", + "measure": "1–8 (Thema)", + "linkTo": "" + } + ], + [ + { + "system": "23–24", + "measure": "1–6 (Var. I)", + "linkTo": "" + } + ], + [ + { + "system": "25–26", + "measure": "7–8 (Var. I)", + "linkTo": "" + } + ], + [ + { + "system": "27–28", + "measure": "1–8 (Var. II)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–6 (Var. III)", + "linkTo": "" + } + ], + [ + { + "system": "3–4", + "measure": "1–4 (Var. IV)", + "linkTo": "" + } + ], + [ + { + "system": "5–6", + "measure": "1–8 (Var. V)", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "1–4 (Var. VI)", + "linkTo": "" + } + ], + [ + { + "system": "9–10", + "measure": "7–8 (Var. III)", + "linkTo": "" + } + ], + [ + { + "system": "12–13", + "measure": "1–7 (Var. VII)", + "linkTo": "" + } + ], + [ + { + "system": "14–15", + "measure": "8 (Var. VII)", + "linkTo": "" + } + ], + [ + { + "system": "17–18", + "measure": "1–6 (Var. VIII)", + "linkTo": "" + } + ], + [ + { + "system": "19–20", + "measure": "7–8 (Var. VIII)", + "linkTo": "" + } + ], + [ + { + "system": "22–23", + "measure": "1–8 (Var. IX)", + "linkTo": "" + } + ], + [ + { + "system": "24–25", + "measure": "1–6 (Var. X)", + "linkTo": "" + } + ], + [ + { + "system": "27–28", + "measure": "7–8 (Var. X)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–4 (Var. XI)", + "linkTo": "" + } + ], + [ + { + "system": "4–5", + "measure": "1–3 (Var. XII)", + "linkTo": "" + } + ], + [ + { + "system": "13–14", + "measure": "1–7 (Var. XIII)", + "linkTo": "" + } + ], + [ + { + "system": "16a–17a", + "measure": "8 (Var. XIII)", + "linkTo": "" + } + ], + [ + { + "system": "16b–17b", + "measure": "1–4 (Var. XIV)", + "linkTo": "" + } + ], + [ + { + "system": "19–20", + "measure": "1–8 (Var. XV)", + "linkTo": "" + } + ], + [ + { + "system": "22–23", + "measure": "1–8 (Var. XVI)", + "linkTo": "" + } + ], + [ + { + "system": "25–26", + "measure": "1–6 (Var. XVII)", + "linkTo": "" + } + ], + [ + { + "system": "27–28", + "measure": "7–8 (Var. XVII)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "2–3", + "measure": "1–8 (Var. XVIII)", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "1–8 (Var. XIX)", + "linkTo": "" + } + ], + [ + { + "system": "8b–9b", + "measure": "7B–8B (Var. XIX)", + "linkTo": "" + } + ], + [ + { + "system": "14–15", + "measure": "1–8 (Var. XX)", + "linkTo": "" + } + ], + [ + { + "system": "17–20", + "measure": "1–6 (Var. XXI)", + "linkTo": "" + } + ], + [ + { + "system": "22–25", + "measure": "7–8 (Var. XXI)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–4", + "measure": "1–8 (Var. XXII)", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "1–8 (Var. XXIII)", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 412", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 412)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17–18", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "20–21", + "measure": "20–21", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 413", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 413)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 414", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 414)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–11", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 415", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 415)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 416", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 416)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8a–9a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 23: Thema)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "6–7", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "8–9", + "measure": "11–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 420", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 420)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16a–18a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 421", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 421)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–18b", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 422", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 422)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "20–22", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 423", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 423)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21c–26", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 424 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 424)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 425 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 425)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 426 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 426)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1c–2c", + "measure": "1, 2A", + "linkTo": "" + } + ], + [ + { + "system": "3a–4a", + "measure": "2B, 2C, 3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 427 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 427)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–5", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 428 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 428)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk3", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. II)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "6–7", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "8–9", + "measure": "7–9", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk4", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. III)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–11", + "measure": "{1A}, 1B, 2, {3A}, 3B, 4–5", + "linkTo": "" + } + ], + [ + { + "system": "12–13", + "measure": "6–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk5", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. IV)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–15", + "measure": "1–6, {7A}, 7B", + "linkTo": "" + } + ], + [ + { + "system": "16a–17a", + "measure": "8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 429 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 429)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–17b", + "measure": "{1A–2A}, 1B–2B, 3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk6", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18a–19a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk7", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18b–19b", + "measure": "x+1 bis x+2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk8", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18c", + "measure": "x+1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 430 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 430)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "20–21", + "measure": "1–10", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk9", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22a–23a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 431 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 431)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22b–23b (Tinte)", + "measure": "{1–3}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 431 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 431)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24a–26a (Tinte)", + "measure": "{1A–3A}, 1B–3B, 4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 432 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition M* 432)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12c–13c (Tinte)", + "measure": "{1A–2A, 1B–2B}, 1C", + "linkTo": "" + } + ], + [ + { + "system": "14b–15b", + "measure": "3–6", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m22/source-description_m22_source-description.json b/src/assets/data/edition/series/2/section/2a/m22/source-description_m22_source-description.json new file mode 100644 index 0000000000..0be85852af --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m22/source-description_m22_source-description.json @@ -0,0 +1,4162 @@ +{ + "sources": [ + { + "id": "source_A", + "siglum": "A", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt: Das Blatt ist Bestandteil (Bl. 4) eines größeren Konvolutes bestehend aus 1 Blatt (Bl. 1), 1 Bogen (Bl. 2/3) und 1 Blatt (Bl. 4). Horizontale Knickfalte. Stockflecken unten mittig-rechts. Ecke unten links abgerissen (inkl. Firmenzeichen auf 1r). Rissspuren am linken Rand: von Bogen abgetrennt." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 343 × 264 mm, Firmenzeichen abgerissen.", + "writingInstruments": { + "main": "schwarze Tinte", + "secondary": [ + "Bleistift" + ] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M* 408", + "itemLinkTo": "Mstar_408", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 408)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "2–5", + "measure": "1–9", + "linkTo": "" + } + ], + [ + { + "system": "7–10", + "measure": "10–17", + "linkTo": "" + } + ], + [ + { + "system": "12–15", + "measure": "18–25", + "linkTo": "" + } + ], + [ + { + "system": "17–20", + "measure": "26–32", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk1", + "itemLinkTo": "M_22_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Thema)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22–23", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 411 Sk1", + "itemLinkTo": "Mstar_411_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 411)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24–25", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "26a–27a", + "measure": "12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 411 Sk1.1", + "itemLinkTo": "Mstar_411_Sk1_1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 411)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26b–27b", + "measure": "15–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 412 Sk1", + "itemLinkTo": "Mstar_412_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 412)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26c–27c", + "measure": "1–8", + "linkTo": "" + } + ], + [ + { + "system": "22b–23b", + "measure": "9–11", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk2", + "itemLinkTo": "M_22_Sk2", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. I)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "28–27", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk3", + "itemLinkTo": "M_22_Sk3", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. II)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26–25", + "measure": "{1A}, 1B, 2–4, {5A}, 5B, 6", + "linkTo": "" + } + ], + [ + { + "system": "24–23", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk4", + "itemLinkTo": "M_22_Sk4", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. III)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22–21", + "measure": "1–4, {5A}, 5B, 6(1–2/4)", + "linkTo": "" + } + ], + [ + { + "system": "20–19", + "measure": "6(3/4)–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk5", + "itemLinkTo": "M_22_Sk5", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. IV)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18a–17a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk6", + "itemLinkTo": "M_22_Sk6", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. V)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16a–15a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk7", + "itemLinkTo": "M_22_Sk7", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VI)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14a–13a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk22", + "itemLinkTo": "M_22_Sk22", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VIII)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–13b", + "measure": "1–5(1–2/4)", + "linkTo": "" + } + ], + [ + { + "system": "16b–15b", + "measure": "5(3/4)–6", + "linkTo": "" + } + ], + [ + { + "system": "18b–17b", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk8", + "itemLinkTo": "M_22_Sk8", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12–11", + "measure": "1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk9", + "itemLinkTo": "M_22_Sk9", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VII)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–9", + "measure": "{1A–2A}, 1B–2B, 1C–2C, 3–4", + "linkTo": "" + } + ], + [ + { + "system": "7a–6", + "measure": "5–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk10", + "itemLinkTo": "M_22_Sk10", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. IX)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8–7b", + "measure": "{1–3}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk11", + "itemLinkTo": "M_22_Sk11", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. IX)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–4", + "measure": "1–4, {5A}, 5B, 6, {7A–8A}, 7B–8B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk12", + "itemLinkTo": "M_22_Sk12", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. X)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3–2", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_B", + "siglum": "B", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt. Rissspuren am linken Rand: von Bogen abgetrennt. Horizontale und vertikale Knickfalte, diagonale Knickfalte unten rechts." + ], + "writingMaterialString": "Notenpapier, 18 Systeme, Format: hoch 347 × 267 mm, Firmenzeichen ### unten links auf Bl. 1r.", + "writingInstruments": { + "main": "schwarze Tinte", + "secondary": [ + "Bleistift" + ] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk13", + "itemLinkTo": "M_22_Sk13", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "{1A}, 1B, 2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 414 Sk1", + "itemLinkTo": "Mstar_414_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 414)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "1–4", + "linkTo": "" + } + ], + [ + { + "system": "3c–4c", + "measure": "5–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk14", + "itemLinkTo": "M_22_Sk14", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–4a", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk15", + "itemLinkTo": "M_22_Sk15", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5a–6a", + "measure": "1A–3A, 4, 1B–3B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 414 Sk2", + "itemLinkTo": "Mstar_414_Sk2", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 414)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7a–8a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk23", + "itemLinkTo": "M_22_Sk23", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "1–2", + "linkTo": "" + } + ], + [ + { + "system": "5b–6b", + "measure": "3–4", + "linkTo": "" + } + ], + [ + { + "system": "7b–8b", + "measure": "5–6", + "linkTo": "" + } + ], + [ + { + "system": "3d–4d", + "measure": "7", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 413 Sk1", + "itemLinkTo": "Mstar_413_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 413)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "9–10", + "measure": "1–6, {7A, 7B}, 7C", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk16", + "itemLinkTo": "M_22_Sk16", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. VIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11–12", + "measure": "1–3, 4A, 4B, 5–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk17", + "itemLinkTo": "M_22_Sk17", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "13a–14a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk18", + "itemLinkTo": "M_22_Sk18", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15–16", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "13b–14b", + "measure": "7", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk19", + "itemLinkTo": "M_22_Sk19", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17a–18a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk21", + "itemLinkTo": "M_22_Sk21", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XV)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17b–18b", + "measure": "T. 1–4", + "linkTo": "" + } + ] + ] + }, + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16c–17c", + "measure": "5–6", + "linkTo": "" + } + ], + [ + { + "system": "16a–17a", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32", + "itemLinkTo": "M_32", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 32 Textfassung 2)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "21–29", + "linkTo": "" + } + ], + [ + { + "system": "3–4", + "measure": "30–37", + "linkTo": "" + } + ], + [ + { + "system": "5a–6a", + "measure": "38–41", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk3", + "itemLinkTo": "M_32_Sk3", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5b–6b", + "measure": "{30–32}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk4", + "itemLinkTo": "M_32_Sk4", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "21–29", + "linkTo": "" + } + ], + [ + { + "system": "12b–15c", + "measure": "30–33", + "linkTo": "" + } + ], + [ + { + "system": "10–11", + "measure": "34–39, {40A–41A}", + "linkTo": "" + } + ], + [ + { + "system": "12a–13a", + "measure": "40B–41B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk5", + "itemLinkTo": "M_32_Sk5", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14a–15b", + "measure": "48–51", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 32 Sk4.1", + "itemLinkTo": "M_32_Sk4_1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 32 Textfassung 3)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–15b", + "measure": "32+x bis 33+x", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk20", + "itemLinkTo": "M_22_Sk20", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XV)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–17b", + "measure": "{1A}, 1B, 2–3", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_C", + "siglum": "C", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt. Horizontale Knickfalte. Zahlreiche Risse und Knicke am rechten, oberen und unteren Rand. Rötliche Verfärbung oben links und rechts. Rissspuren am linken Rand: von Bogen abgetrennt." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 347 × 264 mm, Firmenzeichen ### unten links auf Bl. 1r.", + "writingInstruments": { + "main": "Bleistift", + "secondary": [] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk24", + "itemLinkTo": "M_22_Sk24", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk27.1", + "itemLinkTo": "M_22_Sk27_1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "5–6", + "linkTo": "" + } + ], + [ + { + "system": "3–4a", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk25", + "itemLinkTo": "M_22_Sk25", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: verworfene Var.)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "4–5", + "measure": "{1–5}", + "linkTo": "" + } + ], + [ + { + "system": "6–7", + "measure": "{6–8}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk26", + "itemLinkTo": "M_22_Sk26", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8–9", + "measure": "1–5", + "linkTo": "" + } + ], + [ + { + "system": "10a–11a", + "measure": "6–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk27", + "itemLinkTo": "M_22_Sk27", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XVIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10b–14", + "measure": "1–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk30", + "itemLinkTo": "M_22_Sk30", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–17", + "measure": "1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk1", + "itemLinkTo": "Mstar_408_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–4, {5–8}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk1.1", + "itemLinkTo": "Mstar_408_Sk1_1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–4a", + "measure": "6(1–2/4)–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk2", + "itemLinkTo": "Mstar_408_Sk2", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "5–10", + "linkTo": "" + } + ], + [ + { + "system": "5–6", + "measure": "11–20", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "21–30", + "linkTo": "" + } + ], + [ + { + "system": "9–10", + "measure": "{31A}, 31B, 32–33", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 408 Sk3", + "itemLinkTo": "Mstar_408_Sk3", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M* 408)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12–15", + "measure": "1–9", + "linkTo": "" + } + ], + [ + { + "system": "17–20", + "measure": "10–17", + "linkTo": "" + } + ], + [ + { + "system": "22–25", + "measure": "18–24", + "linkTo": "" + } + ], + [ + { + "system": "26–28", + "measure": "25", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_D", + "siglum": "D", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt: Linke obere Ecke mit Bleistift eingefärbt. Rissspuren am rechten Rand: von Bogen abgetrennt. Horizontale und vertikale Knickfalte." + ], + "writingMaterialString": "Notenpapier, 18 Systeme, Format: hoch 347 × 266 mm, Firmenzeichen: [J.E. & Co.] | No. 5 | 18 linig. unten links auf Bl. 1v.", + "writingInstruments": { + "main": "Bleistift", + "secondary": [] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk29", + "itemLinkTo": "M_22_Sk29", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XX)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 400 Sk1", + "itemLinkTo": "Mstar_400_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 400)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3–4", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk1", + "itemLinkTo": "M_29_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "11–19", + "linkTo": "" + } + ], + [ + { + "system": "9a–10a", + "measure": "20–24", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk2", + "itemLinkTo": "M_29_Sk2", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11a–12a", + "measure": "x+1 bis x+3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk3", + "itemLinkTo": "M_29_Sk3", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11b–12b", + "measure": "{x+1A}, x+1B, x+2 bis x+5", + "linkTo": "" + } + ], + [ + { + "system": "13a", + "measure": "{x+6}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 415 Sk1", + "itemLinkTo": "Mstar_415_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 415)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18–17", + "measure": "{1A}, 1B, 2–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 416 Sk1", + "itemLinkTo": "Mstar_416_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 416)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–15", + "measure": "{1A}, 1B, 2–8, x+1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk28", + "itemLinkTo": "M_22_Sk28", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIX)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–13b", + "measure": "{1A–2A}, 1B–2B, 3–6", + "linkTo": "" + } + ], + [ + { + "system": "10b–9b", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 401 Sk1", + "itemLinkTo": "Mstar_401_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 401)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "3a–4a", + "measure": "12–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 401 Sk1.1", + "itemLinkTo": "Mstar_401_Sk1_1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 401)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "13–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 401 Sk1.2", + "itemLinkTo": "Mstar_401_Sk1_2", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 401)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "9–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 29 Sk4", + "itemLinkTo": "M_29_Sk4", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 29)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "9–10", + "measure": "11–18, {19A–20A}", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "{21A}, 19B–21B, 22, {23A}, 23B, 24–26", + "linkTo": "" + } + ], + [ + { + "system": "13–14", + "measure": "32, {33A–34A}, {33B(2–3/4)}, 33C, 34B", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_E", + "siglum": "E", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Bogen (Bl. 1/2): Der Bogen ist Bestandteil (Bl. 1/2) eines größeren Konvoluts aus 2 Bögen (Bl. 1/2, 3/4), 1 Blatt (Bl. 5) und 1 Bogen (Bl. 6/7). Horizontale und vertikale Knickfalte, seitlich leicht eingerissen." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 342 × 264 mm, Firmenzeichen: [J.E. & Co.] | No. 9 | 28 linig. unten links auf Bl. 11–2r.", + "writingInstruments": { + "main": "Bleistift", + "secondary": [] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 22 Sk31", + "itemLinkTo": "M_22_Sk31", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXI)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–7", + "linkTo": "" + } + ], + [ + { + "system": "3a–4a", + "measure": "8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk1", + "itemLinkTo": "M_23_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Thema)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–6", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "11–12, Liedtext", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk28.1", + "itemLinkTo": "M_22_Sk28_1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XIX)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "6–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk32", + "itemLinkTo": "M_22_Sk32", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–11", + "measure": "1A, 1B, 2–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk32.1", + "itemLinkTo": "M_22_Sk32_1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12a–13a", + "measure": "6, {7A–8A}, 7B–8B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk32.1.1", + "itemLinkTo": "M_22_Sk32_1_1", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12b–13b", + "measure": "7", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22 Sk33", + "itemLinkTo": "M_22_Sk33", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 22: Var. XXIII)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–15", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 417 Sk1", + "itemLinkTo": "Mstar_417_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 417)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16a–18a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 418 Sk1", + "itemLinkTo": "Mstar_418_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 418)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–18b", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 419 Sk1", + "itemLinkTo": "Mstar_419_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 419)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19a–21", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk2", + "itemLinkTo": "M_23_Sk2", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. I)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19b–20b", + "measure": "1–3", + "linkTo": "" + } + ], + [ + { + "system": "22–23", + "measure": "4–9", + "linkTo": "" + } + ], + [ + { + "system": "12c–13c", + "measure": "10–11", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 420 Sk1", + "itemLinkTo": "Mstar_420_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 420)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24a–25a", + "measure": "{1A}, 1B, 2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 421 Sk1", + "itemLinkTo": "Mstar_421_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 421)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24b–25b", + "measure": "{1A, 1B}, 1C, 2A, {1D}", + "linkTo": "" + } + ], + [ + { + "system": "26a–27a", + "measure": "1E, 2B, 3–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 422 Sk1", + "itemLinkTo": "Mstar_422_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 422)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "26b–27b", + "measure": "{1A–2A, 1B}, 1C, 2B, 3–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk1", + "itemLinkTo": "M_24_Sk1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Thema)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 433 Sk1", + "itemLinkTo": "Mstar_433_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 433)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 434 Sk1", + "itemLinkTo": "Mstar_434_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 434)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3a–4b", + "measure": "1–3, {4A}, 4B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 434 Sk1.1", + "itemLinkTo": "Mstar_434_Sk1_1", + "itemDescription": "(Skizze zu Studienkomposition M* 434)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "{3–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 435 Sk1", + "itemLinkTo": "Mstar_435_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 435)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 436 Sk1", + "itemLinkTo": "Mstar_436_Sk1", + "itemDescription": "(Skizze zu Palmsonntag-Tractus M* 436)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [] + ] + } + ] + }, + { + "item": "M* 437 Sk1", + "itemLinkTo": "Mstar_437_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 437)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6b", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk2", + "itemLinkTo": "M_24_Sk2", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. I)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "{1A, 1B}, 1C, 2–6", + "linkTo": "" + } + ], + [ + { + "system": "9a–10a", + "measure": "7–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk2.1", + "itemLinkTo": "M_24_Sk2_1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. I)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "9b–10b", + "measure": "2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk3", + "itemLinkTo": "M_24_Sk3", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11–12", + "measure": "1–3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk4", + "itemLinkTo": "M_24_Sk4", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "13a–14a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk5", + "itemLinkTo": "M_24_Sk5", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15a–16", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk6", + "itemLinkTo": "M_24_Sk6", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12b–13b", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk7", + "itemLinkTo": "M_24_Sk7", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–15b", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk8", + "itemLinkTo": "M_24_Sk8", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. II)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17–18", + "measure": "{1A–4A}, 1B–4B, 5–11, {12A}", + "linkTo": "" + } + ], + [ + { + "system": "19a–20a", + "measure": "12B, 13–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk9", + "itemLinkTo": "M_24_Sk9", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19b–20b", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk10", + "itemLinkTo": "M_24_Sk10", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. III)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21a–22a", + "measure": "1–5", + "linkTo": "" + } + ], + [ + { + "system": "19c–20c", + "measure": "6–8", + "linkTo": "" + } + ] + ] + }, + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "9–13", + "linkTo": "" + } + ], + [ + { + "system": "3–4", + "measure": "14–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 438 Sk1", + "itemLinkTo": "Mstar_438_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 438)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23a–24a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 439 Sk1", + "itemLinkTo": "Mstar_439_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 439)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21b–22b", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "23b–24b", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 440 Sk1", + "itemLinkTo": "Mstar_440_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 440)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23c–26e", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "25a–26a", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk1", + "itemLinkTo": "Mstar_441_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25b–26b", + "measure": "1–3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk2", + "itemLinkTo": "Mstar_441_Sk2", + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25c–26c", + "measure": "{1A–2A, 1B, 1C, 2B, 3}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk3", + "itemLinkTo": "Mstar_441_Sk3", + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25c–26c", + "measure": "{1A}", + "linkTo": "" + } + ], + [ + { + "system": "27a–28a", + "measure": "{1B, 2–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk4", + "itemLinkTo": "Mstar_441_Sk4", + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "27b–28b", + "measure": "{1A, 1B, 1C, 1D}, 1E, 2–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk11", + "itemLinkTo": "M_24_Sk11", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "{1–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 441 Sk4.1", + "itemLinkTo": "Mstar_441_Sk4_1", + "itemDescription": "(Skizze zu Studienkomposition M* 441)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–4b", + "measure": "{3–4}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 442 Sk1", + "itemLinkTo": "Mstar_442_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 442)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "5–6", + "measure": "7A–8A, 7B–8B, 9, 7C–8C", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 443 Sk1", + "itemLinkTo": "Mstar_443_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 443)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7a–8a", + "measure": "1–3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12", + "itemLinkTo": "M_24_Sk12", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7b–10", + "measure": "1–2, {3A–4A}, 3B–4B, 5–6", + "linkTo": "" + } + ], + [ + { + "system": "12a–13a", + "measure": "7–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.1", + "itemLinkTo": "M_24_Sk12_1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12b–13b", + "measure": "1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.2", + "itemLinkTo": "M_24_Sk12_2", + "itemDescription": "(Skizze zu Studienkomposition M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12c", + "measure": "1(2–4/4)", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.3", + "itemLinkTo": "M_24_Sk12_3", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12d–13c", + "measure": "8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 444 Sk1", + "itemLinkTo": "Mstar_444_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 444)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15a–16a", + "measure": "{1–5}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk13", + "itemLinkTo": "M_24_Sk13", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: verworfene Var.)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15b–16b", + "measure": "1A–2A, 1B–2B, 3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 445 Sk1", + "itemLinkTo": "Mstar_445_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 445)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17–18", + "measure": "1–9", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk12.4", + "itemLinkTo": "M_24_Sk12_4", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. IV)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19a–20a", + "measure": "2–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 446 Sk1", + "itemLinkTo": "Mstar_446_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 446)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "19b–20b", + "measure": "1–7", + "linkTo": "" + } + ], + [ + { + "system": "21a–22a", + "measure": "8–10", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk14.1", + "itemLinkTo": "M_24_Sk14_1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. V)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21b–22b", + "measure": "5–6", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk14", + "itemLinkTo": "M_24_Sk14", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. V)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23–24", + "measure": "1–5, {6A}, 6B, 7–10", + "linkTo": "" + } + ], + [ + { + "system": "25a–26a", + "measure": "11–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 447 Sk1", + "itemLinkTo": "Mstar_447_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 447)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "25b–26b", + "measure": "1, {2–5}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 448 Sk1", + "itemLinkTo": "Mstar_448_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 448)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–6, {7A–8A, 7B–8B} 7C", + "linkTo": "" + } + ], + [ + { + "system": "3a–4", + "measure": "8C, 9A–10A, 9B–10B", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk15.1", + "itemLinkTo": "M_24_Sk15_1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VI)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b", + "measure": "5–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 449 Sk1", + "itemLinkTo": "Mstar_449_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 449)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "x+1 bis x+3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk15", + "itemLinkTo": "M_24_Sk15", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VI)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "1–8", + "linkTo": "" + } + ], + [ + { + "system": "7a–8a", + "measure": "9–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk2.1", + "itemLinkTo": "Mstar_450_Sk2_1", + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7b–8b", + "measure": "5–11", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk1", + "itemLinkTo": "Mstar_450_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "9a–10a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk2", + "itemLinkTo": "Mstar_450_Sk2", + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [] + }, + { + "item": "M 24 Sk16", + "itemLinkTo": "M_24_Sk16", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VI)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "11a–13a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 450 Sk2.2", + "itemLinkTo": "Mstar_450_Sk2_2", + "itemDescription": "(Skizze zu Studienkomposition M* 450)", + "folios": [] + }, + { + "item": "M* 451 Sk1", + "itemLinkTo": "Mstar_451_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 451)", + "folios": [] + }, + { + "item": "M* 451 Sk3", + "itemLinkTo": "Mstar_451_Sk3", + "itemDescription": "(Skizze zu Studienkomposition M* 451)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14b–15b", + "measure": "1–4, 5A", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 451 Sk2", + "itemLinkTo": "Mstar_451_Sk2", + "itemDescription": "(Skizze zu Studienkomposition M* 451)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–17", + "measure": "1–4, 5A, 5B, 6, 7A–8A, 7B–8B, 9, 7C–8C", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk17", + "itemLinkTo": "M_24_Sk17", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VII)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18–19", + "measure": "1–7", + "linkTo": "" + } + ], + [ + { + "system": "20a–21a", + "measure": "8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 24 Sk17.1", + "itemLinkTo": "M_24_Sk17_1", + "itemDescription": "(Skizze zu Studienkomposition für Streichquartett M 24: Var. VII)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "20b–21b", + "measure": "3–7", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 65 Sk1", + "itemLinkTo": "M_65_Sk1", + "itemDescription": "(Skizze zu „Hochsommernacht“ M 65)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "23–26", + "measure": "1–11", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_F", + "siglum": "F", + "siglumAddendum": "", + "type": "Tintenniederschrift.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "1 Blatt (Bl. 1), 1 Bogen (Bl. 2/3): Blatt und Bogen sind Bestandteil (Bl. 1, 2/3) eines größeren Konvolutes bestehend aus 1 Blatt (Bl. 1), 1 Bogen (Bl. 2/3) und 1 Blatt (Bl. 4). Horizontale Knickfalte auf Blatt und Bogen. Kleiner Stockfleck oben rechts auf Blatt und Bogen. Ecke unten rechts von Bl. 1 abgerissen. Bogen unten in der Falte eingerissen." + ], + "writingMaterialString": "Notenpapier, 28 Systeme, Format: hoch 343 × 264 mm, Firmenzeichen ### unten links auf Bl. 1r–3r.", + "writingInstruments": { + "main": "schwarze Tinte", + "secondary": [ + "Bleistift" + ] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M* 409", + "itemLinkTo": "Mstar_409", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 409 Textfassung 1)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "2–3", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "5a–6a", + "measure": "12–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 409", + "itemLinkTo": "Mstar_409", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 409 Textfassung 2)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5b–6b", + "measure": "2–4", + "linkTo": "" + } + ], + [ + { + "system": "5c–6c", + "measure": "6–8/14–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 410", + "itemLinkTo": "Mstar_410", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 410)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8–9", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "10–11b", + "measure": "11B", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "12–16", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 22", + "itemLinkTo": "M_22", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 22)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–15", + "measure": "1–8 (Thema)", + "linkTo": "" + } + ], + [ + { + "system": "23–24", + "measure": "1–6 (Var. I)", + "linkTo": "" + } + ], + [ + { + "system": "25–26", + "measure": "7–8 (Var. I)", + "linkTo": "" + } + ], + [ + { + "system": "27–28", + "measure": "1–8 (Var. II)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–6 (Var. III)", + "linkTo": "" + } + ], + [ + { + "system": "3–4", + "measure": "1–4 (Var. IV)", + "linkTo": "" + } + ], + [ + { + "system": "5–6", + "measure": "1–8 (Var. V)", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "1–4 (Var. VI)", + "linkTo": "" + } + ], + [ + { + "system": "9–10", + "measure": "7–8 (Var. III)", + "linkTo": "" + } + ], + [ + { + "system": "12–13", + "measure": "1–7 (Var. VII)", + "linkTo": "" + } + ], + [ + { + "system": "14–15", + "measure": "8 (Var. VII)", + "linkTo": "" + } + ], + [ + { + "system": "17–18", + "measure": "1–6 (Var. VIII)", + "linkTo": "" + } + ], + [ + { + "system": "19–20", + "measure": "7–8 (Var. VIII)", + "linkTo": "" + } + ], + [ + { + "system": "22–23", + "measure": "1–8 (Var. IX)", + "linkTo": "" + } + ], + [ + { + "system": "24–25", + "measure": "1–6 (Var. X)", + "linkTo": "" + } + ], + [ + { + "system": "27–28", + "measure": "7–8 (Var. X)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–4 (Var. XI)", + "linkTo": "" + } + ], + [ + { + "system": "4–5", + "measure": "1–3 (Var. XII)", + "linkTo": "" + } + ], + [ + { + "system": "13–14", + "measure": "1–7 (Var. XIII)", + "linkTo": "" + } + ], + [ + { + "system": "16a–17a", + "measure": "8 (Var. XIII)", + "linkTo": "" + } + ], + [ + { + "system": "16b–17b", + "measure": "1–4 (Var. XIV)", + "linkTo": "" + } + ], + [ + { + "system": "19–20", + "measure": "1–8 (Var. XV)", + "linkTo": "" + } + ], + [ + { + "system": "22–23", + "measure": "1–8 (Var. XVI)", + "linkTo": "" + } + ], + [ + { + "system": "25–26", + "measure": "1–6 (Var. XVII)", + "linkTo": "" + } + ], + [ + { + "system": "27–28", + "measure": "7–8 (Var. XVII)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "2–3", + "measure": "1–8 (Var. XVIII)", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "1–8 (Var. XIX)", + "linkTo": "" + } + ], + [ + { + "system": "8b–9b", + "measure": "7B–8B (Var. XIX)", + "linkTo": "" + } + ], + [ + { + "system": "14–15", + "measure": "1–8 (Var. XX)", + "linkTo": "" + } + ], + [ + { + "system": "17–20", + "measure": "1–6 (Var. XXI)", + "linkTo": "" + } + ], + [ + { + "system": "22–25", + "measure": "7–8 (Var. XXI)", + "linkTo": "" + } + ] + ] + }, + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–4", + "measure": "1–8 (Var. XXII)", + "linkTo": "" + } + ], + [ + { + "system": "11–12", + "measure": "1–8 (Var. XXIII)", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 412", + "itemLinkTo": "Mstar_412", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 412)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "17–18", + "measure": "1–11", + "linkTo": "" + } + ], + [ + { + "system": "20–21", + "measure": "20–21", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 413", + "itemLinkTo": "Mstar_413", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 413)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "7–8", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 414", + "itemLinkTo": "Mstar_414", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 414)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–11", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 415", + "itemLinkTo": "Mstar_415", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 415)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5–6", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 416", + "itemLinkTo": "Mstar_416", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M* 416)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8a–9a", + "measure": "1–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23", + "itemLinkTo": "M_23", + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 23: Thema)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "6–7", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "8–9", + "measure": "11–12", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 420", + "itemLinkTo": "Mstar_420", + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 420)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16a–18a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 421", + "itemLinkTo": "Mstar_421", + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 421)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–18b", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 422", + "itemLinkTo": "Mstar_422", + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 422)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "20–22", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 423", + "itemLinkTo": "Mstar_423", + "itemDescription": "(Tintenniederschrift von Studienkomposition M* 423)", + "folios": [ + { + "folio": "3r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "21c–26", + "measure": "1–5", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 424 Sk1", + "itemLinkTo": "Mstar_424_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 424)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1a–2a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 425 Sk1", + "itemLinkTo": "Mstar_425_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 425)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1b–2b", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 426 Sk1", + "itemLinkTo": "Mstar_426_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 426)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1c–2c", + "measure": "1, 2A", + "linkTo": "" + } + ], + [ + { + "system": "3a–4a", + "measure": "2B, 2C, 3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 427 Sk1", + "itemLinkTo": "Mstar_427_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 427)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3b–5", + "measure": "1–2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 428 Sk1", + "itemLinkTo": "Mstar_428_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 428)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "3c–4c", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk3", + "itemLinkTo": "M_23_Sk3", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. II)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "6–7", + "measure": "1–6", + "linkTo": "" + } + ], + [ + { + "system": "8–9", + "measure": "7–9", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk4", + "itemLinkTo": "M_23_Sk4", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. III)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10–11", + "measure": "{1A}, 1B, 2, {3A}, 3B, 4–5", + "linkTo": "" + } + ], + [ + { + "system": "12–13", + "measure": "6–8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk5", + "itemLinkTo": "M_23_Sk5", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: Var. IV)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "14–15", + "measure": "1–6, {7A}, 7B", + "linkTo": "" + } + ], + [ + { + "system": "16a–17a", + "measure": "8", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 429 Sk1", + "itemLinkTo": "Mstar_429_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 429)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16b–17b", + "measure": "{1A–2A}, 1B–2B, 3", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk6", + "itemLinkTo": "M_23_Sk6", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18a–19a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk7", + "itemLinkTo": "M_23_Sk7", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18b–19b", + "measure": "x+1 bis x+2", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk8", + "itemLinkTo": "M_23_Sk8", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "18c", + "measure": "x+1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 430 Sk1", + "itemLinkTo": "Mstar_430_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 430)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "20–21", + "measure": "1–10", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 23 Sk9", + "itemLinkTo": "M_23_Sk9", + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 23: verworfene Var.)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22a–23a", + "measure": "1–4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 431 Sk2", + "itemLinkTo": "Mstar_431_Sk2", + "itemDescription": "(Skizze zu Studienkomposition M* 431)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "22b–23b (Tinte)", + "measure": "{1–3}", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 431 Sk1", + "itemLinkTo": "Mstar_431_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 431)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "24a–26a (Tinte)", + "measure": "{1A–3A}, 1B–3B, 4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 432 Sk1", + "itemLinkTo": "Mstar_432_Sk1", + "itemDescription": "(Skizze zu Studienkomposition M* 432)", + "folios": [ + { + "folio": "3v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12c–13c (Tinte)", + "measure": "{1A–2A, 1B–2B}, 1C", + "linkTo": "" + } + ], + [ + { + "system": "14b–15b", + "measure": "3–6", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + } + ] +} \ No newline at end of file diff --git a/src/assets/data/edition/series/2/section/2a/m22/source-list.json b/src/assets/data/edition/series/2/section/2a/m22/source-list.json index 9a22ecade8..f35b8f6aee 100644 --- a/src/assets/data/edition/series/2/section/2a/m22/source-list.json +++ b/src/assets/data/edition/series/2/section/2a/m22/source-list.json @@ -5,42 +5,42 @@ "type": "Skizzen zu
    Studienkomposition für Klavier / Streichquartett M 22.
    Enthält auch Skizzen zu Studienkomposition für Klavier M* 411–412 sowie Tintenniederschrift von Studienkomposition für Streichquartett M* 408.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceA" + "linkTo": "source_A" }, { "siglum": "B", "type": "Skizzen zu
    Studienkomposition für Klavier / Streichquartett M 22.
    Enthält auch Skizzen zu Studienkomposition für Klavier M 32 Textfassung 3 und M* 413–414 sowie Tintenniederschrift von Studienkomposition für Klavier M 32 Textfassung 2.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceB" + "linkTo": "source_B" }, { "siglum": "C", "type": "Skizzen zu
    Studienkomposition für Klavier / Streichquartett M 22.
    Enthält auch Skizzen zu Studienkomposition für Klavier M* 408.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceC" + "linkTo": "source_C" }, { "siglum": "D", "type": "Skizzen zu
    Studienkomposition für Klavier / Streichquartett M 22.
    Enthält auch Skizzen zu Studienkomposition für Klavier M 29 und M* 400–401, M* 415–416.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceD" + "linkTo": "source_D" }, { "siglum": "E", - "type": "Skizzen zu
    Studienkomposition für Klavier / Streichquartett M 22.
    Enthält auch Skizzen zu Studienkomposition für Klavier M 23 Textfassung 2, M 24 und M* 417–422, M* 433–451.", + "type": "Skizzen zu
    Studienkomposition für Klavier / Streichquartett M 22.
    Enthält auch Skizzen zu Studienkomposition für Klavier M 23 Textfassung 2, M 24, M* 417–422, M* 433–45 und zu Hochsommernacht M 65.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceE" + "linkTo": "source_E" }, { "siglum": "F", "type": "Tintenniederschrift von
    Studienkomposition für Klavier / Streichquartett M 22.
    Enthält auch Tintenniederschrift von Studienkomposition für Klavier M 23 Textfassung 1 und M* 409–410, M* 412–416, M* 420–422 sowie Skizzen zu Studienkomposition für Klavier M 23 Textfassung 2 und Studienkomposition M* 423–432.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceF" + "linkTo": "source_F" } ] } diff --git a/src/assets/data/edition/series/2/section/2a/m22/svg-sheets.json b/src/assets/data/edition/series/2/section/2a/m22/svg-sheets.json index a49fea0e41..447018c48e 100644 --- a/src/assets/data/edition/series/2/section/2a/m22/svg-sheets.json +++ b/src/assets/data/edition/series/2/section/2a/m22/svg-sheets.json @@ -1,7 +1,86 @@ { "sheets": { "workEditions": [], - "textEditions": [], + "textEditions": [ + { + "id": "M_22_TF1", + "label": "M 22 einzige Textfassung", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-1von12-final.svg", + "image": "", + "partial": "a", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-2von12-final.svg", + "image": "", + "partial": "b", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-3von12-final.svg", + "image": "", + "partial": "c", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-4von12-final.svg", + "image": "", + "partial": "d", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-5von12-final.svg", + "image": "", + "partial": "e", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-6von12-final.svg", + "image": "", + "partial": "f", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-7von12-final.svg", + "image": "", + "partial": "g", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-8von12-final.svg", + "image": "", + "partial": "h", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-9von12-final.svg", + "image": "", + "partial": "i", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-10von12-final.svg", + "image": "", + "partial": "j", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-11von12-final.svg", + "image": "", + "partial": "k", + "convolute": "F" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-12von12-final.svg", + "image": "", + "partial": "l", + "convolute": "F" + } + ] + } + ], "sketchEditions": [ { "id": "M_22_Sk1", diff --git a/src/assets/data/edition/series/2/section/2a/m22/textcritics.json b/src/assets/data/edition/series/2/section/2a/m22/textcritics.json index 76cd185340..403b1597f2 100644 --- a/src/assets/data/edition/series/2/section/2a/m22/textcritics.json +++ b/src/assets/data/edition/series/2/section/2a/m22/textcritics.json @@ -1,5 +1,139 @@ { "textcritics": [ + { + "id": "M_22_TF1", + "label": "M 22 einzige Textfassung", + "description": [], + "comments": [ + { + "svgGroupId": "", + "measure": "Var. X", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g1", + "measure": "8", + "system": "Klav.", + "position": "Taktende", + "comment": "Schlussstrich ergänzt. F: Einfacher Taktstrich." + }, + { + "svgGroupId": "", + "measure": "Var. XI", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g2", + "measure": "1", + "system": "Klav. o.", + "position": "1. Note", + "comment": "Gemeinsamer Notenkopf für Ober- und Unterstimmenschicht korrigiert zu zwei separate Notenköpfe." + }, + { + "svgGroupId": "g3", + "measure": "2", + "system": "Klav. o.", + "position": "1. Note", + "comment": "Gemeinsamer Notenkopf für Ober- und Unterstimmenschicht korrigiert zu zwei separate Notenköpfe." + }, + { + "svgGroupId": "", + "measure": "Var. XIII", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g4", + "measure": "6", + "system": "Klav. o.", + "position": "4/8", + "comment": "Viertelnote korrigiert zu Achtelnote mit Blick auf metrischen Kontext." + }, + { + "svgGroupId": "", + "measure": "Var. XVII", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g5", + "measure": "3", + "system": "Klav. o.", + "position": "1. Note", + "comment": "Oberstimmenschicht: Augmentationspunkt weggelassen mit Blick auf metrischen Kontext." + }, + { + "svgGroupId": "", + "measure": "Var. XIX", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g6", + "measure": "1", + "system": "Klav. u.", + "position": "1. Note", + "comment": "G korrigiert zu A mit Blick auf harmonischen Kontext." + }, + { + "svgGroupId": "g7", + "measure": "8", + "system": "Klav.", + "position": "Taktende", + "comment": "Schlussstrich ergänzt. F: Einfacher Taktstrich." + }, + { + "svgGroupId": "", + "measure": "Var. XX", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g8", + "measure": "3", + "system": "Klav. u.", + "position": "3/4", + "comment": "G1 korrigiert zu H1 mit Blick auf harmonischen Kontext." + }, + { + "svgGroupId": "", + "measure": "Var. XXI", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g3957", + "measure": "5", + "system": "2. Gg.", + "position": "letzte Note", + "comment": "Viertelnote korrigiert zu Achtelnote mit Blick auf metrischen Kontext." + }, + { + "svgGroupId": "", + "measure": "Var. XXII", + "system": "", + "position": "", + "comment": "" + }, + { + "svgGroupId": "g2199", + "measure": "8", + "system": "Vlc.", + "position": "1. Note", + "comment": "Augmentationspunkt weggelassen mit Blick auf metrischen Kontext." + } + ], + "linkBoxes": [] + }, { "id": "M_22_Sk1", "label": "M 22 Sk1", @@ -24,7 +158,7 @@ "measure": "7", "system": "22", "position": "1.–2. Note", - "comment": "Balkierung überschreibt Achtelfähnchen." + "comment": "Oberstimmenschicht: Balkierung überschreibt Achtelfähnchen." }, { "svgGroupId": "g354", @@ -138,6 +272,13 @@ "position": "12/16", "comment": "e gestrichen." }, + { + "svgGroupId": "g8", + "measure": "4", + "system": "26", + "position": "1. Pause", + "comment": "Punktierte Achtelpause überschreibt Viertelpause." + }, { "svgGroupId": "g554", "measure": "4", @@ -185,13 +326,13 @@ "measure": "6", "system": "26", "position": "2/4", - "comment": "Viertelnote f1 gestrichen." + "comment": "Unterstimmenschicht: Viertelnote f1 gestrichen." }, { "svgGroupId": "g980", "measure": "7", "system": "24", - "position": "5/8", + "position": "(5/8)", "comment": "Notenkopf gis1 radiert." } ] @@ -284,6 +425,13 @@ "system": "19", "position": "10/16", "comment": "fis überschreibt e1." + }, + { + "svgGroupId": "g4", + "measure": "8", + "system": "19", + "position": "(2/4)", + "comment": "Sechzehntelnoten {{ref.getGlyph('[#]')}}gis–e–a–gis überschreiben Achtelnoten gis–E." } ] }, @@ -425,14 +573,14 @@ "measure": "{1A–2A}", "system": "", "position": "", - "comment": "Takt pauschal gestrichen." + "comment": "Takte pauschal gestrichen." }, { "svgGroupId": "g1367", "measure": "{2A}", "system": "10", "position": "4/8", - "comment": "[#] zu a1 gestrichen." + "comment": "{{ref.getGlyph('[#]')}} zu a1 gestrichen." }, { "svgGroupId": "g1305", @@ -474,14 +622,14 @@ "measure": "6", "system": "7", "position": "3. Note", - "comment": "[#] zu g2 gestrichen." + "comment": "{{ref.getGlyph('[#]')}} zu g2 gestrichen." }, { "svgGroupId": "g1178", "measure": "6", "system": "7", "position": "4. Note", - "comment": "[#] zu f2 gestrichen." + "comment": "{{ref.getGlyph('[#]')}} zu f2 gestrichen." }, { "svgGroupId": "g1191", @@ -606,7 +754,7 @@ "measure": "6", "system": "5", "position": "6/8", - "comment": "h2 überschreibt a2." + "comment": "Oberstimmenschicht: h2 überschreibt a2." }, { "svgGroupId": "g1357", @@ -668,8 +816,8 @@ "svgGroupId": "g1419", "measure": "3", "system": "3", - "position": "5–6/8", - "comment": "d3–c3–h2 überschreibt c3–d3." + "position": "(3/4)", + "comment": "Triolenachtelnoten d3–c3–h2 überschreiben Achtelnoten c3–d3." }, { "svgGroupId": "g1570", @@ -873,7 +1021,7 @@ "svgGroupId": "g1255", "measure": "1", "system": "14", - "position": "4/16", + "position": "3/8", "comment": "A/a überschreibt c/c1." }, { @@ -909,7 +1057,7 @@ "measure": "5", "system": "14", "position": "1.–2. Note", - "comment": "E–e/e überschreibt Gis1/Gis–Gis/gis. " + "comment": "E–E/e überschreibt {{ref.getGlyph('[#]')}}Gis1/{{ref.getGlyph('[#]')}}Gis–Gis/[{{ref.getGlyph('[#]')}}]gis. " } ], "linkBoxes": [ @@ -931,7 +1079,7 @@ "svgGroupId": "g1143", "measure": "2", "system": "16", - "position": "16", + "position": "1. Note", "comment": "E überschreibt C." }, { @@ -946,7 +1094,7 @@ "measure": "7", "system": "13", "position": "2.–3. Note", - "comment": "a–f1 überschreibt d2–a1." + "comment": "Unterstimmenschicht: a1–f1 überschreibt d2–a1." } ], "linkBoxes": [ @@ -1043,8 +1191,8 @@ "svgGroupId": "g5", "measure": "{1A}", "system": "17–18", - "position": "(1/4)", - "comment": "Noten gestrichen." + "position": "", + "comment": "Takt pauschal gestrichen." }, { "svgGroupId": "g1084", @@ -1065,7 +1213,7 @@ "measure": "2", "system": "18", "position": "1–2/8", - "comment": "E–g überschreibt Gis–h." + "comment": "E–[{{ref.getGlyph('[#]')}}]gis überschreibt {{ref.getGlyph('[#]')}}Gis–h." }, { "svgGroupId": "g1115", @@ -1267,6 +1415,13 @@ "position": "2–3/4", "comment": "F/f–E/e überschreibt E/e–D/d." }, + { + "svgGroupId": "g970", + "measure": "7", + "system": "4", + "position": "1. Note", + "comment": "Viertelnote H/h gestrichen." + }, { "svgGroupId": "g9", "measure": "7", @@ -1275,18 +1430,18 @@ "comment": "A radiert." }, { - "svgGroupId": "g970", + "svgGroupId": "g978", "measure": "7", "system": "4", - "position": "1/4", - "comment": "Viertelnote H/h gestrichen." + "position": "3/8", + "comment": "f überschreibt e." }, { - "svgGroupId": "g978", + "svgGroupId": "g4", "measure": "7", "system": "4", - "position": "2/8", - "comment": "f überschreibt e." + "position": "3–4/8", + "comment": "sic: Zwei Achtelnoten statt zwei Viertelnoten." } ], "linkBoxes": [ @@ -1379,7 +1534,7 @@ "measure": "7", "system": "1", "position": "2. Note", - "comment": "Halbe Note E/gis/h/e1 gestrichen und ersetzt durch Tonbuchstaben über dem System: g[sic. lies: gis]/d/e." + "comment": "Halbe Note e/gis/h/e1 gestrichen und ersetzt durch Tonbuchstaben über dem System: g[sic. Lies: gis]/d/e." } ], "linkBoxes": [ @@ -1469,7 +1624,7 @@ "measure": "1", "system": "8", "position": "5/8", - "comment": "h überschreibt c2." + "comment": "h1 überschreibt c2." }, { "svgGroupId": "g1328", @@ -1510,7 +1665,7 @@ "svgGroupId": "g1111", "measure": "8", "system": "11", - "position": "6–7/8", + "position": "6–7/16", "comment": "e–f überschreibt d–e." } ], @@ -1701,7 +1856,7 @@ "measure": "5", "system": "14", "position": "1. Pause", - "comment": "Punktierte Achtelnote überschreibt Viertelnote a2/a3. Entzifferung von a3 jedoch unsicher und auch als e3 lesbar." + "comment": "Punktierte Achtelpause überschreibt Viertelnote a2/a3. Entzifferung von a3 jedoch unsicher und auch als e3 lesbar." }, { "svgGroupId": "g975", @@ -1715,7 +1870,7 @@ "measure": "7", "system": "9", "position": "(2/4)", - "comment": "c1/a überschreibt a/e." + "comment": "c1–a überschreibt a–e." }, { "svgGroupId": "g979", @@ -1852,13 +2007,13 @@ "measure": "8", "system": "2", "position": "1–3/4", - "comment": "Noten gestrichen." + "comment": "Oberstimmenschicht: Noten gestrichen." }, { "svgGroupId": "g5", "measure": "8", "system": "1", - "position": "(2/8)–6/8", + "position": "1.–3. Note", "comment": "Unterstimmenschicht: Noten gestrichen und um eine Oktave nach oben versetzt." } ] @@ -1951,7 +2106,7 @@ "measure": "4", "system": "11", "position": "1–2/8", - "comment": "Balkierung überschreibt Achtelfähnchen zu 1/8." + "comment": "Unterstimmenschicht: Balkierung überschreibt Achtelfähnchen zu 1/8." }, { "svgGroupId": "g1234", @@ -1965,7 +2120,7 @@ "measure": "5", "system": "11", "position": "1. Note", - "comment": "Unterstimmenschicht: Viertelnote überschreibt Halbe Note." + "comment": "Viertelnote überschreibt Halbe Note." }, { "svgGroupId": "g1279", @@ -2133,14 +2288,14 @@ "measure": "5
    bis 6", "system": "14", "position": "letzte Note
    1. Note", - "comment": "Unterstimmenschicht: f1 überschreibt g1 in T. 6; Ligatur zu g1 in T. gestrichen." + "comment": "Unterstimmenschicht: f1 ersetzt gestrichenes g1 in T. 6; Ligatur zu g1 in T. 5 gestrichen." }, { "svgGroupId": "g1229", "measure": "6", "system": "14", "position": "3/4", - "comment": "Mittelstimmenschicht: f2 überschreibt h1." + "comment": "Mittelstimmenschicht: f2 überschreibt {{ref.getGlyph('[a]')}}h1." }, { "svgGroupId": "g1290", @@ -2175,7 +2330,7 @@ "measure": "8", "system": "14", "position": "3/4", - "comment": "Oberstimmenschicht: Viertelnote c2 überschreibt Halbe Note e2." + "comment": "Mittelstimmenschicht: Viertelnote c2 überschreibt Halbe Note e2." } ] } diff --git a/src/assets/data/edition/series/2/section/2a/m35_42/textcritics.json b/src/assets/data/edition/series/2/section/2a/m35_42/textcritics.json index ce0002d4c5..8243b3dbdc 100644 --- a/src/assets/data/edition/series/2/section/2a/m35_42/textcritics.json +++ b/src/assets/data/edition/series/2/section/2a/m35_42/textcritics.json @@ -4,7 +4,7 @@ "id": "M_35_42_TF1", "label": "M 35/42 einzige Textfassung", "description": [ - "##Quellenbewertung:## Die Tintenniederschrift in D stellt die Fortsetzung (T. 10f.) der früher entstandenen Niederschrift in C dar und komplettiert mit dem kontrastierenden B-Teil sowie dem wiederkehrenden A-Teil das in C vorgestellte Thema zur dreiteiligen ABAʼ-Form. Maßgebend für die hier vorgelegte Textedition ist die autographe Niederschrift mit Tinte inklusive Korrekturschicht 1 (Tinte). Die vermutlich später erfolgte Korrekturschicht 2 (Bleistift), inklusive der partiell mit Tinte verfassten Sk2 zu M 35/42, wurde nicht berücksichtigt.
    Für die Textedition der Studienkomposition für Klavier M 35/42 sind C und D gleichermaßen Hauptquelle." + "##Quellenbewertung:## Für die Textedition der Studienkomposition für Klavier M 35/42 sind C und D relevante Quellen. A und B enthalten Skizzen.
    C weist zwei unterscheidbare Korrekturschichten auf: Korrekturen 1 mit Tinte sowie die später entstandenen Korrekturen 2 mit Bleistift. D weist eine Korrekturschicht mit Tinte auf. Der Zustand vor Korrekturen 1 ist nicht immer zu entziffern. Die Tintenniederschrift in D stellt die Fortsetzung (ab T. 10) der früher entstandenen Tintenniederschrift in C dar und komplettiert mit dem kontrastierenden B-Teil sowie dem wiederkehrenden A-Teil das in C vorgestellte Thema zur dreiteiligen ABAʼ-Form.
    Hauptquellen für die Textedition der Studienkomposition für Klavier M 35/42 sind C und D nach Korrekturen 1." ], "comments": [ { diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk1-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk1-1von1-final.svg index c9d9a4e99f..deeec08159 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk1-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk1-1von1-final.svg @@ -7,15 +7,15 @@ - - - - - - - - - + + + + + + + + + @@ -24,20 +24,20 @@ - - - - + + + + - + - - - - - - + + + + + + @@ -46,21 +46,21 @@ - + - + - - + + - + - + - + @@ -84,13 +84,13 @@ - + - + @@ -98,17 +98,17 @@ - + - + - + - + @@ -141,31 +141,31 @@ - + - + - + - + - + - + - + - + @@ -174,13 +174,13 @@ - + - + - + @@ -202,10 +202,10 @@ - + - + @@ -222,80 +222,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -306,15 +306,15 @@ - + - + - + @@ -336,17 +336,17 @@ - + - + - + @@ -358,13 +358,13 @@ - + - + - + @@ -373,23 +373,23 @@ - + - + - + - + - + - + @@ -398,13 +398,13 @@ - + - + - + @@ -422,13 +422,13 @@ - + - + - + @@ -462,7 +462,7 @@ - + @@ -471,36 +471,36 @@ - + - + - + - + - + - + - + - + - + - + @@ -523,13 +523,13 @@ - + - + @@ -540,13 +540,13 @@ - + - + @@ -563,11 +563,11 @@ - - - + + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk10-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk10-1von1-final.svg index ad27a7f102..a3f373a2d0 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk10-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk10-1von1-final.svg @@ -7,11 +7,11 @@ - - - - - + + + + + @@ -20,18 +20,18 @@ - - - - + + + + - + - - - - - + + + + + @@ -40,13 +40,13 @@ - + - + - + - + @@ -69,7 +69,7 @@ - + @@ -82,20 +82,20 @@ - + - + - + - + @@ -104,46 +104,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -151,21 +151,21 @@ - + - + - + - + @@ -179,7 +179,7 @@ - + @@ -195,12 +195,12 @@ - + - + @@ -211,11 +211,11 @@ - + - + @@ -238,25 +238,25 @@ - + - + - + - + - + - + - + @@ -272,12 +272,12 @@ - - + + - + @@ -314,7 +314,7 @@ - + @@ -328,14 +328,15 @@ - style="fill:none;stroke:#777;stroke-width:.849533"/> + + style="fill:none;stroke:#777;stroke-width:.849533"/> - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk11-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk11-1von1-final.svg index 0c45ff1c72..c97265658c 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk11-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk11-1von1-final.svg @@ -7,12 +7,12 @@ - - - - - - + + + + + + @@ -20,15 +20,15 @@ - - + + - + - + - + @@ -36,25 +36,25 @@ - + - + - - + + - - - + + + - + - + - + @@ -112,10 +112,10 @@ - + - + @@ -126,25 +126,25 @@ - + - + - + - + - + - + @@ -156,21 +156,21 @@ - + - + - + - + @@ -189,47 +189,47 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -237,20 +237,20 @@ - + - + - + - + @@ -258,21 +258,21 @@ - + - + - + - + @@ -280,19 +280,19 @@ - + - + - + - + @@ -307,42 +307,42 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -350,17 +350,17 @@ - + - + - + @@ -373,13 +373,13 @@ - + - + @@ -387,16 +387,16 @@ - + - + - + @@ -422,10 +422,10 @@ - + - + @@ -449,10 +449,10 @@ - + - + @@ -475,23 +475,23 @@ - + - + - + - + - + @@ -501,7 +501,7 @@ - + @@ -509,21 +509,21 @@ - + - + - + - + @@ -531,40 +531,40 @@ - + - + - + - + - + - + - + - + - + @@ -574,7 +574,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -603,18 +603,18 @@ - + - + - + - + @@ -625,10 +625,10 @@ - + - + @@ -644,23 +644,23 @@ - + - + - + - + @@ -670,11 +670,11 @@ - + - + @@ -686,10 +686,10 @@ - + - + @@ -706,10 +706,10 @@ - + - + @@ -726,17 +726,17 @@ - + - + - + - + @@ -748,7 +748,7 @@ - + @@ -758,7 +758,7 @@ - + @@ -781,37 +781,37 @@ - - + + - + - - + + - + - + - + - + - + - + @@ -827,8 +827,8 @@ - - + + @@ -836,36 +836,36 @@ - + - + - + - + - + - + - + - + @@ -875,11 +875,11 @@ - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk12-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk12-1von1-final.svg index 5eeeea24b5..62aba59b9c 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk12-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk12-1von1-final.svg @@ -7,17 +7,17 @@ - - - - - - + + + + + + - - - - + + + + @@ -25,14 +25,14 @@ - - + + - + - + @@ -40,18 +40,18 @@ - + - + - - + + - + - + @@ -81,10 +81,10 @@ - + - + @@ -124,26 +124,26 @@ - + - + - + - + - + - + @@ -159,13 +159,13 @@ - + - + @@ -176,10 +176,10 @@ - + - + @@ -213,7 +213,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -254,13 +254,13 @@ - + - + - + @@ -272,25 +272,25 @@ - + - + - + - + - + - + @@ -306,7 +306,7 @@ - + @@ -314,7 +314,7 @@ - + @@ -326,10 +326,10 @@ - + - + @@ -339,24 +339,24 @@ - + - + - + - + - + @@ -364,13 +364,13 @@ - + - + @@ -388,34 +388,34 @@ - + - + - + - + - + - + - + - + @@ -454,73 +454,73 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -536,7 +536,7 @@ - + @@ -545,14 +545,14 @@ - + - + @@ -571,27 +571,27 @@ - + - + - + - + - + - + @@ -609,10 +609,10 @@ - + - + @@ -625,24 +625,24 @@ - + - + - + - + - + @@ -656,12 +656,12 @@ - + - + @@ -671,24 +671,24 @@ - + - + - + - + - + @@ -711,7 +711,7 @@ - + @@ -724,7 +724,7 @@ - + @@ -740,7 +740,7 @@ - + @@ -752,19 +752,19 @@ - + - + - + - + @@ -772,14 +772,14 @@ - + - + @@ -794,11 +794,11 @@ - + - + @@ -840,7 +840,7 @@ - + @@ -848,20 +848,20 @@ - + - + - + - + - + @@ -877,16 +877,16 @@ - + - + - + @@ -902,32 +902,32 @@ - - - + + + - - + + - + - + - + - + - + @@ -986,23 +986,23 @@ - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk13-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk13-1von1-final.svg index f0b6611b01..136b41e887 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk13-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk13-1von1-final.svg @@ -7,11 +7,11 @@ - - - - - + + + + + @@ -20,18 +20,18 @@ - - - - + + + + - - - - - + + + + + @@ -40,21 +40,21 @@ - + - + - - + + - + - + - + @@ -82,15 +82,15 @@ - + - + - + @@ -111,10 +111,10 @@ - + - + @@ -125,11 +125,11 @@ - + - + @@ -146,12 +146,12 @@ - + - + @@ -169,11 +169,11 @@ - + - + @@ -188,7 +188,7 @@ - + @@ -197,21 +197,21 @@ - + - + - + @@ -223,7 +223,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -301,14 +301,14 @@ - + - + - + @@ -316,18 +316,18 @@ - + - + - + - + @@ -335,9 +335,9 @@ - + - + @@ -363,7 +363,7 @@ - + @@ -375,9 +375,9 @@ - + - + @@ -386,11 +386,11 @@ - - + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk14-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk14-1von1-final.svg index 953f601e1b..d3de988be8 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk14-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk14-1von1-final.svg @@ -7,9 +7,9 @@ - - - + + + @@ -18,20 +18,20 @@ - - - - + + + + - + - - - - - - + + + + + + @@ -40,17 +40,17 @@ - + - + - + - + @@ -69,13 +69,13 @@ - + - + - + @@ -93,13 +93,13 @@ - + - + - + @@ -109,10 +109,10 @@ - + - + @@ -128,10 +128,10 @@ - + - + @@ -152,29 +152,29 @@ - + - + - + - + - + - + @@ -187,26 +187,26 @@ - + - + - + - + - + - + @@ -228,11 +228,11 @@ - + - + - + @@ -249,19 +249,19 @@ - + - + - + - + @@ -272,8 +272,8 @@ - - + + @@ -305,7 +305,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk15-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk15-1von1-final.svg index d8a0675a6e..6b0666b496 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk15-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk15-1von1-final.svg @@ -7,11 +7,11 @@ - - - - - + + + + + @@ -20,18 +20,18 @@ - - + + - + - - - - - - + + + + + + @@ -40,21 +40,21 @@ - + - + - - - - + + + + - + - + @@ -76,26 +76,26 @@ - + - + - + - + - + - + @@ -105,11 +105,11 @@ - + - + @@ -130,10 +130,10 @@ - + - + @@ -153,17 +153,17 @@ - + - + - + - + @@ -176,29 +176,29 @@ - + - + - + - + - + - + @@ -208,10 +208,10 @@ - + - + @@ -224,10 +224,10 @@ - + - + @@ -253,57 +253,57 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -316,16 +316,16 @@ - + - + - + @@ -336,29 +336,29 @@ - + - + - + - + - + - + @@ -394,7 +394,7 @@ - + @@ -418,29 +418,29 @@ - + - + - + - + - + - + @@ -454,10 +454,10 @@ - + - + @@ -465,35 +465,35 @@ - + - + - + - + - + - + - + - + @@ -527,20 +527,20 @@ - + - + - + - + @@ -551,20 +551,20 @@ - - + + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk16-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk16-1von1-final.svg index eab1236815..83395b8f26 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk16-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk16-1von1-final.svg @@ -7,12 +7,12 @@ - - - - - - + + + + + + @@ -21,18 +21,18 @@ - + - + - + - + - - - + + + @@ -40,21 +40,21 @@ - + - + - - - - + + + + - + - + @@ -76,28 +76,28 @@ - + - + - + - + - + - + @@ -110,7 +110,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -137,20 +137,20 @@ - + - + - + - + - + @@ -166,15 +166,15 @@ - + - + - + @@ -183,16 +183,16 @@ - + - + - + @@ -200,7 +200,7 @@ - + @@ -209,11 +209,11 @@ - + - + @@ -223,14 +223,14 @@ - + - + - + @@ -240,14 +240,14 @@ - + - + - + @@ -255,7 +255,7 @@ - + @@ -268,12 +268,12 @@ - + - + @@ -288,20 +288,20 @@ - + - + - + - + @@ -309,12 +309,12 @@ - + - + @@ -322,12 +322,12 @@ - + - + @@ -335,17 +335,17 @@ - + - + - + @@ -363,18 +363,18 @@ - + - + - + - + @@ -385,18 +385,18 @@ - - + + - + - + @@ -405,11 +405,11 @@ - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk17-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk17-1von1-final.svg index 3c9c2eb49d..45e8ab67fd 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk17-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk17-1von1-final.svg @@ -7,15 +7,15 @@ - - - - + + + + - - - - + + + + @@ -24,19 +24,19 @@ - - - + + + - + - + - - - - - + + + + + @@ -44,21 +44,21 @@ - + - + - - + + - + - + - + @@ -83,10 +83,10 @@ - + - + @@ -96,7 +96,7 @@ - + @@ -116,23 +116,23 @@ - + - + - + - + - + @@ -149,10 +149,10 @@ - + - + @@ -165,7 +165,7 @@ - + @@ -202,61 +202,61 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -268,19 +268,19 @@ - + - + - + - + @@ -291,7 +291,7 @@ - + @@ -300,15 +300,15 @@ - + - + - + @@ -320,28 +320,28 @@ - + - + - + - + - + - + @@ -351,31 +351,31 @@ - + - + - + - + - + - + - + @@ -394,7 +394,7 @@ - + @@ -410,32 +410,32 @@ - + - + - + - + - + - + @@ -450,20 +450,20 @@ - + - + - + - + @@ -477,50 +477,50 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -537,10 +537,10 @@ - + - + @@ -561,17 +561,17 @@ - + - + - + - + @@ -587,7 +587,7 @@ - + @@ -596,24 +596,24 @@ - + - + - + - + @@ -624,8 +624,8 @@ - - + + @@ -637,7 +637,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -660,13 +660,13 @@ - + - + @@ -678,7 +678,7 @@ - + @@ -686,17 +686,17 @@ - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-1von2-final.svg index 01726b7a87..637e5e6488 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-1von2-final.svg @@ -7,12 +7,12 @@ - - - - - - + + + + + + @@ -20,11 +20,11 @@ - - + + - + @@ -32,19 +32,19 @@ - + - + - - + + - + - + @@ -66,13 +66,13 @@ - + - + @@ -85,53 +85,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -142,34 +142,34 @@ - + - + - + - + - + - + - + @@ -183,11 +183,11 @@ - + - + @@ -197,58 +197,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -256,7 +256,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -283,16 +283,16 @@ - + - + - + @@ -302,22 +302,22 @@ - + - + - + - + - + @@ -343,34 +343,34 @@ - + - + - + - + - + - + - + - + - + @@ -389,10 +389,10 @@ - + - + @@ -404,10 +404,10 @@ - + - + @@ -429,11 +429,11 @@ - + - + @@ -446,13 +446,13 @@ - + - + @@ -470,15 +470,15 @@ - + - + - + @@ -489,17 +489,17 @@ - - + + - + - + @@ -513,7 +513,7 @@ - + @@ -534,7 +534,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-2von2-final.svg index d2b8ba9ca4..2a6b1fc7e6 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk18-2von2-final.svg @@ -7,9 +7,9 @@ - - - + + + @@ -18,14 +18,14 @@ - - + + - + - - + + @@ -33,8 +33,8 @@ - - + + @@ -61,7 +61,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -86,24 +86,24 @@ - + - + - + - + @@ -131,7 +131,7 @@ - + @@ -142,26 +142,26 @@ - - + + - + - + - + @@ -172,7 +172,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk19-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk19-1von1-final.svg index 884d051e71..9e752ef771 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk19-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk19-1von1-final.svg @@ -7,10 +7,10 @@ - - + + - + @@ -19,18 +19,18 @@ - - - + + + - + - - - - + + + + @@ -39,19 +39,19 @@ - + - + - + - + - + @@ -70,7 +70,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -86,11 +86,11 @@ - + - + @@ -104,7 +104,7 @@ - + @@ -128,29 +128,29 @@ - + - + - + - + - + - + @@ -159,7 +159,7 @@ - + @@ -188,9 +188,9 @@ - + - + @@ -201,7 +201,7 @@ - + @@ -212,11 +212,11 @@ - - + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk2-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk2-1von1-final.svg index 0308957286..8333f4622a 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk2-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk2-1von1-final.svg @@ -10,16 +10,16 @@ - - - - - + + + + + - - - - + + + + @@ -27,15 +27,15 @@ - - + + - + - + - - + + @@ -43,18 +43,18 @@ - + - + - - + + - + - + @@ -82,7 +82,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -121,22 +121,22 @@ - + - + - + - + @@ -154,11 +154,11 @@ - + - + @@ -172,10 +172,10 @@ - + - + @@ -186,14 +186,14 @@ - + - + @@ -207,11 +207,11 @@ - + - + @@ -225,11 +225,11 @@ - + - + @@ -240,7 +240,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -258,12 +258,12 @@ - + - + @@ -271,11 +271,11 @@ - + - + @@ -285,7 +285,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -325,22 +325,22 @@ - + - + - + - + - + @@ -365,7 +365,7 @@ - + @@ -385,21 +385,21 @@ - + - + - + - + @@ -427,19 +427,19 @@ - + - + - + @@ -452,11 +452,11 @@ - + - + @@ -467,7 +467,7 @@ - + @@ -475,7 +475,7 @@ - + @@ -488,14 +488,14 @@ - + - + @@ -503,7 +503,7 @@ - + @@ -518,14 +518,14 @@ - + - + - + @@ -539,29 +539,29 @@ - + - + - + - + - + - + @@ -576,11 +576,11 @@ - + - + @@ -588,15 +588,15 @@ - + - + - + @@ -607,7 +607,7 @@ - + @@ -617,7 +617,7 @@ - + @@ -636,28 +636,28 @@ - + - + - + - + - + @@ -666,7 +666,7 @@ - + @@ -675,13 +675,13 @@ - + - + @@ -701,11 +701,11 @@ - - + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk20-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk20-1von1-final.svg index 9d1ab7ffa2..62ab7fb2dc 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk20-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk20-1von1-final.svg @@ -7,16 +7,16 @@ - - - - - + + + + + - - - + + + @@ -25,18 +25,18 @@ - - - + + + - + - + - - - - + + + + @@ -45,15 +45,15 @@ - + - - + + - - + + - + @@ -72,7 +72,7 @@ - + @@ -83,10 +83,10 @@ - + - + @@ -94,10 +94,10 @@ - + - + @@ -110,21 +110,21 @@ - + - + - + - + @@ -135,15 +135,15 @@ - + - + - + @@ -155,7 +155,7 @@ - + @@ -166,30 +166,30 @@ - + - + - + - + - + - + @@ -203,15 +203,15 @@ - + - + - + @@ -220,14 +220,14 @@ - + - + - + @@ -235,7 +235,7 @@ - + @@ -246,25 +246,25 @@ - + - + - + - + - + @@ -276,13 +276,13 @@ - + - + @@ -292,18 +292,18 @@ - + - + - + @@ -314,12 +314,12 @@ - - + + - - + + @@ -337,25 +337,9 @@ - - - - - - - - - - - - - - - - - + @@ -363,36 +347,25 @@ - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + - - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-1von3-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-1von3-final.svg index 4b7e6ebcfb..b540f01f28 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-1von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-1von3-final.svg @@ -7,11 +7,11 @@ - - + + - - + + @@ -19,15 +19,15 @@ - - + + - + - - - - + + + + @@ -35,12 +35,12 @@ - + - + - + @@ -57,14 +57,14 @@ - + - + @@ -75,27 +75,27 @@ - + - + - + - + - + - + @@ -106,35 +106,35 @@ - + - + - + - + - + - + - + - + @@ -152,62 +152,62 @@ - + - + - - + + - - + + - - + + - + - - - + + + - - + + - + - + - - + + - + - + - + - + - + @@ -215,13 +215,13 @@ - + - + - + @@ -233,7 +233,7 @@ - + @@ -242,27 +242,27 @@ - + - + - + - + - + @@ -275,13 +275,13 @@ - + - + @@ -289,7 +289,7 @@ - + @@ -300,11 +300,11 @@ - - + + - + @@ -322,7 +322,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -342,31 +342,38 @@ - - - + + + + + + + + + + - - + + - + - - - + + + - - + + - - - - - + + + + + - + @@ -379,44 +386,44 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-2von3-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-2von3-final.svg index f0719468a2..7090a98bb7 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-2von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-2von3-final.svg @@ -6,10 +6,10 @@ - - - - + + + + @@ -18,18 +18,18 @@ - - - + + + - + - - - - + + + + @@ -38,9 +38,9 @@ - - - + + + @@ -59,7 +59,7 @@ - + @@ -84,27 +84,27 @@ - + - + - + - + - + @@ -117,7 +117,7 @@ - + @@ -127,11 +127,11 @@ - + - + @@ -141,25 +141,25 @@ - + - + - + - - + + - + @@ -169,24 +169,24 @@ - - + + - + - + - + - + - + @@ -194,7 +194,7 @@ - + @@ -209,10 +209,10 @@ - + - + @@ -227,7 +227,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-3von3-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-3von3-final.svg index 6ce1b23a3d..4c4f8f853f 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-3von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk21-3von3-final.svg @@ -6,10 +6,10 @@ - - - - + + + + @@ -18,18 +18,18 @@ - - - + + + - + - + - - - + + + @@ -38,17 +38,17 @@ - - + + - + - + - + @@ -65,7 +65,7 @@ - + @@ -75,10 +75,10 @@ - + - + @@ -97,19 +97,19 @@ - + - + - + @@ -117,17 +117,17 @@ - + - + - + - + @@ -135,7 +135,7 @@ - + @@ -147,14 +147,14 @@ - + - + @@ -172,13 +172,13 @@ - - + + - + @@ -189,11 +189,11 @@ - - + + - + @@ -203,6 +203,6 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-1von3-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-1von3-final.svg index d42640f592..13499f659f 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-1von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-1von3-final.svg @@ -7,13 +7,13 @@ - - - - + + + + - - + + @@ -21,15 +21,15 @@ - - + + - + - + - - + + @@ -39,12 +39,12 @@ - + - + - - + + @@ -74,24 +74,24 @@ - + - + - + - + - + @@ -100,7 +100,7 @@ - + @@ -108,31 +108,31 @@ - + - + - + - + - + - + @@ -146,33 +146,33 @@ - + - + - + - + - + - + - + @@ -180,11 +180,11 @@ - + - + @@ -194,11 +194,11 @@ - + - + @@ -207,7 +207,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -226,17 +226,17 @@ - + - + - + @@ -246,38 +246,38 @@ - + - + - + - + - + - + - + @@ -287,62 +287,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -355,7 +355,7 @@ - + @@ -371,7 +371,7 @@ - + @@ -384,7 +384,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -443,7 +443,7 @@ - + @@ -453,7 +453,7 @@ - + @@ -462,15 +462,15 @@ - + - + - + @@ -481,7 +481,7 @@ - + @@ -494,13 +494,13 @@ - + - + - + @@ -516,7 +516,7 @@ - + @@ -547,12 +547,12 @@ - - + + - - + + @@ -561,16 +561,16 @@ - + - + - + @@ -578,7 +578,7 @@ - + @@ -596,7 +596,7 @@ - + @@ -615,13 +615,13 @@ - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-2von3-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-2von3-final.svg index f7fd740087..b31dbebd3f 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-2von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-2von3-final.svg @@ -7,10 +7,10 @@ - - + + - + @@ -18,14 +18,14 @@ - + - - - - - + + + + + @@ -35,11 +35,11 @@ - - + + - - + + @@ -56,15 +56,15 @@ - + - + - + @@ -75,30 +75,30 @@ - + - + - + - + - + @@ -106,20 +106,20 @@ - + - + - + - + @@ -138,7 +138,7 @@ - + @@ -146,27 +146,27 @@ - + - + - + - + - + @@ -184,7 +184,7 @@ - + @@ -192,22 +192,22 @@ - + - + - + - + @@ -216,27 +216,27 @@ - - + + - - + + - + - + - + - + @@ -254,7 +254,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-3von3-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-3von3-final.svg index 1be4db455e..fa6aa68a7d 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-3von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk22-3von3-final.svg @@ -7,11 +7,11 @@ - - + + - - + + @@ -19,13 +19,13 @@ - - + + - - - - + + + + @@ -33,9 +33,9 @@ - + - + @@ -55,7 +55,7 @@ - + @@ -74,32 +74,32 @@ - + - + - + - + - + - + @@ -118,43 +118,43 @@ - + - + - + - + - + - + - + - + @@ -164,17 +164,17 @@ - + - + - + @@ -185,7 +185,7 @@ - + @@ -195,22 +195,22 @@ - + - + - + - + @@ -219,22 +219,22 @@ - - - + + + - - + + - + - + - + @@ -252,7 +252,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-1von4-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-1von4-final.svg index 80554337d9..cd5cf1f82e 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-1von4-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-1von4-final.svg @@ -11,12 +11,12 @@ - - - - - - + + + + + + @@ -25,20 +25,20 @@ - - - - + + + + - + - - - - - - + + + + + + @@ -47,9 +47,9 @@ - + - + @@ -92,19 +92,19 @@ - + - + - + - + - + @@ -114,24 +114,24 @@ - + - + - + - + @@ -149,10 +149,10 @@ - + - + @@ -166,15 +166,15 @@ - + - + - + @@ -187,7 +187,7 @@ - + @@ -206,25 +206,24 @@ - + - + - - - - - - - - + + + + + + + T. 7 - + @@ -235,17 +234,17 @@ - - + + - - + + - + @@ -256,7 +255,7 @@ - + @@ -264,7 +263,7 @@ - + @@ -274,7 +273,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-2von4-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-2von4-final.svg index fdd010e180..4fa53d47ed 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-2von4-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-2von4-final.svg @@ -12,11 +12,11 @@ - - - - - + + + + + @@ -24,14 +24,14 @@ - - + + - - - + + + @@ -39,10 +39,10 @@ - + - - + + @@ -57,12 +57,12 @@ - + - + @@ -82,64 +82,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -153,20 +153,20 @@ - + - - - + + + - + - + @@ -182,14 +182,14 @@ - + - + @@ -197,7 +197,7 @@ - + @@ -222,25 +222,25 @@ - + - + - + - + - + @@ -250,7 +250,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-3von4-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-3von4-final.svg index 8655c5974a..ea56b01542 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-3von4-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-3von4-final.svg @@ -12,10 +12,10 @@ - - - - + + + + @@ -24,17 +24,17 @@ - - - + + + - - - - - - + + + + + + @@ -42,10 +42,10 @@ - - + + - + @@ -60,38 +60,38 @@ - + - + - + - + - + - + - + - + - + @@ -111,36 +111,36 @@ - + - + - + - + - + - + - + - + @@ -151,14 +151,14 @@ - + - + - + @@ -169,17 +169,17 @@ - - + + - - + + - + - + @@ -209,11 +209,11 @@ - - + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-4von4-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-4von4-final.svg index 80ac1fe8a1..73bab86bd4 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-4von4-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk23-4von4-final.svg @@ -11,11 +11,11 @@ - - + + - - + + @@ -24,20 +24,20 @@ - - - - + + + + - + - - - - - - + + + + + + @@ -47,7 +47,7 @@ - + @@ -72,14 +72,14 @@ - + - + - + @@ -90,24 +90,15 @@ - + - - - - - - - - - - + @@ -118,8 +109,8 @@ - - + + @@ -140,14 +131,14 @@ - + - + - + @@ -158,12 +149,12 @@ - - + + - - + + @@ -188,10 +179,10 @@ - + - + @@ -202,15 +193,26 @@ - + + + + + + + + + + + + - - - + + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk24-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk24-1von1-final.svg index 1d6c0d7eef..43b36b13c3 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk24-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk24-1von1-final.svg @@ -7,11 +7,11 @@ - + - - - + + + @@ -20,22 +20,22 @@ - - - + + + - + - - - - + + + + - - - + + + @@ -45,18 +45,18 @@ - + - + - - + + - + - + @@ -81,17 +81,17 @@ - + - + - + - + @@ -109,12 +109,12 @@ - + - + @@ -147,70 +147,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -222,77 +222,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -301,17 +301,17 @@ - + - + - + - + @@ -329,10 +329,10 @@ - + - + @@ -357,52 +357,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -426,7 +426,7 @@ - + @@ -443,22 +443,22 @@ - + - + - + - + - + @@ -471,13 +471,13 @@ - + - + @@ -493,10 +493,10 @@ - + - + @@ -511,25 +511,25 @@ - + - + - + - + - + - + - + @@ -537,22 +537,22 @@ - + - + - + - + @@ -561,26 +561,26 @@ - - + + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-1von2-final.svg index 5bba8c63f7..e4a5071f4e 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-1von2-final.svg @@ -7,12 +7,12 @@ - - + + - - - + + + @@ -21,18 +21,18 @@ - - - + + + - + - - - - + + + + @@ -42,20 +42,20 @@ - + - + - + - + - + - + @@ -79,24 +79,24 @@ - + - + - + - + - + @@ -104,7 +104,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -148,11 +148,11 @@ - + - + @@ -166,19 +166,19 @@ - + - + - + - + @@ -186,11 +186,11 @@ - + - + @@ -203,39 +203,39 @@ - + - + - + - + - + - + - + - + @@ -257,7 +257,7 @@ - + @@ -269,18 +269,18 @@ - + - + - + - + @@ -290,10 +290,10 @@ - + - + @@ -307,12 +307,12 @@ - + - + @@ -337,13 +337,13 @@ - + - + @@ -352,7 +352,7 @@ - + @@ -363,14 +363,14 @@ - + - + - + @@ -388,10 +388,10 @@ - + - + @@ -405,7 +405,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -432,7 +432,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -450,20 +450,20 @@ - + - + - + - + @@ -486,43 +486,43 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -531,18 +531,18 @@ - - + + - - + + - + - + @@ -551,11 +551,11 @@ - + - + @@ -568,7 +568,7 @@ - + @@ -580,7 +580,7 @@ - + @@ -588,7 +588,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-2von2-final.svg index 772aa1602e..0103088fd9 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk25-2von2-final.svg @@ -1,5 +1,8 @@ + + + @@ -7,11 +10,11 @@ - - + + - - + + @@ -20,18 +23,18 @@ - - - + + + - + - - - - - + + + + + @@ -39,18 +42,18 @@ - + - + - + - + - + @@ -71,17 +74,17 @@ - + - + - + - + @@ -104,7 +107,7 @@ - + @@ -121,10 +124,10 @@ - + - + @@ -132,10 +135,10 @@ - + - + @@ -147,45 +150,42 @@ - + - + - + - + - + - + - - - + + + - - - - - - - - - + + + Sk26 T. 1–5 + + + - + @@ -194,16 +194,16 @@ - - + + - - + + - - + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-1von2-final.svg index 31a2b2f7a2..3149c19dd8 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-1von2-final.svg @@ -10,15 +10,15 @@ - - - - + + + + - - - - + + + + @@ -27,20 +27,20 @@ - - - + + + - + - - - - - - + + + + + + @@ -51,15 +51,15 @@ - + - + - - + + - - + + @@ -78,7 +78,7 @@ - + @@ -92,11 +92,11 @@ - + - + @@ -110,7 +110,7 @@ - + @@ -119,22 +119,22 @@ - + - + - + - + @@ -143,11 +143,11 @@ - + - + @@ -161,7 +161,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -207,31 +207,31 @@ - + - + - + - + - + - + @@ -242,7 +242,7 @@ - + @@ -263,18 +263,18 @@ - + - + - + @@ -283,7 +283,7 @@ - + @@ -295,7 +295,7 @@ - + @@ -306,51 +306,51 @@ - + - + - + - + - + - + - + - + - + @@ -358,7 +358,7 @@ - + @@ -368,32 +368,32 @@ - + - + - + - + - + - + @@ -406,7 +406,7 @@ - + @@ -417,7 +417,7 @@ - + @@ -430,29 +430,29 @@ - + - + - + - + - + - + @@ -466,37 +466,37 @@ - + - + - + - + - + - + - + - + @@ -515,11 +515,11 @@ - + - + @@ -529,12 +529,12 @@ - + - + @@ -547,24 +547,24 @@ - + - + - + - + - + @@ -574,11 +574,11 @@ - + - + @@ -592,11 +592,11 @@ - + - + @@ -613,14 +613,14 @@ - + - + - + @@ -631,13 +631,13 @@ - + - + @@ -649,41 +649,41 @@ - + - + - + - + - + - + - - + + - + @@ -692,20 +692,20 @@ - - + + - - + + - + - + @@ -715,7 +715,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -736,14 +736,14 @@ - + - + - + @@ -758,14 +758,14 @@ - + - + @@ -779,7 +779,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-2von2-final.svg index e3158fa627..d440765421 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk26-2von2-final.svg @@ -7,14 +7,14 @@ - - - + + + - - - - + + + + @@ -23,18 +23,18 @@ - - + + - + - + - - - - + + + + @@ -43,15 +43,15 @@ - - - + + + - + - + @@ -72,10 +72,10 @@ - + - + @@ -83,7 +83,7 @@ - + @@ -93,15 +93,15 @@ - + - + - + @@ -116,31 +116,31 @@ - + - + - + - + - + @@ -159,7 +159,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -184,28 +184,28 @@ - + - + - + - + - + - + @@ -215,22 +215,22 @@ - + - + - + - + @@ -240,7 +240,7 @@ - + @@ -248,12 +248,12 @@ - + - + @@ -263,7 +263,7 @@ - + @@ -275,21 +275,21 @@ - + - + - + - + @@ -299,7 +299,7 @@ - + @@ -308,13 +308,13 @@ - + - + - + @@ -322,13 +322,13 @@ - + - + @@ -341,16 +341,16 @@ - + - + - + @@ -358,60 +358,53 @@ - + - + - + - + - + - + - + - - - - - - - - - - - + + + + - + @@ -420,29 +413,29 @@ - - + + - - + + - + - + - + @@ -454,11 +447,11 @@ - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27-1von1-final.svg index 054a420188..a25e2053da 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27-1von1-final.svg @@ -10,12 +10,12 @@ - - - - - - + + + + + + @@ -24,19 +24,19 @@ - - - + + + - + - + - - - - + + + + @@ -46,13 +46,13 @@ - - + + - + - - + + @@ -72,20 +72,20 @@ - + - + - + - + @@ -102,17 +102,17 @@ - + - + - + @@ -132,31 +132,31 @@ - + - + - + - + - + - + - + @@ -165,29 +165,29 @@ - + - + - + - + - + - + - + @@ -203,18 +203,18 @@ - + - + - + - + @@ -232,20 +232,20 @@ - + - + - + - + - + @@ -262,20 +262,20 @@ - + - + - + - + @@ -285,7 +285,7 @@ - + @@ -302,21 +302,21 @@ - + - + - + - + - + @@ -327,27 +327,27 @@ - + - + - + - + - + - + @@ -358,36 +358,36 @@ - + - + - + - + - + - + - + - + @@ -406,16 +406,16 @@ - + - + - + @@ -429,21 +429,21 @@ - + - + - + - + - + @@ -453,32 +453,32 @@ - + - + - + - - + + - + - + - + @@ -487,11 +487,11 @@ - - + + - + @@ -505,10 +505,10 @@ - + - + @@ -548,7 +548,7 @@ - + @@ -558,7 +558,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-1von2-final.svg index e5f2f5617d..61cbcff37f 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-1von2-final.svg @@ -6,12 +6,12 @@ - - - - - - + + + + + + @@ -19,16 +19,16 @@ - - + + - + - - - + + + @@ -37,10 +37,10 @@ - + - - + + @@ -65,10 +65,10 @@ - + - + @@ -79,21 +79,21 @@ - + - + - + - + - + @@ -101,10 +101,10 @@ - + - + @@ -120,34 +120,34 @@ - + - + - + - + - + - + - + - + @@ -155,22 +155,22 @@ - + - + - + - + - + @@ -178,7 +178,7 @@ - + @@ -187,24 +187,24 @@ - - + + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-2von2-final.svg index 5e1479cd85..3d12f6ac33 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk27_1-2von2-final.svg @@ -6,12 +6,12 @@ - - - - - - + + + + + + @@ -20,18 +20,18 @@ - - - + + + - + - - - - - + + + + + @@ -41,10 +41,10 @@ - + - + @@ -75,26 +75,26 @@ - + - + - + - + - + - + @@ -107,10 +107,10 @@ - + - + @@ -140,26 +140,26 @@ - + - + - + - + - + @@ -167,7 +167,7 @@ - + @@ -178,18 +178,18 @@ - + - + - - + + - + @@ -197,20 +197,20 @@ - + - + - - + + - + @@ -230,7 +230,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-1von2-final.svg index 86bdb8bcdf..2add159419 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-1von2-final.svg @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + @@ -24,23 +24,23 @@ - - - + + + - + - + - - - - - - - - + + + + + + + + @@ -49,16 +49,16 @@ - + - + - - - - + + + + - + @@ -88,43 +88,43 @@ - + - + - + - + - + - + - + - + - + @@ -138,32 +138,32 @@ - + - + - + - + - + - + - + - + @@ -176,27 +176,27 @@ - + - + - + - + - + - + @@ -218,43 +218,43 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -267,31 +267,31 @@ - + - + - + - + - + - + @@ -301,14 +301,14 @@ - + - + - + @@ -320,10 +320,10 @@ - + - + @@ -333,63 +333,63 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -424,21 +424,21 @@ - + - + - + - + - + @@ -448,27 +448,27 @@ - + - + - + - + - + - + - + @@ -482,30 +482,30 @@ - + - + - + - + - + - + @@ -516,40 +516,40 @@ - + - + - + - + - + - + - + - + - + @@ -569,10 +569,10 @@ - + - + @@ -588,14 +588,14 @@ - + - + @@ -605,28 +605,28 @@ - + - + - + - + - + - + - + @@ -635,7 +635,7 @@ - + @@ -645,7 +645,7 @@ - + @@ -654,27 +654,27 @@ - - - + + + - - + + - - + + - + - + - + - + @@ -688,7 +688,7 @@ - + @@ -696,10 +696,10 @@ - + - + @@ -722,15 +722,15 @@ - + - + - + @@ -739,62 +739,62 @@ - - - + + + - + - - - + + + - - - - + + + + - - - - + + + + - - + + - + - + - + - + - + - + - + - + @@ -802,29 +802,29 @@ - + - + - + - + - + - + @@ -832,7 +832,7 @@ - + @@ -841,9 +841,9 @@ - + - + @@ -893,7 +893,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-2von2-final.svg index df4ca76057..3791835b56 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28-2von2-final.svg @@ -6,15 +6,15 @@ - - - - + + + + - - - - + + + + @@ -23,19 +23,19 @@ - - - + + + - + - + - - - - - + + + + + @@ -44,18 +44,18 @@ - - + + - - + + - + - + @@ -75,36 +75,36 @@ - + - + - + - + - + - + - + - + - + @@ -114,11 +114,11 @@ - + - + @@ -131,34 +131,34 @@ - + - + - + - + - + - + - + - + @@ -172,15 +172,15 @@ - - - + + + - + @@ -190,7 +190,7 @@ - + @@ -199,17 +199,17 @@ - - - + + + - - + + - + - + @@ -231,11 +231,11 @@ - + - + @@ -244,10 +244,10 @@ - + - + @@ -258,25 +258,25 @@ - + - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28_1-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28_1-1von1-final.svg index 58df223bc5..960fd8a6e4 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28_1-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk28_1-1von1-final.svg @@ -7,15 +7,15 @@ - - - - - + + + + + - - - + + + @@ -24,19 +24,19 @@ - - + + - + - - - - - - + + + + + + @@ -44,11 +44,11 @@ - + - + - + @@ -74,79 +74,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -170,10 +170,10 @@ - + - + @@ -192,11 +192,11 @@ - + - + @@ -205,24 +205,24 @@ - + - + - + - + - + @@ -238,29 +238,29 @@ - + - + - + - + - + - + @@ -276,11 +276,11 @@ - - + + - + @@ -295,14 +295,14 @@ - + - - + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk29-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk29-1von1-final.svg index ff70839e47..466bdf4e10 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk29-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk29-1von1-final.svg @@ -7,15 +7,15 @@ - - - - - - - - - + + + + + + + + + @@ -23,15 +23,15 @@ - - + + - + - + - - + + @@ -39,21 +39,21 @@ - + - + - - + + - + - + - + @@ -93,81 +93,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -176,7 +176,7 @@ - + @@ -187,17 +187,17 @@ - + - + - + @@ -216,10 +216,10 @@ - + - + @@ -231,11 +231,11 @@ - + - + @@ -259,18 +259,18 @@ - + - + - + @@ -281,14 +281,14 @@ - + - + - + @@ -311,46 +311,46 @@ - + - + - + - + - + - + - + - + - + @@ -365,29 +365,29 @@ - + - + - + - + - + - + @@ -399,33 +399,33 @@ - + - + - + - + - + - + - + @@ -433,13 +433,13 @@ - + - + - + @@ -450,7 +450,7 @@ - + @@ -459,22 +459,22 @@ - + - + - + - + @@ -486,18 +486,18 @@ - + - + - + - + @@ -525,21 +525,21 @@ - + - + - + - + - + @@ -547,24 +547,24 @@ - + - + - + - + @@ -581,11 +581,11 @@ - + - + @@ -600,16 +600,16 @@ - + - + - + @@ -623,10 +623,10 @@ - + - + @@ -638,10 +638,10 @@ - + - + @@ -653,42 +653,42 @@ - + - + - + - + - + - + - + - + - + @@ -705,14 +705,14 @@ - + - + @@ -727,10 +727,10 @@ - + - + @@ -739,25 +739,25 @@ - + - + - + - + - + @@ -773,23 +773,23 @@ - + - + - + - + @@ -798,12 +798,12 @@ - - + + - - + + @@ -813,13 +813,13 @@ - + - + - + @@ -831,10 +831,10 @@ - + - + @@ -855,16 +855,16 @@ - + - + - + @@ -874,7 +874,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-1von2-final.svg index 44e0258666..b27635addc 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-1von2-final.svg @@ -10,16 +10,16 @@ - - - - + + + + - - - - - + + + + + @@ -27,15 +27,15 @@ - - + + - + - + - - + + @@ -43,23 +43,23 @@ - + - + - - - - + + + + - + - + - + @@ -97,7 +97,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -124,14 +124,14 @@ - + - + @@ -163,10 +163,10 @@ - + - + @@ -174,18 +174,18 @@ - + - + - + - + @@ -204,40 +204,40 @@ - + - + - + - + - + - + - + - + - + @@ -256,7 +256,7 @@ - + @@ -275,38 +275,38 @@ - + - + - + - + - + - + - + - + - + @@ -315,10 +315,10 @@ - + - + @@ -338,14 +338,14 @@ - + - + @@ -355,21 +355,21 @@ - + - + - + @@ -378,7 +378,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -399,22 +399,19 @@ - + - + - - - - + - + @@ -434,13 +431,13 @@ - + - + - + @@ -448,7 +445,7 @@ - + @@ -456,19 +453,19 @@ - + - + - + @@ -478,11 +475,11 @@ - + - + @@ -514,34 +511,34 @@ - + - + - + - + - + - + - + - + @@ -549,7 +546,7 @@ - + @@ -561,7 +558,7 @@ - + @@ -569,10 +566,10 @@ - + - + @@ -589,7 +586,7 @@ - + @@ -623,7 +620,7 @@ - + @@ -640,7 +637,7 @@ - + @@ -661,7 +658,7 @@ - + @@ -676,13 +673,13 @@ - + - + - + @@ -698,17 +695,17 @@ - + - + - + - + @@ -716,11 +713,11 @@ - + - + @@ -730,30 +727,30 @@ - + - + - + - + - + @@ -768,17 +765,17 @@ - + - - + + - + @@ -793,26 +790,26 @@ - - + + - + - + - + - + - + - + @@ -821,7 +818,7 @@ - + @@ -831,7 +828,7 @@ - + @@ -845,10 +842,10 @@ - + - + @@ -861,33 +858,33 @@ - - - + + + - - + + - - - - + + + + - - + + - + - - - + + + - + - + @@ -903,7 +900,7 @@ - + @@ -918,4 +915,15 @@ + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-2von2-final.svg index 36ce6fa523..5ca3bc971e 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk3-2von2-final.svg @@ -7,12 +7,12 @@ - - - - - - + + + + + + @@ -20,10 +20,10 @@ - + - - + + @@ -32,14 +32,14 @@ - + - + - + @@ -63,26 +63,26 @@ - + - + - + - + - + - + @@ -119,13 +119,13 @@ - + - + @@ -156,21 +156,21 @@ - + - + - + - + - + @@ -185,15 +185,15 @@ - + - + - + @@ -207,24 +207,24 @@ - + - + - + - + @@ -240,16 +240,16 @@ - - - + + + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk30-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk30-1von1-final.svg index 7f0e9c3a86..6985ac3bee 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk30-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk30-1von1-final.svg @@ -6,12 +6,12 @@ - - - - - - + + + + + + @@ -19,15 +19,15 @@ - - + + - + - - + + @@ -36,16 +36,16 @@ - - + + - + - + @@ -63,10 +63,10 @@ - + - + @@ -77,7 +77,7 @@ - + @@ -87,12 +87,12 @@ - + - + @@ -108,7 +108,7 @@ - + @@ -117,11 +117,11 @@ - - + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-1von2-final.svg index 63d1b59ab7..256ff3e572 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-1von2-final.svg @@ -7,22 +7,22 @@ - - + + - - - - + + + + - - - - - - - - + + + + + + + + @@ -30,17 +30,17 @@ - - - - + + + + - - - - - + + + + + @@ -48,20 +48,20 @@ - + - + - - + + - + - + @@ -89,7 +89,7 @@ - + @@ -104,23 +104,23 @@ - + - + - + - + - + @@ -130,19 +130,19 @@ - + - + - + @@ -163,14 +163,14 @@ - + - + - + @@ -184,7 +184,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -208,13 +208,13 @@ - + - + - + @@ -225,24 +225,24 @@ - - + + - + - + - + - + - + @@ -252,7 +252,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -270,21 +270,21 @@ - + - + - + - + @@ -297,13 +297,13 @@ - + - + @@ -313,21 +313,21 @@ - + - + - + - + - + @@ -339,7 +339,7 @@ - + @@ -353,32 +353,32 @@ - + - + - + - + - + - + @@ -391,13 +391,13 @@ - + - + - + @@ -407,7 +407,7 @@ - + @@ -427,30 +427,30 @@ - + - + - + - + - + @@ -461,14 +461,14 @@ - + - + - + @@ -478,18 +478,18 @@ - + - + - + @@ -497,72 +497,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -573,24 +573,24 @@ - + - + - + - + @@ -608,17 +608,17 @@ - + - + - + - + @@ -637,18 +637,18 @@ - + - + - + @@ -660,7 +660,7 @@ - + @@ -674,14 +674,14 @@ - + - + - + @@ -691,13 +691,13 @@ - + - + @@ -728,11 +728,11 @@ - + - + @@ -742,18 +742,18 @@ - + - + - + - + @@ -775,7 +775,7 @@ - + @@ -792,10 +792,10 @@ - + - + @@ -810,8 +810,8 @@ - - + + @@ -823,7 +823,7 @@ - + @@ -831,10 +831,10 @@ - + - + @@ -844,7 +844,7 @@ - + @@ -852,7 +852,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-2von2-final.svg index e5a1721606..c1a631d3a7 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk31-2von2-final.svg @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + @@ -22,20 +22,20 @@ - - + + - + - + - - - - - - + + + + + + @@ -44,16 +44,16 @@ - + - + - + - + @@ -78,17 +78,17 @@ - + - + - + @@ -97,13 +97,13 @@ - + - + - + @@ -115,7 +115,7 @@ - + @@ -127,15 +127,15 @@ - + - + - + @@ -146,11 +146,11 @@ - + - + @@ -164,20 +164,17 @@ - + - - - - - - - - - - - + + + + + + + + @@ -193,20 +190,21 @@ - - + + + - + - - - + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32-1von1-final.svg index 11ba867988..d5ebf14bc1 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32-1von1-final.svg @@ -7,15 +7,15 @@ - - - - - - - - - + + + + + + + + + @@ -23,24 +23,24 @@ - - - + + + - + - + - - - - - - - - - + + + + + + + + + @@ -48,24 +48,24 @@ - - + + - + - - + + - - - + + + - + - + @@ -102,23 +102,23 @@ - + - + - + - + - + @@ -129,7 +129,7 @@ - + @@ -156,41 +156,41 @@ - + - + - + - + - + - + - + - + - + @@ -202,11 +202,11 @@ - + - + @@ -227,11 +227,11 @@ - + - + @@ -255,11 +255,11 @@ - + - + @@ -281,16 +281,16 @@ - + - + - + @@ -302,11 +302,11 @@ - + - + @@ -326,21 +326,21 @@ - + - + - + - + @@ -349,19 +349,19 @@ - + - + - + @@ -371,17 +371,17 @@ - + - + - + @@ -389,7 +389,7 @@ - + @@ -398,26 +398,26 @@ - + - + - + - + - + @@ -431,7 +431,7 @@ - + @@ -447,15 +447,15 @@ - + - + - + @@ -469,24 +469,24 @@ - + - + - + - + - + @@ -501,40 +501,40 @@ - + - + - + - + - + - + - + - + - + @@ -565,7 +565,7 @@ - + @@ -593,16 +593,16 @@ - + - + - + @@ -610,16 +610,16 @@ - + - + - + @@ -627,11 +627,11 @@ - + - + @@ -644,38 +644,38 @@ - + - + - + - + - + - + - + - + - + @@ -684,7 +684,7 @@ - + @@ -699,13 +699,13 @@ - + - + @@ -722,12 +722,12 @@ - - + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1-1von1-final.svg index 889669cb9c..39badb2184 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1-1von1-final.svg @@ -7,15 +7,15 @@ - - - - - + + + + + - - - + + + @@ -24,19 +24,19 @@ - - + + - + - + - - - - - + + + + + @@ -44,23 +44,23 @@ - + - - + + - - - + + + - + - + - + @@ -92,25 +92,25 @@ - + - + - + - + - + @@ -119,15 +119,15 @@ - + - + - + @@ -137,11 +137,11 @@ - + - + @@ -153,22 +153,22 @@ - + - + - + - + @@ -176,22 +176,22 @@ - + - + - + - + @@ -205,7 +205,7 @@ - + @@ -219,14 +219,14 @@ - + - + @@ -248,29 +248,29 @@ - + - + - + - + - + - + - + @@ -284,10 +284,10 @@ - + - + @@ -299,11 +299,11 @@ - + - + @@ -324,7 +324,7 @@ - + @@ -336,45 +336,45 @@ - + - + - + - + - + - + - + - + - + - + @@ -389,27 +389,22 @@ - + - - - + + + - + - - - - - - + @@ -433,12 +428,12 @@ - - + + - + @@ -455,7 +450,7 @@ - + @@ -463,10 +458,10 @@ - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1_1-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1_1-1von1-final.svg index 2b147f61cf..7ec08813fb 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1_1-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk32_1_1-1von1-final.svg @@ -6,10 +6,10 @@ - - + + - + @@ -18,15 +18,15 @@ - - + + - + - - - + + + @@ -34,9 +34,9 @@ - + - + @@ -69,10 +69,10 @@ - + - + @@ -85,10 +85,10 @@ - + - + @@ -96,9 +96,9 @@ - + - + @@ -107,23 +107,23 @@ - + - + - - + + - - + + @@ -142,18 +142,19 @@ - - + + - + + .1 - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk33-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk33-1von1-final.svg index 1807e26c1c..c6ceb5b653 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk33-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk33-1von1-final.svg @@ -7,14 +7,14 @@ - - - - + + + + - - - + + + @@ -22,21 +22,21 @@ - - - + + + - + - - + + - - + + - - - + + + @@ -44,21 +44,21 @@ - + - + - - + + - + - + - + @@ -82,7 +82,7 @@ - + @@ -92,14 +92,14 @@ - + - + - + @@ -107,19 +107,19 @@ - + - + - + - + @@ -134,7 +134,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -190,29 +190,29 @@ - + - + - + - - - + + + - + - + @@ -238,13 +238,13 @@ - + - + @@ -257,16 +257,16 @@ - + - + - + @@ -279,11 +279,11 @@ - + - + @@ -296,7 +296,7 @@ - + @@ -312,32 +312,32 @@ - + - + - + - + - + - + @@ -348,35 +348,35 @@ - + - + - + - + - + - + @@ -401,13 +401,13 @@ - + - + - + @@ -418,7 +418,7 @@ - + @@ -432,13 +432,13 @@ - + - + @@ -455,7 +455,7 @@ - + @@ -463,15 +463,15 @@ - + - + - + @@ -487,18 +487,18 @@ - + - + - + @@ -512,15 +512,15 @@ - + - + - + @@ -530,7 +530,7 @@ - + @@ -539,13 +539,13 @@ - + - + @@ -558,7 +558,7 @@ - + @@ -575,7 +575,7 @@ - + @@ -588,12 +588,12 @@ - + - + @@ -602,24 +602,24 @@ - + - + - + - + @@ -627,18 +627,18 @@ - + - + - + @@ -657,13 +657,13 @@ - + - + @@ -675,12 +675,12 @@ - + - + @@ -698,22 +698,22 @@ - - + + - + - + - + @@ -723,13 +723,13 @@ - + - + @@ -748,7 +748,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-1von2-final.svg index d933244204..17a9a76983 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-1von2-final.svg @@ -7,13 +7,13 @@ - - - - + + + + - - + + @@ -21,13 +21,13 @@ - - + + - + - + @@ -38,21 +38,21 @@ - + - + - - - - + + + + - + - + @@ -75,35 +75,35 @@ - + - + - + - + - + - + - + @@ -122,26 +122,26 @@ - + - + - + - + - + @@ -162,7 +162,7 @@ - + @@ -173,32 +173,32 @@ - + - + - + - + - + - + - + @@ -226,7 +226,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -245,11 +245,11 @@ - + - + @@ -257,7 +257,7 @@ - + @@ -300,24 +300,24 @@ - - + + - + - + - + - + @@ -333,8 +333,8 @@ - - + + @@ -346,13 +346,13 @@ - + - + @@ -366,20 +366,20 @@ - + - + - + - + @@ -388,19 +388,19 @@ - + - + - + - + @@ -410,7 +410,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -441,14 +441,14 @@ - + - + - + @@ -481,11 +481,11 @@ - + - + @@ -496,7 +496,7 @@ - + @@ -507,7 +507,7 @@ - + @@ -519,7 +519,7 @@ - + @@ -533,14 +533,14 @@ - + - + @@ -548,7 +548,7 @@ - + @@ -562,7 +562,7 @@ - + @@ -578,7 +578,7 @@ - + @@ -588,7 +588,7 @@ - + @@ -596,7 +596,7 @@ - + @@ -608,11 +608,11 @@ - + - + @@ -624,11 +624,11 @@ - + - + @@ -641,7 +641,7 @@ - + @@ -652,12 +652,12 @@ - + - + @@ -668,7 +668,7 @@ - + @@ -682,10 +682,10 @@ - + - + @@ -697,22 +697,22 @@ - + - + - + - + - + @@ -720,11 +720,11 @@ - + - + @@ -734,7 +734,7 @@ - + @@ -745,14 +745,14 @@ - + - + @@ -774,22 +774,22 @@ - + - + - + - + - + @@ -797,10 +797,10 @@ - + - + @@ -809,10 +809,10 @@ - + - + @@ -820,11 +820,11 @@ - + - + @@ -842,29 +842,29 @@ - + - + - + - + - + @@ -875,7 +875,7 @@ - + @@ -893,11 +893,11 @@ - + - + @@ -905,11 +905,11 @@ - + - + @@ -917,7 +917,7 @@ - + @@ -960,22 +960,22 @@ - + - + - + - + - + @@ -998,7 +998,7 @@ - + @@ -1016,7 +1016,7 @@ - + @@ -1029,7 +1029,7 @@ - + @@ -1049,7 +1049,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-2von2-final.svg index 0ebffc60b4..ff865c859e 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk4-2von2-final.svg @@ -7,9 +7,9 @@ - - - + + + @@ -17,11 +17,11 @@ - + - - - + + + @@ -31,19 +31,19 @@ - - + + - + - + - - + + - + @@ -60,12 +60,11 @@ - - + @@ -77,13 +76,13 @@ - + - + @@ -98,7 +97,7 @@ - + @@ -114,11 +113,11 @@ - + - + @@ -126,7 +125,7 @@ - + @@ -144,13 +143,13 @@ - + - + @@ -158,11 +157,11 @@ - + - + @@ -171,12 +170,12 @@ - + - + @@ -185,7 +184,7 @@ - + @@ -211,7 +210,7 @@ - + @@ -232,7 +231,7 @@ - + @@ -242,12 +241,12 @@ - + - + @@ -283,62 +282,41 @@ - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - + - + - + @@ -351,14 +329,14 @@ - - + + - + @@ -368,7 +346,7 @@ - + @@ -385,29 +363,54 @@ - - - + + + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk5-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk5-1von1-final.svg index 669dd1a781..e7481de5e6 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk5-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk5-1von1-final.svg @@ -10,15 +10,15 @@ - - - - - + + + + + - - - + + + @@ -27,17 +27,17 @@ - - - + + + - + - - - - + + + + @@ -46,12 +46,12 @@ - + - + - + @@ -59,14 +59,14 @@ - + - + - + @@ -85,37 +85,37 @@ - + - + - + - + - + - + - + - + @@ -127,17 +127,17 @@ - + - + - + - + @@ -146,25 +146,25 @@ - + - + - + - + - + - + @@ -172,20 +172,20 @@ - + - + - + - + - + @@ -214,7 +214,7 @@ - + @@ -228,11 +228,11 @@ - + - + @@ -260,7 +260,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -284,12 +284,12 @@ - + - + @@ -303,17 +303,17 @@ - + - + - + - + @@ -322,25 +322,25 @@ - + - + - + - + - + @@ -349,47 +349,47 @@ - + - + - + - + - + - + - + - + - + @@ -431,18 +431,18 @@ - - + + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk6-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk6-1von1-final.svg index 1920df3c93..a20f9c8890 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk6-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk6-1von1-final.svg @@ -10,15 +10,15 @@ - - - - + + + + - - - + + + @@ -27,21 +27,21 @@ - + - - + + - + - + - - - - - + + + + + @@ -50,21 +50,21 @@ - + - + - - + + - + - + - + @@ -87,33 +87,33 @@ - + - + - + - + - + - + - + @@ -125,17 +125,17 @@ - + - + - + - + @@ -149,7 +149,7 @@ - + @@ -162,20 +162,20 @@ - + - + - + - + @@ -184,25 +184,25 @@ - + - + - + - + - + @@ -217,17 +217,17 @@ - + - + - + - + @@ -237,7 +237,7 @@ - + @@ -246,12 +246,12 @@ - + - + @@ -271,10 +271,10 @@ - + - + @@ -292,41 +292,41 @@ - + - + - + - + - + - + - + - + - + @@ -338,7 +338,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -355,46 +355,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -413,10 +413,10 @@ - + - + @@ -428,36 +428,36 @@ - + - + - + - + - + - + - + - + @@ -481,7 +481,7 @@ - + @@ -491,58 +491,58 @@ - + - + - + - + - + - + - - - + + + - - + + - - + + - + - + - + - + - + - + @@ -551,18 +551,18 @@ - + - + - + - + @@ -581,13 +581,13 @@ - + - + @@ -596,7 +596,7 @@ - + @@ -607,9 +607,9 @@ - + - + @@ -625,13 +625,13 @@ - - + + - + - + @@ -640,7 +640,7 @@ - + @@ -650,10 +650,10 @@ - + - + @@ -671,31 +671,31 @@ - + - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk7-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk7-1von1-final.svg index 509fc500be..668054ee51 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk7-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk7-1von1-final.svg @@ -7,14 +7,14 @@ - - - - + + + + - - - + + + @@ -23,21 +23,21 @@ - + - + - + - + - - - - - - + + + + + + @@ -46,17 +46,17 @@ - + - + - + - + @@ -74,24 +74,24 @@ - + - + - + - + - + - + @@ -104,17 +104,17 @@ - + - + - + - + @@ -127,13 +127,13 @@ - + - + @@ -148,10 +148,10 @@ - + - + @@ -168,17 +168,17 @@ - + - + - + - + @@ -192,17 +192,17 @@ - + - + - + - + @@ -226,20 +226,20 @@ - - + + - - + + - + - + @@ -255,11 +255,11 @@ - - - + + + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk8-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk8-1von1-final.svg index 0f105e2d5d..d4803a9460 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk8-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk8-1von1-final.svg @@ -6,11 +6,11 @@ - - + + - - + + @@ -19,16 +19,16 @@ - - + + - - - - + + + + @@ -36,15 +36,15 @@ - + - + - + @@ -61,10 +61,10 @@ - + - + @@ -75,13 +75,13 @@ - + - + - + @@ -98,24 +98,11 @@ - - - - - - - - - - - - - - + @@ -124,20 +111,33 @@ - - - + + + - + - + - + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-1von2-final.svg index fa3edaa20c..d2f804d81a 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-1von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-1von2-final.svg @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + @@ -25,17 +25,17 @@ - - + + - + - - - - + + + + @@ -43,25 +43,25 @@ - - + + - + - - - - - + + + + + - + - + - + @@ -87,23 +87,23 @@ - + - + - + - + - + - + @@ -124,13 +124,13 @@ - + - + - + @@ -146,30 +146,30 @@ - + - + - + - + - + - + @@ -177,16 +177,16 @@ - + - + - + - + @@ -211,37 +211,37 @@ - + - + - + - + - + - + - + - + - + - + @@ -252,29 +252,29 @@ - + - + - + - + - + - + - + @@ -290,16 +290,16 @@ - + - + - + @@ -326,44 +326,44 @@ - + - + - + - + - + - + - + - + - + - + @@ -373,7 +373,7 @@ - + @@ -383,10 +383,10 @@ - + - + @@ -400,10 +400,10 @@ - + - + @@ -411,20 +411,20 @@ - + - + - + - + @@ -437,26 +437,26 @@ - + - + - + - + - + @@ -470,24 +470,24 @@ - + - + - + - + - + - + @@ -511,7 +511,7 @@ - + @@ -579,7 +579,7 @@ - + @@ -587,25 +587,25 @@ - + - + - + - + - + @@ -613,13 +613,13 @@ - + - + - + @@ -637,49 +637,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -687,11 +687,11 @@ - + - + @@ -700,11 +700,11 @@ - + - + @@ -716,10 +716,10 @@ - + - + @@ -728,12 +728,12 @@ - + - + @@ -741,25 +741,25 @@ - + - + - + - + - + @@ -778,25 +778,25 @@ - + - + - + - + - - + + @@ -805,19 +805,19 @@ - + - + - - + + - + @@ -827,7 +827,7 @@ - + @@ -845,22 +845,22 @@ - - + + - + - + - + - + @@ -874,7 +874,7 @@ - + @@ -884,7 +884,7 @@ - + @@ -920,7 +920,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-2von2-final.svg index 454128ad1c..943963ac78 100644 --- a/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-2von2-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Sk9-2von2-final.svg @@ -7,13 +7,13 @@ - - - + + + - - + + @@ -22,17 +22,17 @@ - - - - + + + + - - - - - - + + + + + + @@ -42,17 +42,17 @@ - - + + - + - + - + @@ -77,25 +77,25 @@ - + - + - + - + @@ -109,7 +109,7 @@ - + @@ -159,24 +159,24 @@ - + - + - + - + @@ -185,7 +185,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -206,11 +206,11 @@ - + - + @@ -218,7 +218,7 @@ - + @@ -231,19 +231,19 @@ - + - + - + - + @@ -251,10 +251,10 @@ - + - + @@ -262,20 +262,20 @@ - + - + - + - + @@ -288,7 +288,7 @@ - + @@ -297,10 +297,10 @@ - + - + @@ -324,10 +324,10 @@ - + - + @@ -347,20 +347,20 @@ - + - + - + - + @@ -370,7 +370,7 @@ - + @@ -383,23 +383,23 @@ - + - + - + - + @@ -417,30 +417,30 @@ - + - + - + - + - + - + - + @@ -456,20 +456,20 @@ - - + + - + - + - + @@ -480,10 +480,10 @@ - + - + @@ -492,21 +492,21 @@ - + - + - + - + @@ -537,33 +537,33 @@ - + - + - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-10von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-10von12-final.svg new file mode 100644 index 0000000000..624884102f --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-10von12-final.svg @@ -0,0 +1,1775 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-11von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-11von12-final.svg new file mode 100644 index 0000000000..e3f14588dd --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-11von12-final.svg @@ -0,0 +1,915 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-12von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-12von12-final.svg new file mode 100644 index 0000000000..dd0022771f --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-12von12-final.svg @@ -0,0 +1,743 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-1von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-1von12-final.svg new file mode 100644 index 0000000000..277cfa6486 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-1von12-final.svg @@ -0,0 +1,1559 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-2von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-2von12-final.svg new file mode 100644 index 0000000000..94b4f4bf3b --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-2von12-final.svg @@ -0,0 +1,1721 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-3von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-3von12-final.svg new file mode 100644 index 0000000000..ba4f4aff7d --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-3von12-final.svg @@ -0,0 +1,1597 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-4von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-4von12-final.svg new file mode 100644 index 0000000000..fc993bb047 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-4von12-final.svg @@ -0,0 +1,1907 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-5von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-5von12-final.svg new file mode 100644 index 0000000000..eddd64b8b5 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-5von12-final.svg @@ -0,0 +1,2130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-6von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-6von12-final.svg new file mode 100644 index 0000000000..859b13ab23 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-6von12-final.svg @@ -0,0 +1,1717 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-7von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-7von12-final.svg new file mode 100644 index 0000000000..5b9348daf6 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-7von12-final.svg @@ -0,0 +1,1416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-8von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-8von12-final.svg new file mode 100644 index 0000000000..a1ac9f8f99 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-8von12-final.svg @@ -0,0 +1,1597 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-9von12-final.svg b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-9von12-final.svg new file mode 100644 index 0000000000..719c5f8095 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m22/M22_Textfassung1-9von12-final.svg @@ -0,0 +1,1804 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/themes/css/main.css b/src/assets/themes/css/main.css index 7e73d4b979..b01ed3e3da 100644 --- a/src/assets/themes/css/main.css +++ b/src/assets/themes/css/main.css @@ -315,7 +315,7 @@ span.facet-badge { .highlighted { background: orange; } -.caps, +.smallcaps, .version { font-variant: small-caps; } diff --git a/src/assets/themes/scss/main.scss b/src/assets/themes/scss/main.scss index 035f314a64..491a8cc28e 100644 --- a/src/assets/themes/scss/main.scss +++ b/src/assets/themes/scss/main.scss @@ -371,7 +371,7 @@ span.facet-badge { .highlighted { background: orange; } -.caps, +.smallcaps, .version { font-variant: small-caps; } diff --git a/yarn.lock b/yarn.lock index 1a15a9f194..8530cebd12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20,23 +20,23 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@angular-devkit/architect@0.1703.5": - version "0.1703.5" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.5.tgz#2e6e534c99fd99d53034237d64de6317f24af52a" - integrity sha512-j3+9QeXIafuRMtk7N5Cmm/IiMSS/TOaybzfCv/LK+DP3hjEd8f8Az7hPmevUuOArvWNzUvoUeu30GmR3wABydA== +"@angular-devkit/architect@0.1703.7": + version "0.1703.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.7.tgz#5c7acde63fe39b5f6da12454c4f22ba4fb395f16" + integrity sha512-SwXbdsZqEE3JtvujCLChAii+FA20d1931VDjDYffrGWdQEViTBAr4NKtDr/kOv8KkgiL3fhGibPnRNUHTeAMtg== dependencies: - "@angular-devkit/core" "17.3.5" + "@angular-devkit/core" "17.3.7" rxjs "7.8.1" -"@angular-devkit/build-angular@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.5.tgz#a1b1fdfe906a0132191c0fee56c2a1dc0a1d5f8f" - integrity sha512-Ju2MkMidJglJq/iWgM9CNbhK7A/2n0LNYPZx+ucb+aOFWvurCQrU4Mt/es6xCsxOEs5OPhjqdva8mxE5FHwzTQ== +"@angular-devkit/build-angular@^17.3.7": + version "17.3.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.7.tgz#b294bd6e820b5c6a4f74cf90f57ecbc42a46c20d" + integrity sha512-AsV80kiFMIPIhm3uzJgOHDj4u6JteUkZedPTKAFFFJC7CTat1luW5qx306vfF7wj62aMvUl5g9HFWaeLghTQGA== dependencies: "@ampproject/remapping" "2.3.0" - "@angular-devkit/architect" "0.1703.5" - "@angular-devkit/build-webpack" "0.1703.5" - "@angular-devkit/core" "17.3.5" + "@angular-devkit/architect" "0.1703.7" + "@angular-devkit/build-webpack" "0.1703.7" + "@angular-devkit/core" "17.3.7" "@babel/core" "7.24.0" "@babel/generator" "7.23.6" "@babel/helper-annotate-as-pure" "7.22.5" @@ -47,7 +47,7 @@ "@babel/preset-env" "7.24.0" "@babel/runtime" "7.24.0" "@discoveryjs/json-ext" "0.5.7" - "@ngtools/webpack" "17.3.5" + "@ngtools/webpack" "17.3.7" "@vitejs/plugin-basic-ssl" "1.1.0" ansi-colors "4.1.3" autoprefixer "10.4.18" @@ -99,25 +99,14 @@ optionalDependencies: esbuild "0.20.1" -"@angular-devkit/build-webpack@0.1703.5": - version "0.1703.5" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.5.tgz#3f8912aacb5b0d986e1f86756a40e4d21b3d7855" - integrity sha512-KcoKlWhDP6+2q3laQ6elXLt2QrVxWJFdCPUC9dIm0Tnc997Tal/UVhlDKaZgITYDgDvRFqG+tzNm2uFd8l7h+A== +"@angular-devkit/build-webpack@0.1703.7": + version "0.1703.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.7.tgz#dc14b52a72b07d2476f4e6491ee80367efaff80d" + integrity sha512-gpt2Ia5I1gmdp3hdbtB7tkZTba5qWmKeVhlCYswa/LvbceKmkjedoeNRAoyr1UKM9GeGqt6Xl1B2eHzCH+ykrg== dependencies: - "@angular-devkit/architect" "0.1703.5" + "@angular-devkit/architect" "0.1703.7" rxjs "7.8.1" -"@angular-devkit/core@14.2.12": - version "14.2.12" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-14.2.12.tgz#7716cb8c3aa8436ba8d1189110b8f2ac30c25631" - integrity sha512-tg1+deEZdm3fgk2BQ6y7tujciL6qhtN5Ums266lX//kAZeZ4nNNXTBT+oY5xgfjvmLbW+xKg0XZrAS0oIRKY5g== - dependencies: - ajv "8.11.0" - ajv-formats "2.1.1" - jsonc-parser "3.1.0" - rxjs "6.6.7" - source-map "0.7.4" - "@angular-devkit/core@17.3.5": version "17.3.5" resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.5.tgz#5af01de95b4945587aea1feaa1011f87485ffee5" @@ -130,16 +119,17 @@ rxjs "7.8.1" source-map "0.7.4" -"@angular-devkit/schematics@14.2.12": - version "14.2.12" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-14.2.12.tgz#08ea5483440bec67b9ae62775c2ce789fedfd3b1" - integrity sha512-MN5yGR+SSSPPBBVMf4cifDJn9u0IYvxiHst+HWokH2AkBYy+vB1x8jYES2l1wkiISD7nvjTixfqX+Y95oMBoLg== +"@angular-devkit/core@17.3.7": + version "17.3.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.7.tgz#553b456cf9747eecdb1f7389127057bc5cb9f8e4" + integrity sha512-qpZ7BShyqS/Jqld36E7kL02cyb2pjn1Az1p9439SbP8nsvJgYlsyjwYK2Kmcn/Wi+TZGIKxkqxgBBw9vqGgeJw== dependencies: - "@angular-devkit/core" "14.2.12" - jsonc-parser "3.1.0" - magic-string "0.26.2" - ora "5.4.1" - rxjs "6.6.7" + ajv "8.12.0" + ajv-formats "2.1.1" + jsonc-parser "3.2.1" + picomatch "4.0.1" + rxjs "7.8.1" + source-map "0.7.4" "@angular-devkit/schematics@17.3.5": version "17.3.5" @@ -152,84 +142,96 @@ ora "5.4.1" rxjs "7.8.1" -"@angular-eslint/builder@^17.3.0": - version "17.3.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-17.3.0.tgz#a364b510a543368dfbc024516137134d5fc998b1" - integrity sha512-JXSZE7+KA3UGU6jwc0v9lwOIMptosrvLIOXGlXqrhHWEXfkfu3ENPq1Lm3K8jLndQ57XueEhC+Nab/AuUiWA/Q== +"@angular-devkit/schematics@17.3.7": + version "17.3.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.7.tgz#0b964b9216d51e7706656fdc0643fd9716461902" + integrity sha512-d7NKSwstdxYLYmPsbcYO3GOFNfXxXwOyHxSqDa1JNKoSzMdbLj4tvlCpfXw0ThNM7gioMx8aLBaaH1ac+yk06Q== + dependencies: + "@angular-devkit/core" "17.3.7" + jsonc-parser "3.2.1" + magic-string "0.30.8" + ora "5.4.1" + rxjs "7.8.1" + +"@angular-eslint/builder@^17.4.1": + version "17.4.1" + resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-17.4.1.tgz#783f6ebaf313832fb52975fa74951fcff2b8efd8" + integrity sha512-UVnErsAGXTi8OChkoSxDVVGV2jkFpTaXQT+0fgapSwaOt3Ki7BVwJJoNaX0Zs01c64bjNPZ5ONb/i6nC8QiP9Q== dependencies: - "@nx/devkit" "^17.2.8 || ^18.0.0" - nx "^17.2.8 || ^18.0.0" + "@nx/devkit" "^17.2.8 || ^18.0.0 || ^19.0.0" + nx "^17.2.8 || ^18.0.0 || ^19.0.0" -"@angular-eslint/bundled-angular-compiler@17.3.0": - version "17.3.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.3.0.tgz#08b8b1bebbb677a1f208b56516fc9177a289d212" - integrity sha512-ejfNzRuBeHUV8m2fkgs+M809rj5STuCuQo4fdfc6ccQpzXDI6Ha7BKpTznWfg5g529q/wrkoGSGgFxU9Yc2/dQ== +"@angular-eslint/bundled-angular-compiler@17.4.1": + version "17.4.1" + resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.4.1.tgz#87572adcf1332edc8965ae2d79dab5bbc7fe3253" + integrity sha512-QKQGspxsyMHRwvzqo+Fj42TS/vmnwOHuWC6EN+5KBx3cuImahqFHQW842zVy9f65jfH2xDnNWJ+NW+Tzcgg+pQ== -"@angular-eslint/eslint-plugin-template@17.3.0", "@angular-eslint/eslint-plugin-template@^17.3.0": - version "17.3.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.3.0.tgz#712a99503b4ef12e9f37979375539c3ace44375b" - integrity sha512-9l/aRfpE9MCRVDWRb+rSB9Zei0paep1vqV6M/87VUnzBnzqeMRnVuPvQowilh2zweVSGKBF25Vp4HkwOL6ExDQ== +"@angular-eslint/eslint-plugin-template@17.4.1", "@angular-eslint/eslint-plugin-template@^17.4.1": + version "17.4.1" + resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.4.1.tgz#073594241323f37de98f6b2185abe3e0b904cbfb" + integrity sha512-oYP7yzOpn63g1Mpwc8F8ERiywaGRhAs27ttI9t+5NXaLrwHSfc/AJleC7jjkB5xu1p88JY1mb4oIYOjeZAhHIg== dependencies: - "@angular-eslint/bundled-angular-compiler" "17.3.0" - "@angular-eslint/utils" "17.3.0" - "@typescript-eslint/type-utils" "7.2.0" - "@typescript-eslint/utils" "7.2.0" + "@angular-eslint/bundled-angular-compiler" "17.4.1" + "@angular-eslint/utils" "17.4.1" + "@typescript-eslint/type-utils" "7.8.0" + "@typescript-eslint/utils" "7.8.0" aria-query "5.3.0" axobject-query "4.0.0" -"@angular-eslint/eslint-plugin@17.3.0", "@angular-eslint/eslint-plugin@^17.3.0": - version "17.3.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-17.3.0.tgz#b5037877cdc64d407649247e5ca09851c8674b4e" - integrity sha512-81cQbOEPoQupFX8WmpqZn+y8VA7JdVRGBtt+uJNKBXcJknTpPWdLBZRFlgVakmC24iEZ0Fint/N3NBBQI3mz2A== +"@angular-eslint/eslint-plugin@17.4.1", "@angular-eslint/eslint-plugin@^17.4.1": + version "17.4.1" + resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-17.4.1.tgz#ad0c380bdacb7b508d1af573e5cbec533e530333" + integrity sha512-05bN1UB4H2CuX7Sw6fz+rMobsa+Bl3g15IYldH08hbJSnVemO8mf86bIjRN2Th79sO9WOiXXimnfIt7KRf8l0Q== dependencies: - "@angular-eslint/utils" "17.3.0" - "@typescript-eslint/utils" "7.2.0" + "@angular-eslint/bundled-angular-compiler" "17.4.1" + "@angular-eslint/utils" "17.4.1" + "@typescript-eslint/utils" "7.8.0" -"@angular-eslint/schematics@^17.3.0": - version "17.3.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-17.3.0.tgz#5b74c72580e3a571f91020302a1b906dd1bf0db8" - integrity sha512-5yssd5EOomxlKt9vN/OXXCTCuI3Pmfj16pkjBDoW0wzC8/M2l5zlXIEfoKumHYv2wtF553LhaMXVYVU35e0lTw== +"@angular-eslint/schematics@^17.4.1": + version "17.4.1" + resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-17.4.1.tgz#c77e26bded46de94d35258e83c8ad9f0b9461535" + integrity sha512-CYpsGc0B/ZGO/RKYlyfeAi1pOvFmVs4pvoHU13uOdhdFJ6nAUTujHiBaULloIrUmuIhGW9S0g6w4ecD6ZP680w== dependencies: - "@angular-eslint/eslint-plugin" "17.3.0" - "@angular-eslint/eslint-plugin-template" "17.3.0" - "@nx/devkit" "^17.2.8 || ^18.0.0" + "@angular-eslint/eslint-plugin" "17.4.1" + "@angular-eslint/eslint-plugin-template" "17.4.1" + "@nx/devkit" "^17.2.8 || ^18.0.0 || ^19.0.0" ignore "5.3.1" - nx "^17.2.8 || ^18.0.0" + nx "^17.2.8 || ^18.0.0 || ^19.0.0" strip-json-comments "3.1.1" tmp "0.2.3" -"@angular-eslint/template-parser@^17.3.0": - version "17.3.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-17.3.0.tgz#580a703cbaa4967d36a953a00f5c347987c14171" - integrity sha512-m+UzAnWgtjeS0x6skSmR0eXltD/p7HZA+c8pPyAkiHQzkxE7ohhfyZc03yWGuYJvWQUqQAKKdO/nQop14TP0bg== +"@angular-eslint/template-parser@^17.4.1": + version "17.4.1" + resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-17.4.1.tgz#173816992aa189b9f614293a303f1151f1995b07" + integrity sha512-fJQpwQXexgs7Z3yYpQAfuAkFB2Y5H8SSlo+eAPPafOOPpPSIm/yP4dQ2e06tE8zWB5yjYnVBMJnUKSmG5GJSDw== dependencies: - "@angular-eslint/bundled-angular-compiler" "17.3.0" + "@angular-eslint/bundled-angular-compiler" "17.4.1" eslint-scope "^8.0.0" -"@angular-eslint/utils@17.3.0": - version "17.3.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-17.3.0.tgz#85915e864c7b7f33df1fdf15f74cc99fd5895e1e" - integrity sha512-PJT9pxWqpvI9OXO+7L5SIVhvMW+RFjeafC7PYjtvSbNFpz+kF644BiAcfMJ0YqBnkrw3JXt+RAX25CT4mXIoXw== +"@angular-eslint/utils@17.4.1": + version "17.4.1" + resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-17.4.1.tgz#0483553b92865c95dfbfef74aa1d09dc914ae2a4" + integrity sha512-ptpWSrN7hfLtbStOB5vlwjh088WRu+sT1XIXCROrX5uXR5sQMu5ZitnoObSe+Of+1lugguPvMvFm/pzTMp3LIg== dependencies: - "@angular-eslint/bundled-angular-compiler" "17.3.0" - "@typescript-eslint/utils" "7.2.0" + "@angular-eslint/bundled-angular-compiler" "17.4.1" + "@typescript-eslint/utils" "7.8.0" -"@angular/animations@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.5.tgz#68f1f209137b3e7148143b66ab3a2b444ac9b546" - integrity sha512-hbfCnBxwhYQMKB+9tDcmfvckUtB8LdY1gPST6TZ7CzrWCSPddsnXxqxBZSBjBI6zXvE4FOV3kUzaUXM/Bq5sRw== +"@angular/animations@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.8.tgz#6f56ef7712c5acab6c2dd14afc82db52fee91e4e" + integrity sha512-ywT3dH0yZeAlo+Vu/6RpRozxzTbu4Bwqky6RgNfk/UMoyXZ5UiFStszDqO/HAyBGGCDHagm1XJkgsNZcStWq8A== dependencies: tslib "^2.3.0" -"@angular/cli@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.5.tgz#f668db09d283d669e42f166b7c9cfc0a8298b0a3" - integrity sha512-6MHJzPKy4uB9qlJO1eKs4rtDlRuCe0lOiz1f3kHFZ/GQQm5xA1xsmZJMN4ASsnu4yU3oZs6vJ/vt8i2/jvdPbA== +"@angular/cli@^17.3.7": + version "17.3.7" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.7.tgz#6125c9373024f9136163a0815be52ccbade1686f" + integrity sha512-JgCav3sdRCoJHwLXxmF/EMzArYjwbqB+AGUW/xIR98oZET8QxCB985bOFUAm02SkAEUVcMJvjxec+WCaa60m/A== dependencies: - "@angular-devkit/architect" "0.1703.5" - "@angular-devkit/core" "17.3.5" - "@angular-devkit/schematics" "17.3.5" - "@schematics/angular" "17.3.5" + "@angular-devkit/architect" "0.1703.7" + "@angular-devkit/core" "17.3.7" + "@angular-devkit/schematics" "17.3.7" + "@schematics/angular" "17.3.7" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.3" ini "4.1.2" @@ -245,17 +247,17 @@ symbol-observable "4.0.0" yargs "17.7.2" -"@angular/common@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.5.tgz#901f5d85b78f5e28f36156064961d58732e73a7b" - integrity sha512-Ox91WxSnOSrQ6I21cHi69EfT2Pxtd5Knb5AsdwpxqE57V2E7EnWMhb+LP+holCtFUhK529EGXCk788M+Elyw6g== +"@angular/common@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.8.tgz#d5b616f4cfb62703dd50f1cadacad686f61a1122" + integrity sha512-HEhTibrsWmoKilyhvAFmqg4SH1hWBP3eV9Y689lmsxBQCTRAmRI2pMAoRKQ+dBcoYLE/FZhcmdHJUSl5jR7Isg== dependencies: tslib "^2.3.0" -"@angular/compiler-cli@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.5.tgz#d24cb2039d130b03a898ec3bedf7cbabb573ba03" - integrity sha512-R53JNbbVDHWSGdL0e2vGQ5iJCrILOWZ1oemKjekOFB93fUBlEyi+nZmm4uTO7RU8PgjB0UpxI6ok5ZE3Amkt6A== +"@angular/compiler-cli@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.8.tgz#6f21fd2ef125eea786051180072e4a15a216620d" + integrity sha512-/TsbCmk7QJUEEZnRdNzi6znsPfoDJuy6vHDqcwWVEcw7y6W7DjirSFmtT9u1QwrV67KM6kOh22+RvPdGM8sPmg== dependencies: "@babel/core" "7.23.9" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -266,66 +268,75 @@ tslib "^2.3.0" yargs "^17.2.1" -"@angular/compiler@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.5.tgz#308ac763c2a95fb6cea764d1ec3e8bd5f2384b89" - integrity sha512-lTubBFNlpH9zK46+yeVI7VJQNUELLAB8W1ucndYLCA9Rr9Jop+rYIXijmr42AGokOYr7yLc8HRiSQ5e+X2pUQg== +"@angular/compiler@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.8.tgz#1499e30d5e0b02929aabf5bb8ee83871e0afd520" + integrity sha512-7vZSh2Oa95lZdRR4MhE0icvZ7JUuYY+NSo3eTSOMZSlH5I9rtwQoSFqfoGW+35rXCzGFLOhQmZBbXkxDPDs97Q== dependencies: tslib "^2.3.0" -"@angular/core@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.5.tgz#5445e5dad4dc713b032dde10dc048169afe998db" - integrity sha512-y6P27lcrKy3yMx/rtMuGsAnDyVEsS3BdyArTXcD0TOImVGHhVIaB0L95DUCam3ajTe2f2x39eozJZDh7QSpJaw== +"@angular/core@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.8.tgz#6a1e535d3b9a6bdbb52d67dfc89bdff2174ae1fd" + integrity sha512-+tUQ+B1yVvNbczzaWBCgJWWIgZ2z+GVJWu+UNOHHWzdqD8qpXjuIkDfnhyLNeGvvXgsqey4u6ApFf2SoFYLjuA== dependencies: tslib "^2.3.0" -"@angular/forms@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.5.tgz#68a1511c1c2b147d704f2579563840c3f94cb714" - integrity sha512-Rf/8XWHdFYZQaOVTJ0QVwxQm9fDqQqIJc0yfPcH/DYL5pT7R0U2z98I5McZawzUBJUo1Zt1gijzDlzNUGf6jiA== +"@angular/forms@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.8.tgz#2461bea5ae8f9c81bc12d2c5cd0f9864dedaaeb8" + integrity sha512-ZoPJMx3O1eKliK6oEUqtKJNqrLwwOLBC5x+zbCHrwJeBB3lbgWXrrnTrFvCXpp3QVERAboZTzZ3XBmHX1o6gmw== dependencies: tslib "^2.3.0" -"@angular/localize@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.5.tgz#2af9f4f5db3c0b99d55534ef14058c6831a2fb4d" - integrity sha512-/5iKRvnleA2vsf8zqNZaXeOBjFFq3FLrbot+ygfmk3uYqz949X0nXrXBKk9kpakw/WC6kgzK+tmiEHKQY6cLiQ== +"@angular/localize@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.8.tgz#a674b2645a69f0286169baa28a6db942e4047358" + integrity sha512-2Ddv58fmCfow/pBvvOzkNIc/pBtZpu6Ow0em+6Hx8ln6wwZaFHEPhe6t5SaRG2GTXWUqAnsjWSdNLlAviXOxtg== dependencies: "@babel/core" "7.23.9" "@types/babel__core" "7.20.5" fast-glob "3.3.2" yargs "^17.2.1" -"@angular/platform-browser-dynamic@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.5.tgz#39cedb2144e093a7b6127a694565c6b1afb8b872" - integrity sha512-KuS4j3Gh1h/CEj+bIOc/IcZIdiCB/DNbtUvz1eNp1o23aM8QutqelI3A4WBnQuR4yq8Z/8M3FH9F1OVwwhn2QQ== +"@angular/platform-browser-dynamic@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.8.tgz#fec1866c25dbe5f6850cac009e574141f0bf5bb2" + integrity sha512-uL6FPh+Pr9xzIjyiv3p66jteq/CytHP1+m5jOsIKa1LUwTXx0a2pmOYcZxXpNkQGR9Ir/dlbrYmKlSP3QZf7uw== dependencies: tslib "^2.3.0" -"@angular/platform-browser@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.5.tgz#f1b3832163a7bfccb8e7c3cafa0246226f03a6aa" - integrity sha512-ITlu/GTD64Sr0FMaFCJiHoTJrEZw8qRFXjPjv3BKhAp5dQKcwnCm02o1NOaj5d8oIItIh5fbI2zP0CSU2qNZkQ== +"@angular/platform-browser@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.8.tgz#a13d8efb82714c1d8ae8af602102a4d4daaf5b8d" + integrity sha512-UMGSV3TdJqMtf2xvhbW6fx8TKJLOoHQgFxohhy3y8GvxHBu+PUyrwhovb7r03bs+muY6u4ygGCMm7Mt1TFVwfQ== dependencies: tslib "^2.3.0" -"@angular/platform-server@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.3.5.tgz#ec2e293a3fa95692e89b0ef35483d261e8fa4fd9" - integrity sha512-cQRM+sj4NJZi6udXuoFowWIFLlHwUzNfS3WITbYw4iAI1qRgkVZctbA2aKU6lZg43lEDmts9TOqFB1smUXsdVA== +"@angular/platform-server@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.3.8.tgz#1fc0d3f142bb435d03a2c272807f80b1a76003b9" + integrity sha512-x0pHXL4Aw67b/1fML41GrDj7nLyAtJYy5b/HExM5IAGsheHTsNT5Vuxnh4onGWfOdW7D5LhqDPg1D5S5ZXWW4A== dependencies: tslib "^2.3.0" xhr2 "^0.2.0" -"@angular/router@^17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.5.tgz#6498d91560296424a2e2bc8a09cd0d9d81058a85" - integrity sha512-KsIIs3t9IpxsdMSrJDZzO5WgIWkVE6Ep5WWiSyPIgEfA+ndGpJLmyv0d/r1yKKlYUJxz7Hde55o4thgT2n2x/A== +"@angular/router@^17.3.8": + version "17.3.8" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.8.tgz#dbd17866ccc81fe826f4707b464bf48238a67c07" + integrity sha512-2JKTW1u1H+iNDfAmIjEiMJjQHfzb97TBk23/euIR0JuyGHjyywkrQ97HHiOEAJyy/Zpr0Vbem3HRqDqSfjTWvg== dependencies: tslib "^2.3.0" +"@asamuzakjp/dom-selector@^2.0.1": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@asamuzakjp/dom-selector/-/dom-selector-2.0.2.tgz#160f601d9a465bbdf641410afdc527f37325506e" + integrity sha512-x1KXOatwofR6ZAYzXRBL5wrdV0vwNxlTCK9NCuLqAzQYARqGcvFwiJA6A1ERuh+dgeA4Dxm3JBYictIes+SqUQ== + dependencies: + bidi-js "^1.0.3" + css-tree "^2.3.1" + is-potential-custom-element-name "^1.0.1" + "@babel/code-frame@^7.0.0": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" @@ -349,6 +360,14 @@ "@babel/highlight" "^7.23.4" chalk "^2.4.2" +"@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2": + version "7.24.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae" + integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ== + dependencies: + "@babel/highlight" "^7.24.2" + picocolors "^1.0.0" + "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" @@ -359,6 +378,11 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== +"@babel/compat-data@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a" + integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ== + "@babel/core@7.23.9": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" @@ -380,7 +404,7 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/core@7.24.0", "@babel/core@^7.12.3", "@babel/core@^7.23.3": +"@babel/core@7.24.0": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b" integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw== @@ -401,7 +425,28 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@7.23.6", "@babel/generator@^7.23.6": +"@babel/core@^7.12.3", "@babel/core@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717" + integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.24.2" + "@babel/generator" "^7.24.4" + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helpers" "^7.24.4" + "@babel/parser" "^7.24.4" + "@babel/template" "^7.24.0" + "@babel/traverse" "^7.24.1" + "@babel/types" "^7.24.0" + convert-source-map "^2.0.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + +"@babel/generator@7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== @@ -411,6 +456,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.23.6", "@babel/generator@^7.24.1", "@babel/generator@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498" + integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw== + dependencies: + "@babel/types" "^7.24.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@7.22.5", "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" @@ -473,6 +528,21 @@ "@babel/helper-split-export-declaration" "^7.22.6" semver "^6.3.1" +"@babel/helper-create-class-features-plugin@^7.24.1", "@babel/helper-create-class-features-plugin@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3" + integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-member-expression-to-functions" "^7.23.0" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-replace-supers" "^7.24.1" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + semver "^6.3.1" + "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4" @@ -502,6 +572,17 @@ lodash.debounce "^4.0.8" resolve "^1.14.2" +"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" + integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== + dependencies: + "@babel/helper-compilation-targets" "^7.22.6" + "@babel/helper-plugin-utils" "^7.22.5" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + "@babel/helper-environment-visitor@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" @@ -535,7 +616,7 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-member-expression-to-functions@^7.22.15": +"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366" integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA== @@ -549,6 +630,13 @@ dependencies: "@babel/types" "^7.22.15" +"@babel/helper-module-imports@^7.24.1": + version "7.24.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128" + integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg== + dependencies: + "@babel/types" "^7.24.0" + "@babel/helper-module-transforms@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" @@ -595,6 +683,15 @@ "@babel/helper-member-expression-to-functions" "^7.22.15" "@babel/helper-optimise-call-expression" "^7.22.5" +"@babel/helper-replace-supers@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz#7085bd19d4a0b7ed8f405c1ed73ccb70f323abc1" + integrity sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-member-expression-to-functions" "^7.23.0" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-simple-access@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" @@ -678,6 +775,15 @@ "@babel/traverse" "^7.24.0" "@babel/types" "^7.24.0" +"@babel/helpers@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6" + integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw== + dependencies: + "@babel/template" "^7.24.0" + "@babel/traverse" "^7.24.1" + "@babel/types" "^7.24.0" + "@babel/highlight@^7.22.13": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" @@ -705,6 +811,16 @@ chalk "^2.4.2" js-tokens "^4.0.0" +"@babel/highlight@^7.24.2": + version "7.24.2" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26" + integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + picocolors "^1.0.0" + "@babel/parser@^7.1.0", "@babel/parser@^7.20.7": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" @@ -730,6 +846,19 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac" integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg== +"@babel/parser@^7.24.1", "@babel/parser@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88" + integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg== + +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1" + integrity sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a" @@ -737,6 +866,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz#b645d9ba8c2bc5b7af50f0fe949f9edbeb07c8cf" + integrity sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d" @@ -746,6 +882,15 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-transform-optional-chaining" "^7.23.3" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz#da8261f2697f0f41b0855b91d3a20a1fbfd271d3" + integrity sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-transform-optional-chaining" "^7.24.1" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7": version "7.23.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b" @@ -754,6 +899,14 @@ "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz#1181d9685984c91d657b8ddf14f0487a6bab2988" + integrity sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-proposal-private-methods@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" @@ -809,6 +962,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-syntax-import-assertions@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz#db3aad724153a00eaac115a3fb898de544e34971" + integrity sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-import-attributes@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06" @@ -816,6 +976,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-syntax-import-attributes@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz#c66b966c63b714c4eec508fcf5763b1f2d381093" + integrity sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-import-meta@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" @@ -901,7 +1068,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-async-generator-functions@7.23.9", "@babel/plugin-transform-async-generator-functions@^7.23.9": +"@babel/plugin-transform-arrow-functions@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27" + integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + +"@babel/plugin-transform-async-generator-functions@7.23.9": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz#9adaeb66fc9634a586c5df139c6240d41ed801ce" integrity sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ== @@ -911,7 +1085,17 @@ "@babel/helper-remap-async-to-generator" "^7.22.20" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-transform-async-to-generator@7.23.3", "@babel/plugin-transform-async-to-generator@^7.23.3": +"@babel/plugin-transform-async-generator-functions@^7.23.9", "@babel/plugin-transform-async-generator-functions@^7.24.3": + version "7.24.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz#8fa7ae481b100768cc9842c8617808c5352b8b89" + integrity sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-remap-async-to-generator" "^7.22.20" + "@babel/plugin-syntax-async-generators" "^7.8.4" + +"@babel/plugin-transform-async-to-generator@7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa" integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw== @@ -920,6 +1104,15 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-remap-async-to-generator" "^7.22.20" +"@babel/plugin-transform-async-to-generator@^7.23.3", "@babel/plugin-transform-async-to-generator@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz#0e220703b89f2216800ce7b1c53cb0cf521c37f4" + integrity sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw== + dependencies: + "@babel/helper-module-imports" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-remap-async-to-generator" "^7.22.20" + "@babel/plugin-transform-block-scoped-functions@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77" @@ -927,6 +1120,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-block-scoped-functions@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz#1c94799e20fcd5c4d4589523bbc57b7692979380" + integrity sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-block-scoping@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5" @@ -934,6 +1134,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-block-scoping@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz#28f5c010b66fbb8ccdeef853bef1935c434d7012" + integrity sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-class-properties@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48" @@ -942,6 +1149,14 @@ "@babel/helper-create-class-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-class-properties@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz#bcbf1aef6ba6085cfddec9fc8d58871cf011fc29" + integrity sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-class-static-block@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5" @@ -951,6 +1166,15 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" +"@babel/plugin-transform-class-static-block@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz#1a4653c0cf8ac46441ec406dece6e9bc590356a4" + integrity sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.24.4" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-transform-classes@^7.23.8": version "7.23.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92" @@ -965,6 +1189,20 @@ "@babel/helper-split-export-declaration" "^7.22.6" globals "^11.1.0" +"@babel/plugin-transform-classes@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1" + integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-replace-supers" "^7.24.1" + "@babel/helper-split-export-declaration" "^7.22.6" + globals "^11.1.0" + "@babel/plugin-transform-computed-properties@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474" @@ -973,6 +1211,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/template" "^7.22.15" +"@babel/plugin-transform-computed-properties@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz#bc7e787f8e021eccfb677af5f13c29a9934ed8a7" + integrity sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/template" "^7.24.0" + "@babel/plugin-transform-destructuring@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311" @@ -980,6 +1226,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-destructuring@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345" + integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-dotall-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50" @@ -988,6 +1241,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-dotall-regex@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz#d56913d2f12795cc9930801b84c6f8c47513ac13" + integrity sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-duplicate-keys@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce" @@ -995,6 +1256,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-duplicate-keys@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz#5347a797fe82b8d09749d10e9f5b83665adbca88" + integrity sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-dynamic-import@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143" @@ -1003,6 +1271,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" +"@babel/plugin-transform-dynamic-import@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz#2a5a49959201970dd09a5fca856cb651e44439dd" + integrity sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-exponentiation-operator@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18" @@ -1011,6 +1287,14 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-exponentiation-operator@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz#6650ebeb5bd5c012d5f5f90a26613a08162e8ba4" + integrity sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-export-namespace-from@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191" @@ -1019,6 +1303,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" +"@babel/plugin-transform-export-namespace-from@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz#f033541fc036e3efb2dcb58eedafd4f6b8078acd" + integrity sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-transform-for-of@^7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e" @@ -1027,6 +1319,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" +"@babel/plugin-transform-for-of@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz#67448446b67ab6c091360ce3717e7d3a59e202fd" + integrity sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-transform-function-name@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc" @@ -1036,6 +1336,15 @@ "@babel/helper-function-name" "^7.23.0" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-function-name@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz#8cba6f7730626cc4dfe4ca2fa516215a0592b361" + integrity sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA== + dependencies: + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-json-strings@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d" @@ -1044,6 +1353,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-json-strings" "^7.8.3" +"@babel/plugin-transform-json-strings@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz#08e6369b62ab3e8a7b61089151b161180c8299f7" + integrity sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-transform-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4" @@ -1051,6 +1368,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-literals@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz#0a1982297af83e6b3c94972686067df588c5c096" + integrity sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-logical-assignment-operators@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5" @@ -1059,6 +1383,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" +"@babel/plugin-transform-logical-assignment-operators@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz#719d8aded1aa94b8fb34e3a785ae8518e24cfa40" + integrity sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-transform-member-expression-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc" @@ -1066,6 +1398,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-member-expression-literals@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz#896d23601c92f437af8b01371ad34beb75df4489" + integrity sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-modules-amd@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d" @@ -1074,6 +1413,14 @@ "@babel/helper-module-transforms" "^7.23.3" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-modules-amd@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz#b6d829ed15258536977e9c7cc6437814871ffa39" + integrity sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ== + dependencies: + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-modules-commonjs@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4" @@ -1083,6 +1430,15 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-simple-access" "^7.22.5" +"@babel/plugin-transform-modules-commonjs@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz#e71ba1d0d69e049a22bf90b3867e263823d3f1b9" + integrity sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw== + dependencies: + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-simple-access" "^7.22.5" + "@babel/plugin-transform-modules-systemjs@^7.23.9": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be" @@ -1093,6 +1449,16 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-validator-identifier" "^7.22.20" +"@babel/plugin-transform-modules-systemjs@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz#2b9625a3d4e445babac9788daec39094e6b11e3e" + integrity sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA== + dependencies: + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-validator-identifier" "^7.22.20" + "@babel/plugin-transform-modules-umd@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9" @@ -1101,6 +1467,14 @@ "@babel/helper-module-transforms" "^7.23.3" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-modules-umd@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz#69220c66653a19cf2c0872b9c762b9a48b8bebef" + integrity sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg== + dependencies: + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f" @@ -1116,6 +1490,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-new-target@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz#29c59988fa3d0157de1c871a28cd83096363cc34" + integrity sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-nullish-coalescing-operator@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e" @@ -1124,6 +1505,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" +"@babel/plugin-transform-nullish-coalescing-operator@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz#0cd494bb97cb07d428bd651632cb9d4140513988" + integrity sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-transform-numeric-separator@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29" @@ -1132,6 +1521,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" +"@babel/plugin-transform-numeric-separator@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz#5bc019ce5b3435c1cadf37215e55e433d674d4e8" + integrity sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-transform-object-rest-spread@^7.24.0": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz#7b836ad0088fdded2420ce96d4e1d3ed78b71df1" @@ -1143,6 +1540,16 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.23.3" +"@babel/plugin-transform-object-rest-spread@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz#5a3ce73caf0e7871a02e1c31e8b473093af241ff" + integrity sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA== + dependencies: + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.24.1" + "@babel/plugin-transform-object-super@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd" @@ -1151,6 +1558,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-replace-supers" "^7.22.20" +"@babel/plugin-transform-object-super@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz#e71d6ab13483cca89ed95a474f542bbfc20a0520" + integrity sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-replace-supers" "^7.24.1" + "@babel/plugin-transform-optional-catch-binding@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017" @@ -1159,6 +1574,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" +"@babel/plugin-transform-optional-catch-binding@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz#92a3d0efe847ba722f1a4508669b23134669e2da" + integrity sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017" @@ -1168,6 +1591,15 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-syntax-optional-chaining" "^7.8.3" +"@babel/plugin-transform-optional-chaining@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6" + integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-transform-parameters@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af" @@ -1175,6 +1607,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-parameters@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510" + integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-private-methods@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4" @@ -1183,6 +1622,14 @@ "@babel/helper-create-class-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-private-methods@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz#a0faa1ae87eff077e1e47a5ec81c3aef383dc15a" + integrity sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-private-property-in-object@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5" @@ -1193,6 +1640,16 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" +"@babel/plugin-transform-private-property-in-object@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz#756443d400274f8fb7896742962cc1b9f25c1f6a" + integrity sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-transform-property-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875" @@ -1200,6 +1657,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-property-literals@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz#d6a9aeab96f03749f4eebeb0b6ea8e90ec958825" + integrity sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-regenerator@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c" @@ -1208,6 +1672,14 @@ "@babel/helper-plugin-utils" "^7.22.5" regenerator-transform "^0.15.2" +"@babel/plugin-transform-regenerator@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz#625b7545bae52363bdc1fbbdc7252b5046409c8c" + integrity sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + regenerator-transform "^0.15.2" + "@babel/plugin-transform-reserved-words@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8" @@ -1215,6 +1687,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-reserved-words@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz#8de729f5ecbaaf5cf83b67de13bad38a21be57c1" + integrity sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-runtime@7.24.0": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz#e308fe27d08b74027d42547081eefaf4f2ffbcc9" @@ -1234,6 +1713,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-shorthand-properties@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55" + integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-spread@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c" @@ -1242,6 +1728,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" +"@babel/plugin-transform-spread@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz#a1acf9152cbf690e4da0ba10790b3ac7d2b2b391" + integrity sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-transform-sticky-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04" @@ -1249,6 +1743,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-sticky-regex@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz#f03e672912c6e203ed8d6e0271d9c2113dc031b9" + integrity sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-template-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07" @@ -1256,6 +1757,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-template-literals@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7" + integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-typeof-symbol@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4" @@ -1263,6 +1771,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-typeof-symbol@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz#6831f78647080dec044f7e9f68003d99424f94c7" + integrity sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-unicode-escapes@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925" @@ -1270,6 +1785,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-unicode-escapes@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz#fb3fa16676549ac7c7449db9b342614985c2a3a4" + integrity sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-unicode-property-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad" @@ -1278,6 +1800,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-unicode-property-regex@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz#56704fd4d99da81e5e9f0c0c93cabd91dbc4889e" + integrity sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-unicode-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc" @@ -1286,6 +1816,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-unicode-regex@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz#57c3c191d68f998ac46b708380c1ce4d13536385" + integrity sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-unicode-sets-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e" @@ -1294,7 +1832,15 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@7.24.0", "@babel/preset-env@^7.23.3": +"@babel/plugin-transform-unicode-sets-regex@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz#c1ea175b02afcffc9cf57a9c4658326625165b7f" + integrity sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + +"@babel/preset-env@7.24.0": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.0.tgz#11536a7f4b977294f0bdfad780f01a8ac8e183fc" integrity sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA== @@ -1380,6 +1926,93 @@ core-js-compat "^3.31.0" semver "^6.3.1" +"@babel/preset-env@^7.24.4": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.4.tgz#46dbbcd608771373b88f956ffb67d471dce0d23b" + integrity sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A== + dependencies: + "@babel/compat-data" "^7.24.4" + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-validator-option" "^7.23.5" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.4" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.1" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.1" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.1" + "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-import-assertions" "^7.24.1" + "@babel/plugin-syntax-import-attributes" "^7.24.1" + "@babel/plugin-syntax-import-meta" "^7.10.4" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" + "@babel/plugin-transform-arrow-functions" "^7.24.1" + "@babel/plugin-transform-async-generator-functions" "^7.24.3" + "@babel/plugin-transform-async-to-generator" "^7.24.1" + "@babel/plugin-transform-block-scoped-functions" "^7.24.1" + "@babel/plugin-transform-block-scoping" "^7.24.4" + "@babel/plugin-transform-class-properties" "^7.24.1" + "@babel/plugin-transform-class-static-block" "^7.24.4" + "@babel/plugin-transform-classes" "^7.24.1" + "@babel/plugin-transform-computed-properties" "^7.24.1" + "@babel/plugin-transform-destructuring" "^7.24.1" + "@babel/plugin-transform-dotall-regex" "^7.24.1" + "@babel/plugin-transform-duplicate-keys" "^7.24.1" + "@babel/plugin-transform-dynamic-import" "^7.24.1" + "@babel/plugin-transform-exponentiation-operator" "^7.24.1" + "@babel/plugin-transform-export-namespace-from" "^7.24.1" + "@babel/plugin-transform-for-of" "^7.24.1" + "@babel/plugin-transform-function-name" "^7.24.1" + "@babel/plugin-transform-json-strings" "^7.24.1" + "@babel/plugin-transform-literals" "^7.24.1" + "@babel/plugin-transform-logical-assignment-operators" "^7.24.1" + "@babel/plugin-transform-member-expression-literals" "^7.24.1" + "@babel/plugin-transform-modules-amd" "^7.24.1" + "@babel/plugin-transform-modules-commonjs" "^7.24.1" + "@babel/plugin-transform-modules-systemjs" "^7.24.1" + "@babel/plugin-transform-modules-umd" "^7.24.1" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" + "@babel/plugin-transform-new-target" "^7.24.1" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.1" + "@babel/plugin-transform-numeric-separator" "^7.24.1" + "@babel/plugin-transform-object-rest-spread" "^7.24.1" + "@babel/plugin-transform-object-super" "^7.24.1" + "@babel/plugin-transform-optional-catch-binding" "^7.24.1" + "@babel/plugin-transform-optional-chaining" "^7.24.1" + "@babel/plugin-transform-parameters" "^7.24.1" + "@babel/plugin-transform-private-methods" "^7.24.1" + "@babel/plugin-transform-private-property-in-object" "^7.24.1" + "@babel/plugin-transform-property-literals" "^7.24.1" + "@babel/plugin-transform-regenerator" "^7.24.1" + "@babel/plugin-transform-reserved-words" "^7.24.1" + "@babel/plugin-transform-shorthand-properties" "^7.24.1" + "@babel/plugin-transform-spread" "^7.24.1" + "@babel/plugin-transform-sticky-regex" "^7.24.1" + "@babel/plugin-transform-template-literals" "^7.24.1" + "@babel/plugin-transform-typeof-symbol" "^7.24.1" + "@babel/plugin-transform-unicode-escapes" "^7.24.1" + "@babel/plugin-transform-unicode-property-regex" "^7.24.1" + "@babel/plugin-transform-unicode-regex" "^7.24.1" + "@babel/plugin-transform-unicode-sets-regex" "^7.24.1" + "@babel/preset-modules" "0.1.6-no-external-plugins" + babel-plugin-polyfill-corejs2 "^0.4.10" + babel-plugin-polyfill-corejs3 "^0.10.4" + babel-plugin-polyfill-regenerator "^0.6.1" + core-js-compat "^3.31.0" + semver "^6.3.1" + "@babel/preset-modules@0.1.6-no-external-plugins": version "0.1.6-no-external-plugins" resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a" @@ -1460,6 +2093,22 @@ debug "^4.3.1" globals "^11.1.0" +"@babel/traverse@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c" + integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ== + dependencies: + "@babel/code-frame" "^7.24.1" + "@babel/generator" "^7.24.1" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.24.1" + "@babel/types" "^7.24.0" + debug "^4.3.1" + globals "^11.1.0" + "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" @@ -1741,36 +2390,36 @@ "@types/conventional-commits-parser" "^5.0.0" chalk "^5.3.0" -"@compodoc/compodoc@^1.1.23": - version "1.1.23" - resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.1.23.tgz#b0a643245a6c7a00e18db3c90640898df17f212a" - integrity sha512-5Zfx+CHKTxLD+TxCGt1U8krnEBCWPVxCLt3jCJEN55AzhTluo8xlMenaXlJsuVqL4Lmo/OTTzEXrm9zoQKh/3w== +"@compodoc/compodoc@^1.1.24": + version "1.1.24" + resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.1.24.tgz#d6a3f5a6098cebcdf31133a16524953fcc00a79c" + integrity sha512-m1NNB8N1V87cXzuts/t3FO5UFnbvhJUVO9rB/+QeIvTDpUy1MYprvZQNTWEEMXPg4+J7lXfTRc55KMLiB79jkA== dependencies: - "@angular-devkit/schematics" "14.2.12" - "@babel/core" "^7.23.3" + "@angular-devkit/schematics" "17.3.5" + "@babel/core" "^7.24.4" "@babel/plugin-proposal-private-methods" "^7.18.6" - "@babel/preset-env" "^7.23.3" + "@babel/preset-env" "^7.24.4" "@compodoc/live-server" "^1.2.3" "@compodoc/ngd-transformer" "^2.1.3" - bootstrap.native "^5.0.10" + bootstrap.native "^5.0.12" chalk "4.1.2" cheerio "^1.0.0-rc.12" - chokidar "^3.5.3" + chokidar "^3.6.0" colors "1.4.0" - commander "^11.1.0" - cosmiconfig "^8.3.6" + commander "^12.0.0" + cosmiconfig "^9.0.0" decache "^4.6.2" es6-shim "^0.35.8" fancy-log "^2.0.0" fast-glob "^3.3.2" - fs-extra "^11.1.1" - glob "^10.3.10" + fs-extra "^11.2.0" + glob "^10.3.12" handlebars "^4.7.8" - html-entities "^2.4.0" - i18next "^23.7.6" + html-entities "^2.5.2" + i18next "^23.11.2" json5 "^2.2.3" lodash "^4.17.21" - loglevel "^1.8.1" + loglevel "^1.9.1" loglevel-plugin-prefix "^0.8.4" lunr "^2.3.9" marked "7.0.3" @@ -1778,13 +2427,13 @@ opencollective-postinstall "^2.0.3" os-name "4.0.1" pdfjs-dist "2.12.313" - pdfmake "^0.2.8" + pdfmake "^0.2.10" prismjs "^1.29.0" - semver "^7.5.4" + semver "^7.6.0" svg-pan-zoom "^3.6.1" tablesort "^5.3.0" - traverse "^0.6.7" - ts-morph "^20.0.0" + traverse "^0.6.9" + ts-morph "^22.0.0" uuid "^9.0.1" vis "^4.21.0-EOL" zepto "^1.2.0" @@ -1828,6 +2477,14 @@ dot "^2.0.0-beta.1" fs-extra "^11.1.1" +"@conventional-changelog/git-client@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@conventional-changelog/git-client/-/git-client-1.0.1.tgz#143be2777ba389c3c14f83fa19b7cab6a49a503b" + integrity sha512-PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw== + dependencies: + "@types/semver" "^7.5.5" + semver "^7.5.2" + "@digitalbazaar/http-client@^3.4.1": version "3.4.1" resolved "https://registry.yarnpkg.com/@digitalbazaar/http-client/-/http-client-3.4.1.tgz#5116fc44290d647cfe4b615d1f3fad9d6005e44d" @@ -1842,11 +2499,14 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@es-joy/jsdoccomment@~0.42.0": - version "0.42.0" - resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.42.0.tgz#59e878708336aaee88c2b34c894f73dbf77ae2b0" - integrity sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw== +"@es-joy/jsdoccomment@~0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.43.0.tgz#35c295cadd0a939d1a3a6cd1548f66ec76d38870" + integrity sha512-Q1CnsQrytI3TlCB1IVWXWeqUIPGVEKGaE7IbVdt13Nq/3i0JESAkQQERrfiQkmlpijl+++qyqPgaS31Bvc1jRQ== dependencies: + "@types/eslint" "^8.56.5" + "@types/estree" "^1.0.5" + "@typescript-eslint/types" "^7.2.0" comment-parser "1.4.1" esquery "^1.5.0" jsdoc-type-pratt-parser "~4.0.0" @@ -2327,7 +2987,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jridgewell/trace-mapping@^0.3.24": +"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -2395,10 +3055,10 @@ dependencies: tslib "^2.3.0" -"@ngtools/webpack@17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.5.tgz#5f1a8d6e59e8fb37b8f1a4fe69116d9f46f2102f" - integrity sha512-0heI0yHUckdGI8uywu/wkp24KR/tdYMKYJOaYIU+9JydyN1zJRpbR7x0thddl7+k/zu2ZGbfFdv1779Ecw/xdA== +"@ngtools/webpack@17.3.7": + version "17.3.7" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.7.tgz#e12f98a254a9ec179fe519ee7c3c0e12fd250c32" + integrity sha512-kQNS68jsPQlaWAnKcVeFKNHp6K90uQANvq+9oXb/i+JnYWzuBsHzn2r8bVdMmvjd1HdBRiGtg767XRk3u+jgRw== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -2500,84 +3160,85 @@ read-package-json-fast "^3.0.0" which "^4.0.0" -"@nrwl/devkit@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-18.1.1.tgz#ae25b415df60d1d3ba56dd51389eea160ac72b65" - integrity sha512-CaOMlgun8D077PwEJOxD3gV/5/Hva+JK+XUI7kwf/RWl4MI3Oe1RzgWjigvony/AapkXadfAAzqmEAg5QD6AcA== +"@nrwl/devkit@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-19.0.3.tgz#47203bedca5aa484cabd0bc9c5df678bad006c70" + integrity sha512-v28C6v1NdfVdGtDETj10A4qiutEnSbbbR1/5LJYfNgamHQY7GDrFUC9tk+DYaPn2glcvOHLWXYvyQMGYOe+H6Q== dependencies: - "@nx/devkit" "18.1.1" + "@nx/devkit" "19.0.3" -"@nrwl/tao@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-18.1.1.tgz#5e6e7f4c017856fba66aca3ab27a7f75a0ccc856" - integrity sha512-6xkDBmXu2tF2ZdUvDtzvDIRS3xYsgzH4X96W0okEzT7vtWCu3mkpn4uybM/Ttsd5bOUfjNkDzTRU2mK7sGEjjA== +"@nrwl/tao@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-19.0.3.tgz#c373000a814f69b916c7d071229f4436242f5cbc" + integrity sha512-nBFCplOrix/BV32oLMkO+b3WM8HAb0E0B3wXOW2GDc/Pc+aKgRTsnkG/Kjcz6i2lIk+FjWvi7DewDIZzSUFFuA== dependencies: - nx "18.1.1" + nx "19.0.3" tslib "^2.3.0" -"@nx/devkit@18.1.1", "@nx/devkit@^17.2.8 || ^18.0.0": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-18.1.1.tgz#f35b47e8e62c865ad004a2a2acb0c73a7d0f818b" - integrity sha512-loY9rSU9GiZU5+SBHY+zrF9j8/f422NcGVYIlWD4aZUTlEeJzaGVk2JtsLEbwyxWuJ8z+jZG7PkpCOp9tfIlbg== +"@nx/devkit@19.0.3", "@nx/devkit@^17.2.8 || ^18.0.0 || ^19.0.0": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-19.0.3.tgz#e70f1bfae314b058f0d88db555ad1500a350b22c" + integrity sha512-FxKsnN/PFFnhQtdOcHqEqnEpsfmIncYrzdA/aKgiZ/V6APuNuZBVNd5jO6EO39uvT413CHQs5+fdE+btc03AUA== dependencies: - "@nrwl/devkit" "18.1.1" + "@nrwl/devkit" "19.0.3" ejs "^3.1.7" enquirer "~2.3.6" ignore "^5.0.4" + minimatch "9.0.3" semver "^7.5.3" tmp "~0.2.1" tslib "^2.3.0" yargs-parser "21.1.1" -"@nx/nx-darwin-arm64@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-18.1.1.tgz#7347a0bbafc48beabddfa80af735ea702d221174" - integrity sha512-66NzEuGekWk+pHfBh7otEQNYkQtkeulwZSi/A+CE+YmxBe7tkUwWldR1fpwblHj9pa9zP5cSA1BBXJYSgm1kug== - -"@nx/nx-darwin-x64@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-18.1.1.tgz#98ca08ebccd0c77701182537d00ccda82ca372f8" - integrity sha512-Er+NWYPTPBZTfLYKse9SVj028iR/OJ8dUNLYAToft89ZlsO5AwKy0qSFVNQguhtuxex+f0yomUTH/GApHzklGw== - -"@nx/nx-freebsd-x64@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-18.1.1.tgz#276baa52507dbd95bb1300da4e6a4acc437aa51c" - integrity sha512-sRvlLTSO2LTQXFarvytjLzv1O3L7YvADfjYmQr1io5YqWpYL5s1ujUFaLnfGPae45uc9qu9YMagsEYsiCOH04Q== - -"@nx/nx-linux-arm-gnueabihf@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-18.1.1.tgz#b07cad6605a4aaaad3d7216151267ef924d395b7" - integrity sha512-yzWYaHJj0Yvztd+gUEfqdBwgZPpayrc1OAxfCxqdajuF7kAmjck4Ufz0xn0rcE8nyLdCZMc2Nz1M92cqhw1u/g== - -"@nx/nx-linux-arm64-gnu@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-18.1.1.tgz#3d47d55b52ab4b88129b03dfc670b58b9f91b528" - integrity sha512-RPiO2nTwbWtJyG44Ot1H1kmVbAXn7AIzs5itcS/I+/tvkiyh8SGx4BkjctxYyc8DUAhkjVv6GzZdiT5O0OCshw== - -"@nx/nx-linux-arm64-musl@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-18.1.1.tgz#e46ba13f5b006179d5f46a1a7b6a0e217dfac566" - integrity sha512-4t0aTVEIlbMeqpJWi08qrieeo0apxPHevqvpCnuM8BfMNHOvMvKgQNBy7Cd2WOlfdCtgf4RfUlqFHfRUAA7NZA== - -"@nx/nx-linux-x64-gnu@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-18.1.1.tgz#6ecf0cfa14389e94686656dcc762ed5e110015f9" - integrity sha512-0zeU1qyQfFKnvnga0/KhOjZnNOUr4iADbMGsrlRL+BmS5jpN+/HXJ43TOucw7N1pittYoGqwhenisAaQ8YQi/Q== - -"@nx/nx-linux-x64-musl@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-18.1.1.tgz#3a9c4528074820716acbcace2eed59e5bc199ba6" - integrity sha512-bXqHRjCbZz7SDKFQSYU/2GQhFJzaKsh2+CWEeKjc1nBXVSX+UCrRdfinEqs6Fr6rHRC7q8OBcRtYvI2eAijxzw== - -"@nx/nx-win32-arm64-msvc@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-18.1.1.tgz#d3a73e1ae9c9535fcd86386804467937d2267372" - integrity sha512-xMR2OF99W4OFDXb4yHjoAhN5Pexw6qjMHCG0wEMVN+WYI+NVLNTTFzectXSjYtpjN2n6oPt6RbcOLRSCotqCFg== - -"@nx/nx-win32-x64-msvc@18.1.1": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-18.1.1.tgz#84bd634350512de66eb6291073ff03832c1d76c7" - integrity sha512-MD6iUpe03eYl7NUwI5yHVqah3HjcTkb/NRfA/cHzkA0ZORpWjyZvUabV0pEyNN2/euGIvZTq1Zg1eyN0ac+dfg== +"@nx/nx-darwin-arm64@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.0.3.tgz#b8e8c118ea521a8e94b76e06891130cbc683ea0b" + integrity sha512-poY89jbL44l5WP18Y+JQImnJLZN8jBROtnB6cFhAc/pfAG4pjLTxMyRrXU9QD/nYubsPNZhrN8NyE3/7J0F8zw== + +"@nx/nx-darwin-x64@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-19.0.3.tgz#4c7b6ebed9ec010c09d43c145f4c8b4ab9e01049" + integrity sha512-3CYt3hzP32Qrqo30C4YhhOn+eOePd3w5ibndJl94fhz5tDv2C32axuv0Md/3R5/28W0goB6pY6NfVtJwybXkKA== + +"@nx/nx-freebsd-x64@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.0.3.tgz#35e5e5433d0ec8de9da2275d32b6fb554897d6ff" + integrity sha512-AaRhDmjUGHvNV6AzT87VCxOTENPxl+JVvFBv8jd8CGzqsouvU+vDEagJ9B2zz7+mx4NZUSyQNYUTF8os9p8fZw== + +"@nx/nx-linux-arm-gnueabihf@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.0.3.tgz#14ec6fa69a82a96ae2a2f2bb9d35c0f9b4cf8ded" + integrity sha512-25jrFaWvzPP9aMMGMG4EXW2qeD6abxP9wcbXAK69jLjNatiwAfVTEvwWZCWZ+WZYGWPpondGQFyFv99lt4DivQ== + +"@nx/nx-linux-arm64-gnu@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.0.3.tgz#1257f08b4f6f077c9a84b40c99a6351a14fb48d0" + integrity sha512-p3X1UEu8RkvQAl2Soc4sQw8aQIFDq/J7cx2sO44NWboswkm0uU8ZDnQLQ3gq3uYqurAwPkJgH37BNGOQKcUcGA== + +"@nx/nx-linux-arm64-musl@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.0.3.tgz#eaaec49e80d66441e7814f6a82d2e112818a04fd" + integrity sha512-kVHabpFZ7mfQ6gfzLetfmjJUfLGcijpwYHBe8QCqqoiWj/i9MAxE1/I8K5t32VIEr6vdPJsshmVJvXCUewtvxQ== + +"@nx/nx-linux-x64-gnu@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.0.3.tgz#7cf7891885aef85d52a5d229dc86a66ab3c50638" + integrity sha512-DnXWWN7xHXHA5ij8Dc09FS5vBjs4Ea2JvTttR98GT7+yLAgoxt8hDjUPzRNpbTQZUyf+bTSbpgmwTlHyXLquCQ== + +"@nx/nx-linux-x64-musl@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.0.3.tgz#fa9a64c4496856093fba62e055a4dc5082e2016d" + integrity sha512-RvyRHXpNDobseddECfLpPZ/AO/a2NQjNvJ/FDpj3Gdogle985qW/Wv7BzXBb4p4C2xyqBC6fgzi6kRV6P/s5IA== + +"@nx/nx-win32-arm64-msvc@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.0.3.tgz#1ad9df8c4e421c06671f3a4f4167b52aa40d7b4d" + integrity sha512-t/LYcwN5t8F9atzMszU0e6tOsYLZ5hmuuJUbLKLgzbpNhycvDI/t5m7zkOH8D8Ki7pRx6IjboZ27LAXeTqFhdA== + +"@nx/nx-win32-x64-msvc@19.0.3": + version "19.0.3" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.0.3.tgz#e2d88643ce049478519ec26437330965df279dc7" + integrity sha512-xoL12yHpWJAVtgpQAcDdX9Og42q3FXRCzTDnt2X/yBynbTF+bSoMh/LtsuYaZ8H8OZ0Q4NcfreSByMreh8/jWg== "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -2671,13 +3332,13 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz#10491ccf4f63c814d4149e0316541476ea603602" integrity sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ== -"@schematics/angular@17.3.5": - version "17.3.5" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.5.tgz#c58a6afef977e9280cc7a5e24e70b058f68fdc5e" - integrity sha512-SWCK16Eob0K86hpZ3NHmrTS6LSzTlhvnIdf3BXC6nzoiyDhcAS0oJ2Tjdq1opW/PaL1hB7MulcbIhxYln5du0w== +"@schematics/angular@17.3.7": + version "17.3.7" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.7.tgz#0e033e9a999ffcfc24cb2ce36529b5b5d5241312" + integrity sha512-HaJroKaberriP4wFefTTSVFrtU9GMvnG3I6ELbOteOyKMH7o2V91FXGJDJ5KnIiLRlBmC30G3r+9Ybc/rtAYkw== dependencies: - "@angular-devkit/core" "17.3.5" - "@angular-devkit/schematics" "17.3.5" + "@angular-devkit/core" "17.3.7" + "@angular-devkit/schematics" "17.3.7" jsonc-parser "3.2.1" "@sigstore/bundle@^2.1.1": @@ -2739,24 +3400,24 @@ resolved "https://registry.yarnpkg.com/@thednp/event-listener/-/event-listener-2.0.4.tgz#76400393849e6e5d1e7cb8bcf23e3f184dfe1865" integrity sha512-sc4B7AzYAIvnGnivirq0XyR7LfzEDhGiiB70Q0qdNn8wSJ2pL1buVAsEZxrlc47qRJiBV4YIP+BFkyMm2r3NLg== -"@thednp/shorty@2.0.0-alpha22": - version "2.0.0-alpha22" - resolved "https://registry.yarnpkg.com/@thednp/shorty/-/shorty-2.0.0-alpha22.tgz#ac728ecd1d95a69602b796665febee65939cbb6f" - integrity sha512-BpXSRRGKJyZcP1OLBM2G7i+zcWGEA+6oHPwHs8GdaHykJDroDl+UaDEQX+PGiIxItosvY4hmF8zU2vG2JQ/qkQ== +"@thednp/shorty@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@thednp/shorty/-/shorty-2.0.0.tgz#e05e6754032c091f599ac0c4ed7efde6558bdedb" + integrity sha512-kwtLivCxYIoFfGIVU4NlZtfdA/zxZ6X8UcWaJrb7XqU3WQ4Q1p5IaZlLBfOVAO06WH5oWE87QUdK/dS56Wnfjg== "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== -"@ts-morph/common@~0.21.0": - version "0.21.0" - resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.21.0.tgz#30272bde654127326d8b73643b9a8de280135fb4" - integrity sha512-ES110Mmne5Vi4ypUKrtVQfXFDtCsDXiUiGxF6ILVlE90dDD4fdpC1LSjydl/ml7xJWKSDZwUYD2zkOePMSrPBA== +"@ts-morph/common@~0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.23.0.tgz#bd4ddbd3f484f29476c8bd985491592ae5fc147e" + integrity sha512-m7Lllj9n/S6sOkCkRftpM7L24uvmfXQFedlW/4hENcuJH1HHm9u5EgxZb9uVjQSCGrbBWBkOGgcTxNg36r6ywA== dependencies: - fast-glob "^3.2.12" - minimatch "^7.4.3" - mkdirp "^2.1.6" + fast-glob "^3.3.2" + minimatch "^9.0.3" + mkdirp "^3.0.1" path-browserify "^1.0.1" "@tufjs/canonical-json@2.0.0": @@ -3080,6 +3741,14 @@ "@types/estree" "*" "@types/json-schema" "*" +"@types/eslint@^8.56.5": + version "8.56.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" + integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + "@types/estree@*": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" @@ -3167,10 +3836,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg== -"@types/node@^18.19.31": - version "18.19.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.31.tgz#b7d4a00f7cb826b60a543cebdbda5d189aaecdcd" - integrity sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA== +"@types/node@^18.19.33": + version "18.19.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.33.tgz#98cd286a1b8a5e11aa06623210240bcc28e95c48" + integrity sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A== dependencies: undici-types "~5.26.4" @@ -3199,7 +3868,7 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a" integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw== -"@types/semver@^7.5.8": +"@types/semver@^7.5.5", "@types/semver@^7.5.8": version "7.5.8" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== @@ -3242,32 +3911,30 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz#50a9044e3e5fe76b22caf64fb7fc1f97614bdbfd" - integrity sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q== +"@typescript-eslint/eslint-plugin@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.9.0.tgz#093b96fc4e342226e65d5f18f9c87081e0b04a31" + integrity sha512-6e+X0X3sFe/G/54aC3jt0txuMTURqLyekmEHViqyA2VnxhLMpvA6nqmcjIy+Cr9tLDHPssA74BP5Mx9HQIxBEA== dependencies: "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "7.7.1" - "@typescript-eslint/type-utils" "7.7.1" - "@typescript-eslint/utils" "7.7.1" - "@typescript-eslint/visitor-keys" "7.7.1" - debug "^4.3.4" + "@typescript-eslint/scope-manager" "7.9.0" + "@typescript-eslint/type-utils" "7.9.0" + "@typescript-eslint/utils" "7.9.0" + "@typescript-eslint/visitor-keys" "7.9.0" graphemer "^1.4.0" ignore "^5.3.1" natural-compare "^1.4.0" - semver "^7.6.0" ts-api-utils "^1.3.0" -"@typescript-eslint/parser@^7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.7.1.tgz#f940e9f291cdca40c46cb75916217d3a42d6ceea" - integrity sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw== +"@typescript-eslint/parser@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.9.0.tgz#fb3ba01b75e0e65cb78037a360961b00301f6c70" + integrity sha512-qHMJfkL5qvgQB2aLvhUSXxbK7OLnDkwPzFalg458pxQgfxKDfT1ZDbHQM/I6mDIf/svlMkj21kzKuQ2ixJlatQ== dependencies: - "@typescript-eslint/scope-manager" "7.7.1" - "@typescript-eslint/types" "7.7.1" - "@typescript-eslint/typescript-estree" "7.7.1" - "@typescript-eslint/visitor-keys" "7.7.1" + "@typescript-eslint/scope-manager" "7.9.0" + "@typescript-eslint/types" "7.9.0" + "@typescript-eslint/typescript-estree" "7.9.0" + "@typescript-eslint/visitor-keys" "7.9.0" debug "^4.3.4" "@typescript-eslint/scope-manager@6.21.0": @@ -3278,39 +3945,39 @@ "@typescript-eslint/types" "6.21.0" "@typescript-eslint/visitor-keys" "6.21.0" -"@typescript-eslint/scope-manager@7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da" - integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg== +"@typescript-eslint/scope-manager@7.8.0": + version "7.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz#bb19096d11ec6b87fb6640d921df19b813e02047" + integrity sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g== dependencies: - "@typescript-eslint/types" "7.2.0" - "@typescript-eslint/visitor-keys" "7.2.0" + "@typescript-eslint/types" "7.8.0" + "@typescript-eslint/visitor-keys" "7.8.0" -"@typescript-eslint/scope-manager@7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz#07fe59686ca843f66e3e2b5c151522bc38effab2" - integrity sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA== +"@typescript-eslint/scope-manager@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.9.0.tgz#1dd3e63a4411db356a9d040e75864851b5f2619b" + integrity sha512-ZwPK4DeCDxr3GJltRz5iZejPFAAr4Wk3+2WIBaj1L5PYK5RgxExu/Y68FFVclN0y6GGwH8q+KgKRCvaTmFBbgQ== dependencies: - "@typescript-eslint/types" "7.7.1" - "@typescript-eslint/visitor-keys" "7.7.1" + "@typescript-eslint/types" "7.9.0" + "@typescript-eslint/visitor-keys" "7.9.0" -"@typescript-eslint/type-utils@7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz#7be5c30e9b4d49971b79095a1181324ef6089a19" - integrity sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA== +"@typescript-eslint/type-utils@7.8.0": + version "7.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz#9de166f182a6e4d1c5da76e94880e91831e3e26f" + integrity sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A== dependencies: - "@typescript-eslint/typescript-estree" "7.2.0" - "@typescript-eslint/utils" "7.2.0" + "@typescript-eslint/typescript-estree" "7.8.0" + "@typescript-eslint/utils" "7.8.0" debug "^4.3.4" - ts-api-utils "^1.0.1" + ts-api-utils "^1.3.0" -"@typescript-eslint/type-utils@7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz#2f8094edca3bebdaad009008929df645ed9c8743" - integrity sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q== +"@typescript-eslint/type-utils@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.9.0.tgz#f523262e1b66ca65540b7a65a1222db52e0a90c9" + integrity sha512-6Qy8dfut0PFrFRAZsGzuLoM4hre4gjzWJB6sUvdunCYZsYemTkzZNwF1rnGea326PHPT3zn5Lmg32M/xfJfByA== dependencies: - "@typescript-eslint/typescript-estree" "7.7.1" - "@typescript-eslint/utils" "7.7.1" + "@typescript-eslint/typescript-estree" "7.9.0" + "@typescript-eslint/utils" "7.9.0" debug "^4.3.4" ts-api-utils "^1.3.0" @@ -3319,15 +3986,15 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== -"@typescript-eslint/types@7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f" - integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA== +"@typescript-eslint/types@7.8.0": + version "7.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.8.0.tgz#1fd2577b3ad883b769546e2d1ef379f929a7091d" + integrity sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw== -"@typescript-eslint/types@7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.7.1.tgz#f903a651fb004c75add08e4e9e207f169d4b98d7" - integrity sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w== +"@typescript-eslint/types@7.9.0", "@typescript-eslint/types@^7.2.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.9.0.tgz#b58e485e4bfba055659c7e683ad4f5f0821ae2ec" + integrity sha512-oZQD9HEWQanl9UfsbGVcZ2cGaR0YT5476xfWE0oE5kQa2sNK2frxOlkeacLOTh9po4AlUT5rtkGyYM5kew0z5w== "@typescript-eslint/typescript-estree@6.21.0": version "6.21.0" @@ -3343,27 +4010,27 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/typescript-estree@7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556" - integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA== +"@typescript-eslint/typescript-estree@7.8.0": + version "7.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz#b028a9226860b66e623c1ee55cc2464b95d2987c" + integrity sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg== dependencies: - "@typescript-eslint/types" "7.2.0" - "@typescript-eslint/visitor-keys" "7.2.0" + "@typescript-eslint/types" "7.8.0" + "@typescript-eslint/visitor-keys" "7.8.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" - minimatch "9.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" + minimatch "^9.0.4" + semver "^7.6.0" + ts-api-utils "^1.3.0" -"@typescript-eslint/typescript-estree@7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz#5cafde48fe390fe1c1b329b2ce0ba8a73c1e87b2" - integrity sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ== +"@typescript-eslint/typescript-estree@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.9.0.tgz#3395e27656060dc313a6b406c3a298b729685e07" + integrity sha512-zBCMCkrb2YjpKV3LA0ZJubtKCDxLttxfdGmwZvTqqWevUPN0FZvSI26FalGFFUZU/9YQK/A4xcQF9o/VVaCKAg== dependencies: - "@typescript-eslint/types" "7.7.1" - "@typescript-eslint/visitor-keys" "7.7.1" + "@typescript-eslint/types" "7.9.0" + "@typescript-eslint/visitor-keys" "7.9.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -3371,32 +4038,29 @@ semver "^7.6.0" ts-api-utils "^1.3.0" -"@typescript-eslint/utils@7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.2.0.tgz#fc8164be2f2a7068debb4556881acddbf0b7ce2a" - integrity sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "7.2.0" - "@typescript-eslint/types" "7.2.0" - "@typescript-eslint/typescript-estree" "7.2.0" - semver "^7.5.4" - -"@typescript-eslint/utils@7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.7.1.tgz#5d161f2b4a55e1bc38b634bebb921e4bd4e4a16e" - integrity sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ== +"@typescript-eslint/utils@7.8.0": + version "7.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.8.0.tgz#57a79f9c0c0740ead2f622e444cfaeeb9fd047cd" + integrity sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.15" "@types/semver" "^7.5.8" - "@typescript-eslint/scope-manager" "7.7.1" - "@typescript-eslint/types" "7.7.1" - "@typescript-eslint/typescript-estree" "7.7.1" + "@typescript-eslint/scope-manager" "7.8.0" + "@typescript-eslint/types" "7.8.0" + "@typescript-eslint/typescript-estree" "7.8.0" semver "^7.6.0" +"@typescript-eslint/utils@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.9.0.tgz#1b96a34eefdca1c820cb1bbc2751d848b4540899" + integrity sha512-5KVRQCzZajmT4Ep+NEgjXCvjuypVvYHUW7RHlXzNPuak2oWpVoD1jf5xCP0dPAuNIchjC7uQyvbdaSTFaLqSdA== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@typescript-eslint/scope-manager" "7.9.0" + "@typescript-eslint/types" "7.9.0" + "@typescript-eslint/typescript-estree" "7.9.0" + "@typescript-eslint/utils@^6.0.0": version "6.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" @@ -3418,20 +4082,20 @@ "@typescript-eslint/types" "6.21.0" eslint-visitor-keys "^3.4.1" -"@typescript-eslint/visitor-keys@7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e" - integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A== +"@typescript-eslint/visitor-keys@7.8.0": + version "7.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz#7285aab991da8bee411a42edbd5db760d22fdd91" + integrity sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA== dependencies: - "@typescript-eslint/types" "7.2.0" - eslint-visitor-keys "^3.4.1" + "@typescript-eslint/types" "7.8.0" + eslint-visitor-keys "^3.4.3" -"@typescript-eslint/visitor-keys@7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz#da2294796220bb0f3b4add5ecbb1b9c3f4f65798" - integrity sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw== +"@typescript-eslint/visitor-keys@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.9.0.tgz#82162656e339c3def02895f5c8546f6888d9b9ea" + integrity sha512-iESPx2TNLDNGQLyjKhUvIKprlP49XNEK+MvIf9nIO7ZZaZdbnfWKHnXAgufpxqfA0YryH8XToi4+CjBgVnFTSQ== dependencies: - "@typescript-eslint/types" "7.7.1" + "@typescript-eslint/types" "7.9.0" eslint-visitor-keys "^3.4.3" "@ungap/structured-clone@^1.2.0": @@ -3735,16 +4399,6 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@8.11.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - ajv@8.12.0, ajv@^8.0.0, ajv@^8.11.0, ajv@^8.9.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" @@ -3910,6 +4564,14 @@ array-buffer-byte-length@^1.0.0: call-bind "^1.0.2" is-array-buffer "^3.0.1" +array-buffer-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== + dependencies: + call-bind "^1.0.5" + is-array-buffer "^3.0.4" + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -4002,6 +4664,20 @@ arraybuffer.prototype.slice@^1.0.2: is-array-buffer "^3.0.2" is-shared-array-buffer "^1.0.2" +arraybuffer.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== + dependencies: + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" + is-shared-array-buffer "^1.0.2" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -4060,6 +4736,13 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== +available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" + axios@^1.6.0: version "1.6.8" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" @@ -4095,6 +4778,15 @@ babel-plugin-istanbul@6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" +babel-plugin-polyfill-corejs2@^0.4.10: + version "0.4.11" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" + integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== + dependencies: + "@babel/compat-data" "^7.22.6" + "@babel/helper-define-polyfill-provider" "^0.6.2" + semver "^6.3.1" + babel-plugin-polyfill-corejs2@^0.4.8: version "0.4.8" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269" @@ -4104,6 +4796,14 @@ babel-plugin-polyfill-corejs2@^0.4.8: "@babel/helper-define-polyfill-provider" "^0.5.0" semver "^6.3.1" +babel-plugin-polyfill-corejs3@^0.10.4: + version "0.10.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz#789ac82405ad664c20476d0233b485281deb9c77" + integrity sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.6.1" + core-js-compat "^3.36.1" + babel-plugin-polyfill-corejs3@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz#9eea32349d94556c2ad3ab9b82ebb27d4bf04a81" @@ -4119,6 +4819,13 @@ babel-plugin-polyfill-regenerator@^0.5.5: dependencies: "@babel/helper-define-polyfill-provider" "^0.5.0" +babel-plugin-polyfill-regenerator@^0.6.1: + version "0.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" + integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.6.2" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -4156,6 +4863,13 @@ bcryptjs@^2.4.3: resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ== +bidi-js@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/bidi-js/-/bidi-js-1.0.3.tgz#6f8bcf3c877c4d9220ddf49b9bb6930c88f877d2" + integrity sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw== + dependencies: + require-from-string "^2.0.2" + big-integer@^1.6.44: version "1.6.51" resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" @@ -4213,13 +4927,13 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== -bootstrap.native@^5.0.10: - version "5.0.10" - resolved "https://registry.yarnpkg.com/bootstrap.native/-/bootstrap.native-5.0.10.tgz#60d39c626788268749bc9e4fcabc63b03892048f" - integrity sha512-Yl8SzysDWr2oym7wFZGawYWdFeDiuxR/EmsvHrbeXJLH7RzmkKgVYzoctbHAZ41isiCMVXQOfKRHkrW20FP2xQ== +bootstrap.native@^5.0.12: + version "5.0.12" + resolved "https://registry.yarnpkg.com/bootstrap.native/-/bootstrap.native-5.0.12.tgz#0794b7e20802c7cac2460dbfd15f78a829b8f96f" + integrity sha512-qTiFBK7//IgdF9u67w3W91U8C2Fc3TGQh61xa0pbtHmD1YRncncFNNs+6ewG2tW7fBGGMXg57gj5d9Qamr0S+w== dependencies: "@thednp/event-listener" "^2.0.4" - "@thednp/shorty" "2.0.0-alpha22" + "@thednp/shorty" "^2.0.0" bootstrap@^5.3.3: version "5.3.3" @@ -4417,6 +5131,17 @@ call-bind@^1.0.4, call-bind@^1.0.5: get-intrinsic "^1.2.1" set-function-length "^1.1.1" +call-bind@^1.0.6, call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + callsite@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" @@ -4508,10 +5233,10 @@ cheerio@^1.0.0-rc.12: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3, chokidar@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -4607,10 +5332,10 @@ clone@^1.0.2, clone@^1.0.4: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== -code-block-writer@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-12.0.0.tgz#4dd58946eb4234105aff7f0035977b2afdc2a770" - integrity sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w== +code-block-writer@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-13.0.1.tgz#52ac60ca6076d8700b88a45bd71e06a577158405" + integrity sha512-c5or4P6erEA69TxaxTNcHUNcIn+oyxSRTOWV+pSYF+z4epXqNvwvJ70XPGjPNgue83oAFAPBRQYwpAJ/Hpe/Sg== codemirror@^6.0.1: version "6.0.1" @@ -4671,7 +5396,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@11.1.0, commander@^11.1.0: +commander@11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906" integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== @@ -4681,6 +5406,11 @@ commander@7, commander@^7.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-12.0.0.tgz#b929db6df8546080adfd004ab215ed48cf6f2592" + integrity sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA== + commander@^2.18.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -4696,6 +5426,28 @@ comment-parser@1.4.1: resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc" integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg== +commit-and-tag-version@^12.4.1: + version "12.4.1" + resolved "https://registry.yarnpkg.com/commit-and-tag-version/-/commit-and-tag-version-12.4.1.tgz#0414f745434839b2c76d4ad5a190269b7ad63957" + integrity sha512-+NAbDJ2KiXDvV45S8r6o1DWbeEXijxb+Vxp9dsogISuSeRZ5JOPiaQsHoDKhZ58FuBtmp6ITe/hpeFu2gT82xA== + dependencies: + chalk "^2.4.2" + conventional-changelog "3.1.25" + conventional-changelog-config-spec "2.1.0" + conventional-changelog-conventionalcommits "6.1.0" + conventional-recommended-bump "7.0.1" + detect-indent "^6.0.0" + detect-newline "^3.1.0" + dotgitignore "^2.1.0" + figures "^3.1.0" + find-up "^5.0.0" + git-semver-tags "^5.0.0" + jsdom "^23.2.0" + semver "^7.5.4" + w3c-xmlserializer "^5.0.0" + yaml "^2.4.1" + yargs "^17.7.2" + common-path-prefix@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" @@ -4825,7 +5577,14 @@ conventional-changelog-config-spec@2.1.0: resolved "https://registry.yarnpkg.com/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz#874a635287ef8b581fd8558532bf655d4fb59f2d" integrity sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ== -conventional-changelog-conventionalcommits@4.6.3, conventional-changelog-conventionalcommits@^4.5.0: +conventional-changelog-conventionalcommits@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz#3bad05f4eea64e423d3d90fc50c17d2c8cf17652" + integrity sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw== + dependencies: + compare-func "^2.0.0" + +conventional-changelog-conventionalcommits@^4.5.0: version "4.6.3" resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz#0765490f56424b46f6cb4db9135902d6e5a36dc2" integrity sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g== @@ -4895,10 +5654,15 @@ conventional-changelog-preset-loader@^2.3.4: resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c" integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g== -conventional-changelog-preset-loader@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-4.1.0.tgz#996bc40d516471c5bf8248fdc30222563b9bcfe6" - integrity sha512-HozQjJicZTuRhCRTq4rZbefaiCzRM2pr6u2NL3XhrmQm4RMnDXfESU6JKu/pnKwx5xtdkYfNCsbhN5exhiKGJA== +conventional-changelog-preset-loader@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz#14975ef759d22515d6eabae6396c2ae721d4c105" + integrity sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA== + +conventional-changelog-preset-loader@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-5.0.0.tgz#922ad617c13ad3243bef967cfc0f8373893c216d" + integrity sha512-SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA== conventional-changelog-writer@^5.0.0: version "5.0.1" @@ -4940,10 +5704,18 @@ conventional-commits-filter@^2.0.7: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-filter@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-4.0.0.tgz#845d713e48dc7d1520b84ec182e2773c10c7bf7f" - integrity sha512-rnpnibcSOdFcdclpFwWa+pPlZJhXE7l+XK04zxhbWrhgpR96h33QLz8hITTXbcYICxVr3HZFtbtUAQ+4LdBo9A== +conventional-commits-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz#bf1113266151dd64c49cd269e3eb7d71d7015ee2" + integrity sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q== + dependencies: + lodash.ismatch "^4.4.0" + modify-values "^1.0.1" + +conventional-commits-filter@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-5.0.0.tgz#72811f95d379e79d2d39d5c0c53c9351ef284e86" + integrity sha512-tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q== conventional-commits-parser@^3.2.0: version "3.2.4" @@ -4957,6 +5729,16 @@ conventional-commits-parser@^3.2.0: split2 "^3.0.0" through2 "^4.0.0" +conventional-commits-parser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" + integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== + dependencies: + JSONStream "^1.3.5" + is-text-path "^1.0.1" + meow "^8.1.2" + split2 "^3.2.2" + conventional-commits-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz#57f3594b81ad54d40c1b4280f04554df28627d9a" @@ -4967,31 +5749,36 @@ conventional-commits-parser@^5.0.0: meow "^12.0.1" split2 "^4.0.0" -conventional-recommended-bump@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz#cfa623285d1de554012f2ffde70d9c8a22231f55" - integrity sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw== +conventional-commits-parser@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-6.0.0.tgz#74e3be5344d8cd99f7c3353da2efa1d1dd618061" + integrity sha512-TbsINLp48XeMXR8EvGjTnKGsZqBemisPoyWESlpRyR8lif0lcwzqz+NMtYSj1ooF/WYjSuu7wX0CtdeeMEQAmA== dependencies: - concat-stream "^2.0.0" - conventional-changelog-preset-loader "^2.3.4" - conventional-commits-filter "^2.0.7" - conventional-commits-parser "^3.2.0" - git-raw-commits "^2.0.8" - git-semver-tags "^4.1.1" - meow "^8.0.0" - q "^1.5.1" + meow "^13.0.0" -conventional-recommended-bump@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-9.0.0.tgz#2910b08b10e6c705301335ab916e7438eba5907f" - integrity sha512-HR1yD0G5HgYAu6K0wJjLd7QGRK8MQDqqj6Tn1n/ja1dFwBCE6QmV+iSgQ5F7hkx7OUR/8bHpxJqYtXj2f/opPQ== +conventional-recommended-bump@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz#ec01f6c7f5d0e2491c2d89488b0d757393392424" + integrity sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA== dependencies: - conventional-changelog-preset-loader "^4.1.0" - conventional-commits-filter "^4.0.0" - conventional-commits-parser "^5.0.0" - git-raw-commits "^4.0.0" - git-semver-tags "^7.0.0" - meow "^12.0.1" + concat-stream "^2.0.0" + conventional-changelog-preset-loader "^3.0.0" + conventional-commits-filter "^3.0.0" + conventional-commits-parser "^4.0.0" + git-raw-commits "^3.0.0" + git-semver-tags "^5.0.0" + meow "^8.1.2" + +conventional-recommended-bump@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-10.0.0.tgz#1e46c2c9534457088d10a47a154b307365c2e043" + integrity sha512-RK/fUnc2btot0oEVtrj3p2doImDSs7iiz/bftFCDzels0Qs1mxLghp+DFHMaOC0qiCI6sWzlTDyBFSYuot6pRA== + dependencies: + "@conventional-changelog/git-client" "^1.0.0" + conventional-changelog-preset-loader "^5.0.0" + conventional-commits-filter "^5.0.0" + conventional-commits-parser "^6.0.0" + meow "^13.0.0" convert-source-map@^1.5.1, convert-source-map@^1.7.0: version "1.9.0" @@ -5051,6 +5838,13 @@ core-js-compat@^3.34.0: dependencies: browserslist "^4.22.3" +core-js-compat@^3.36.1: + version "3.37.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73" + integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA== + dependencies: + browserslist "^4.23.0" + core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -5071,16 +5865,6 @@ cosmiconfig-typescript-loader@^5.0.0: dependencies: jiti "^1.19.1" -cosmiconfig@^8.3.6: - version "8.3.6" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" - integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== - dependencies: - import-fresh "^3.3.0" - js-yaml "^4.1.0" - parse-json "^5.2.0" - path-type "^4.0.0" - cosmiconfig@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d" @@ -5148,6 +5932,14 @@ css-select@^5.1.0: domutils "^3.0.1" nth-check "^2.0.1" +css-tree@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" + integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== + dependencies: + mdn-data "2.0.30" + source-map-js "^1.0.1" + css-what@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" @@ -5158,6 +5950,13 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== +cssstyle@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.0.1.tgz#ef29c598a1e90125c870525490ea4f354db0660a" + integrity sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ== + dependencies: + rrweb-cssom "^0.6.0" + custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" @@ -5283,6 +6082,41 @@ data-uri-to-buffer@^4.0.0: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e" integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A== +data-urls@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde" + integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg== + dependencies: + whatwg-mimetype "^4.0.0" + whatwg-url "^14.0.0" + +data-view-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" + integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" + integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" + integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + date-format@^4.0.14: version "4.0.14" resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" @@ -5339,6 +6173,11 @@ decamelize@^1.1.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== +decimal.js@^10.4.3: + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== + deep-equal@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" @@ -5421,6 +6260,15 @@ define-data-property@^1.0.1, define-data-property@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-lazy-prop@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" @@ -5439,6 +6287,15 @@ define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: has-property-descriptors "^1.0.0" object-keys "^1.1.1" +define-properties@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== + dependencies: + define-data-property "^1.0.1" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -5645,9 +6502,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== ejs@^3.1.5, ejs@^3.1.7: - version "3.1.9" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" - integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== + version "3.1.10" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" + integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== dependencies: jake "^10.8.5" @@ -5820,6 +6677,70 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.13" +es-abstract@^1.22.3, es-abstract@^1.23.0: + version "1.23.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" + integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== + dependencies: + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + data-view-buffer "^1.0.1" + data-view-byte-length "^1.0.1" + data-view-byte-offset "^1.0.0" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-set-tostringtag "^2.0.3" + es-to-primitive "^1.2.1" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" + globalthis "^1.0.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" + has-symbols "^1.0.3" + hasown "^2.0.2" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" + is-callable "^1.2.7" + is-data-view "^1.0.1" + is-negative-zero "^2.0.3" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.3" + is-string "^1.0.7" + is-typed-array "^1.1.13" + is-weakref "^1.0.2" + object-inspect "^1.13.1" + object-keys "^1.1.1" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.2" + safe-regex-test "^1.0.3" + string.prototype.trim "^1.2.9" + string.prototype.trimend "^1.0.8" + string.prototype.trimstart "^1.0.8" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.6" + unbox-primitive "^1.0.2" + which-typed-array "^1.1.15" + +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.2.1, es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es-get-iterator@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" @@ -5840,6 +6761,13 @@ es-module-lexer@^1.2.1: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== +es-object-atoms@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" + integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== + dependencies: + es-errors "^1.3.0" + es-set-tostringtag@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" @@ -5849,6 +6777,15 @@ es-set-tostringtag@^2.0.1: has "^1.0.3" has-tostringtag "^1.0.0" +es-set-tostringtag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== + dependencies: + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" + es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -6085,12 +7022,12 @@ eslint-plugin-import@^2.29.1: semver "^6.3.1" tsconfig-paths "^3.15.0" -eslint-plugin-jsdoc@^48.2.3: - version "48.2.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.3.tgz#0188d17c7a4aa7185416556589e71a954b343ecd" - integrity sha512-r9DMAmFs66VNvNqRLLjHejdnJtILrt3xGi+Qx0op0oRfFGVpOR1Hb3BC++MacseHx93d8SKYPhyrC9BS7Os2QA== +eslint-plugin-jsdoc@^48.2.4: + version "48.2.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.4.tgz#0b6972faa9e5de89a08f1b0bcdc30e70a9cad736" + integrity sha512-3ebvVgCJFy06gpmuS2ynz13uh9iFSzZ1C1dDkgcSAqVVg82zlORKMk2fvjq708pAO6bwfs5YLttknFEbaoDiGw== dependencies: - "@es-joy/jsdoccomment" "~0.42.0" + "@es-joy/jsdoccomment" "~0.43.0" are-docs-informative "^0.0.2" comment-parser "1.4.1" debug "^4.3.4" @@ -6440,7 +7377,7 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== -fast-glob@3.3.2, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2: +fast-glob@3.3.2, fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -6705,10 +7642,10 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^11.1.0, fs-extra@^11.1.1: - version "11.1.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" - integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== +fs-extra@^11.1.0, fs-extra@^11.1.1, fs-extra@^11.2.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" + integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -6861,6 +7798,17 @@ get-intrinsic@^1.2.2: has-symbols "^1.0.3" hasown "^2.0.0" +get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -6901,6 +7849,15 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-symbol-description@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== + dependencies: + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + gh-pages@^3.1.0: version "3.2.3" resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-3.2.3.tgz#897e5f15e111f42af57d21d430b83e5cdf29472c" @@ -6925,6 +7882,15 @@ git-raw-commits@^2.0.8: split2 "^3.0.0" through2 "^4.0.0" +git-raw-commits@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-3.0.0.tgz#5432f053a9744f67e8db03dbc48add81252cfdeb" + integrity sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw== + dependencies: + dargs "^7.0.0" + meow "^8.1.2" + split2 "^3.2.2" + git-raw-commits@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-4.0.0.tgz#b212fd2bff9726d27c1283a1157e829490593285" @@ -6942,7 +7908,7 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^4.0.0, git-semver-tags@^4.1.1: +git-semver-tags@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780" integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA== @@ -6950,13 +7916,13 @@ git-semver-tags@^4.0.0, git-semver-tags@^4.1.1: meow "^8.0.0" semver "^6.0.0" -git-semver-tags@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-7.0.1.tgz#74426e7d7710e5a263655e78b4c651eed804d63e" - integrity sha512-NY0ZHjJzyyNXHTDZmj+GG7PyuAKtMsyWSwh07CR2hOZFa+/yoTsXci/nF2obzL8UDhakFNkD9gNdt/Ed+cxh2Q== +git-semver-tags@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-5.0.1.tgz#db748aa0e43d313bf38dcd68624d8443234e1c15" + integrity sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA== dependencies: - meow "^12.0.1" - semver "^7.5.2" + meow "^8.1.2" + semver "^7.0.0" gitconfiglocal@^1.0.0: version "1.0.0" @@ -6984,16 +7950,16 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^10.2.2, glob@^10.3.10: - version "10.3.10" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" - integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== +glob@^10.2.2, glob@^10.3.10, glob@^10.3.12: + version "10.3.12" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" + integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== dependencies: foreground-child "^3.1.0" - jackspeak "^2.3.5" + jackspeak "^2.3.6" minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" + minipass "^7.0.4" + path-scurry "^1.10.2" glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: version "7.2.3" @@ -7151,11 +8117,23 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" @@ -7168,6 +8146,13 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" +has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== + dependencies: + has-symbols "^1.0.3" + has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -7187,6 +8172,13 @@ hasown@^2.0.0: dependencies: function-bind "^1.1.2" +hasown@^2.0.1, hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -7216,10 +8208,17 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -html-entities@^2.3.2, html-entities@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061" - integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ== +html-encoding-sniffer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448" + integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ== + dependencies: + whatwg-encoding "^3.1.1" + +html-entities@^2.3.2, html-entities@^2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== html-escaper@^2.0.0, html-escaper@^2.0.2: version "2.0.2" @@ -7324,7 +8323,7 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" -https-proxy-agent@7.0.4, https-proxy-agent@^7.0.1: +https-proxy-agent@7.0.4, https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== @@ -7372,10 +8371,10 @@ husky@^9.0.11: resolved "https://registry.yarnpkg.com/husky/-/husky-9.0.11.tgz#fc91df4c756050de41b3e478b2158b87c1e79af9" integrity sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw== -i18next@^23.7.6: - version "23.7.6" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.6.tgz#7328e76c899052d5d33d930164612dd21e575f74" - integrity sha512-O66BhXBw0fH4bEJMA0/klQKPEbcwAp5wjXEL803pdAynNbg2f4qhLIYlNHJyE7icrL6XmSZKPYaaXwy11kJ6YQ== +i18next@^23.11.2: + version "23.11.2" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.11.2.tgz#4c0e8192a9ba230fe7dc68b76459816ab601826e" + integrity sha512-qMBm7+qT8jdpmmDw/kQD16VpmkL9BdL+XNAK5MNbNFaf1iQQq35ZbPrSlqmnNPOSUY4m342+c0t0evinF5l7sA== dependencies: "@babel/runtime" "^7.23.2" @@ -7386,7 +8385,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.6, iconv-lite@^0.6.2, iconv-lite@^0.6.3: +iconv-lite@0.6, iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -7525,6 +8524,15 @@ internal-slot@^1.0.4, internal-slot@^1.0.5: has "^1.0.3" side-channel "^1.0.4" +internal-slot@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== + dependencies: + es-errors "^1.3.0" + hasown "^2.0.0" + side-channel "^1.0.4" + ip@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105" @@ -7557,6 +8565,14 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: get-intrinsic "^1.2.0" is-typed-array "^1.1.10" +is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -7603,6 +8619,13 @@ is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-m dependencies: hasown "^2.0.0" +is-data-view@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" + integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== + dependencies: + is-typed-array "^1.1.13" + is-date-object@^1.0.1, is-date-object@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" @@ -7676,6 +8699,11 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +is-negative-zero@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== + is-number-object@^1.0.4: version "1.0.7" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" @@ -7715,6 +8743,11 @@ is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -7735,6 +8768,13 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" +is-shared-array-buffer@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== + dependencies: + call-bind "^1.0.7" + is-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" @@ -7791,6 +8831,13 @@ is-typed-array@^1.1.12: dependencies: which-typed-array "^1.1.11" +is-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== + dependencies: + which-typed-array "^1.1.14" + is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" @@ -7905,7 +8952,7 @@ istanbul-reports@^3.0.5: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jackspeak@^2.3.5: +jackspeak@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== @@ -7988,6 +9035,33 @@ jsdoc-type-pratt-parser@~4.0.0: resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114" integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ== +jsdom@^23.2.0: + version "23.2.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-23.2.0.tgz#08083220146d41c467efa1c6969f02b525ba6c1d" + integrity sha512-L88oL7D/8ufIES+Zjz7v0aes+oBMh2Xnh3ygWvL0OaICOomKEPKuPnIfBJekiXr+BHbbMjrWn/xqrDQuxFTeyA== + dependencies: + "@asamuzakjp/dom-selector" "^2.0.1" + cssstyle "^4.0.1" + data-urls "^5.0.0" + decimal.js "^10.4.3" + form-data "^4.0.0" + html-encoding-sniffer "^4.0.0" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.2" + is-potential-custom-element-name "^1.0.1" + parse5 "^7.1.2" + rrweb-cssom "^0.6.0" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.3" + w3c-xmlserializer "^5.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^3.1.1" + whatwg-mimetype "^4.0.0" + whatwg-url "^14.0.0" + ws "^8.16.0" + xml-name-validator "^5.0.0" + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -8055,11 +9129,6 @@ json5@^2.1.2, json5@^2.2.2, json5@^2.2.3: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jsonc-parser@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.1.0.tgz#73b8f0e5c940b83d03476bc2e51a20ef0932615d" - integrity sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg== - jsonc-parser@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" @@ -8463,16 +9532,21 @@ loglevel-plugin-prefix@^0.8.4: resolved "https://registry.yarnpkg.com/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz#2fe0e05f1a820317d98d8c123e634c1bd84ff644" integrity sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g== -loglevel@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4" - integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== +loglevel@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.1.tgz#d63976ac9bcd03c7c873116d41c2a85bafff1be7" + integrity sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg== lru-cache@^10.0.1: version "10.1.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484" integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag== +lru-cache@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -8487,11 +9561,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -"lru-cache@^9.1.1 || ^10.0.0": - version "10.0.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a" - integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== - lunr@^2.3.9: version "2.3.9" resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1" @@ -8509,13 +9578,6 @@ magic-string@0.25.1: dependencies: sourcemap-codec "^1.4.1" -magic-string@0.26.2: - version "0.26.2" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.2.tgz#5331700e4158cd6befda738bb6b0c7b93c0d4432" - integrity sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A== - dependencies: - sourcemap-codec "^1.4.8" - magic-string@0.30.8: version "0.30.8" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.8.tgz#14e8624246d2bedba70d5462aa99ac9681844613" @@ -8597,6 +9659,11 @@ marked@7.0.3: resolved "https://registry.yarnpkg.com/marked/-/marked-7.0.3.tgz#680778f4612ba483d89e851fc70690d867165e42" integrity sha512-ev2uM40p0zQ/GbvqotfKcSWEa59fJwluGZj5dcaUOwDRrB1F3dncdXy8NWUApk4fi8atU3kTBOwjyjZ0ud0dxw== +mdn-data@2.0.30: + version "2.0.30" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" + integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -8614,7 +9681,12 @@ meow@^12.0.1: resolved "https://registry.yarnpkg.com/meow/-/meow-12.1.1.tgz#e558dddbab12477b69b2e9a2728c327f191bace6" integrity sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw== -meow@^8.0.0: +meow@^13.0.0: + version "13.2.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-13.2.0.tgz#6b7d63f913f984063b3cc261b6e8800c4cd3474f" + integrity sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA== + +meow@^8.0.0, meow@^8.1.2: version "8.1.2" resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== @@ -8737,13 +9809,6 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^7.4.3: - version "7.4.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb" - integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw== - dependencies: - brace-expansion "^2.0.1" - minimatch@^9.0.4: version "9.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" @@ -8842,7 +9907,7 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4: version "7.0.4" resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== @@ -8867,12 +9932,12 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19" - integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A== +mkdirp@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" + integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== -modify-values@^1.0.0: +modify-values@^1.0.0, modify-values@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== @@ -9230,12 +10295,12 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -nx@18.1.1, "nx@^17.2.8 || ^18.0.0": - version "18.1.1" - resolved "https://registry.yarnpkg.com/nx/-/nx-18.1.1.tgz#cfbb216671dde69fa1656f9e3b0d3c8571928706" - integrity sha512-rzvzEwe4bwi8cAm0uYOpMwj6PcIqD2anoOWg81rpb/3nQY+r1Qo2tL2/BWxGFh+WK+Jt7TzBZKcdQFEw5Nm84w== +nx@19.0.3, "nx@^17.2.8 || ^18.0.0 || ^19.0.0": + version "19.0.3" + resolved "https://registry.yarnpkg.com/nx/-/nx-19.0.3.tgz#184ba380e852e65d4f2a754938bf19d63074d0c6" + integrity sha512-FJ+HhKHecKvc027iA4fjWGEv2DjKj4f4UrXpDEEKUoiOiip7dKXWmZPVGkmgZC+nCD4Nbw5WvkuXGFkEf5D/SA== dependencies: - "@nrwl/tao" "18.1.1" + "@nrwl/tao" "19.0.3" "@yarnpkg/lockfile" "^1.1.0" "@yarnpkg/parsers" "3.0.0-rc.46" "@zkochan/js-yaml" "0.0.6" @@ -9270,16 +10335,16 @@ nx@18.1.1, "nx@^17.2.8 || ^18.0.0": yargs "^17.6.2" yargs-parser "21.1.1" optionalDependencies: - "@nx/nx-darwin-arm64" "18.1.1" - "@nx/nx-darwin-x64" "18.1.1" - "@nx/nx-freebsd-x64" "18.1.1" - "@nx/nx-linux-arm-gnueabihf" "18.1.1" - "@nx/nx-linux-arm64-gnu" "18.1.1" - "@nx/nx-linux-arm64-musl" "18.1.1" - "@nx/nx-linux-x64-gnu" "18.1.1" - "@nx/nx-linux-x64-musl" "18.1.1" - "@nx/nx-win32-arm64-msvc" "18.1.1" - "@nx/nx-win32-x64-msvc" "18.1.1" + "@nx/nx-darwin-arm64" "19.0.3" + "@nx/nx-darwin-x64" "19.0.3" + "@nx/nx-freebsd-x64" "19.0.3" + "@nx/nx-linux-arm-gnueabihf" "19.0.3" + "@nx/nx-linux-arm64-gnu" "19.0.3" + "@nx/nx-linux-arm64-musl" "19.0.3" + "@nx/nx-linux-x64-gnu" "19.0.3" + "@nx/nx-linux-x64-musl" "19.0.3" + "@nx/nx-win32-arm64-msvc" "19.0.3" + "@nx/nx-win32-x64-msvc" "19.0.3" object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1, object-assign@latest: version "4.1.1" @@ -9319,6 +10384,16 @@ object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" +object.assign@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + has-symbols "^1.0.3" + object-keys "^1.1.1" + object.fromentries@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" @@ -9675,7 +10750,7 @@ parse5-sax-parser@^7.0.0: dependencies: parse5 "^7.0.0" -parse5@^7.0.0: +parse5@^7.0.0, parse5@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== @@ -9727,12 +10802,12 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-scurry@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" - integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== +path-scurry@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" + integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== dependencies: - lru-cache "^9.1.1 || ^10.0.0" + lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-to-regexp@0.1.7: @@ -9764,10 +10839,10 @@ pdfjs-dist@2.12.313: resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz#62f2273737bb956267ae2e02cdfaddcb1099819c" integrity sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA== -pdfmake@^0.2.8: - version "0.2.8" - resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.8.tgz#42263262e464d5d52e748317478dae9926387a61" - integrity sha512-lI+amfIaUL8CrPhndxFdhIgMj9JB49Sj4DARltKC1gLm/5NsPohZqfB+D+II8HymtPB6eugUFD5oBxmzO57qHA== +pdfmake@^0.2.10: + version "0.2.10" + resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.10.tgz#a8a0ee8a5acca8f5d728e0dfe4db8be5f1b9ec6b" + integrity sha512-doipFnmE1UHSk+Z3wfQuVweVQqx2pE/Ns2G5gCqZmWwqjDj+mZHnZYH/ryXWoIfD+iVdZUAutgI/VHkTCN+Xrw== dependencies: "@foliojs-fork/linebreak" "^1.1.1" "@foliojs-fork/pdfkit" "^0.14.0" @@ -9856,6 +10931,11 @@ png-js@^1.0.0: resolved "https://registry.yarnpkg.com/png-js/-/png-js-1.0.0.tgz#e5484f1e8156996e383aceebb3789fd75df1874d" integrity sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g== +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postcss-loader@8.1.1: version "8.1.1" resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-8.1.1.tgz#2822589e7522927344954acb55bbf26e8b195dfe" @@ -10023,6 +11103,11 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== +psl@^1.1.33: + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" @@ -10036,6 +11121,11 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== +punycode@^2.1.1, punycode@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -10053,6 +11143,11 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + queue-microtask@^1.1.2, queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -10108,7 +11203,6 @@ rdf-canonize@^3.4.0: rdfstore@musicenfanthen/rdfstore-js#v0.9.18-alpha.15: version "0.9.18-alpha.15" - uid "0f57eddbbcded5c3ce7a88c025473cd653eb958b" resolved "https://codeload.github.com/musicenfanthen/rdfstore-js/tar.gz/0f57eddbbcded5c3ce7a88c025473cd653eb958b" dependencies: jsonld "^8.3.1" @@ -10275,6 +11369,16 @@ regexp.prototype.flags@^1.5.1: define-properties "^1.2.0" set-function-name "^2.0.0" +regexp.prototype.flags@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" + integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== + dependencies: + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" + regexpu-core@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" @@ -10416,6 +11520,11 @@ rollup@^4.2.0: "@rollup/rollup-win32-x64-msvc" "4.9.5" fsevents "~2.3.2" +rrweb-cssom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" + integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== + run-applescript@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c" @@ -10440,13 +11549,6 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== -rxjs@6.6.7: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - rxjs@7.8.1, rxjs@^7.8.1, rxjs@~7.8.1: version "7.8.1" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" @@ -10464,6 +11566,16 @@ safe-array-concat@^1.0.1: has-symbols "^1.0.3" isarray "^2.0.5" +safe-array-concat@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" + integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== + dependencies: + call-bind "^1.0.7" + get-intrinsic "^1.2.4" + has-symbols "^1.0.3" + isarray "^2.0.5" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -10483,6 +11595,15 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" +safe-regex-test@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-regex "^1.1.4" + "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -10509,6 +11630,13 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== + dependencies: + xmlchars "^2.2.0" + schema-utils@^3.1.1, schema-utils@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" @@ -10634,6 +11762,18 @@ set-function-length@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + set-function-name@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" @@ -10643,6 +11783,16 @@ set-function-name@^2.0.0: functions-have-names "^1.2.3" has-property-descriptors "^1.0.0" +set-function-name@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.2" + setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -10859,6 +12009,11 @@ source-map-explorer@^2.5.3: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map-js@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== + source-map-loader@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-5.0.0.tgz#f593a916e1cc54471cfc8851b905c8a845fc7e38" @@ -10897,7 +12052,7 @@ source-map@~0.1.30: dependencies: amdefine ">=0.0.4" -sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.8: +sourcemap-codec@^1.4.1: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== @@ -10959,7 +12114,7 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -split2@^3.0.0: +split2@^3.0.0, split2@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== @@ -11008,26 +12163,6 @@ ssri@^8.0.0, ssri@^8.0.1: dependencies: minipass "^3.1.1" -standard-version@^9.5.0: - version "9.5.0" - resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-9.5.0.tgz#851d6dcddf5320d5079601832aeb185dbf497949" - integrity sha512-3zWJ/mmZQsOaO+fOlsa0+QK90pwhNd042qEcw6hKFNoLFs7peGyvPffpEBbK/DSGPbyOvli0mUIFv5A4qTjh2Q== - dependencies: - chalk "^2.4.2" - conventional-changelog "3.1.25" - conventional-changelog-config-spec "2.1.0" - conventional-changelog-conventionalcommits "4.6.3" - conventional-recommended-bump "6.1.0" - detect-indent "^6.0.0" - detect-newline "^3.1.0" - dotgitignore "^2.1.0" - figures "^3.1.0" - find-up "^5.0.0" - git-semver-tags "^4.0.0" - semver "^7.1.1" - stringify-package "^1.0.1" - yargs "^16.0.0" - static-eval@^2.0.5: version "2.1.0" resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.1.0.tgz#a16dbe54522d7fa5ef1389129d813fd47b148014" @@ -11151,6 +12286,16 @@ string.prototype.trim@^1.2.8: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trim@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" + integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.0" + es-object-atoms "^1.0.0" + string.prototype.trimend@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" @@ -11160,6 +12305,15 @@ string.prototype.trimend@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trimend@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" + integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + string.prototype.trimstart@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" @@ -11169,6 +12323,15 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trimstart@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde" + integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -11183,11 +12346,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -stringify-package@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" - integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== - "strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -11293,6 +12451,11 @@ symbol-observable@4.0.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205" integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ== +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + synckit@^0.8.6: version "0.8.6" resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.6.tgz#b69b7fbce3917c2673cbdc0d87fb324db4a5b409" @@ -11464,15 +12627,36 @@ totalist@^3.0.0: resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8" integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ== +tough-cookie@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + +tr46@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec" + integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g== + dependencies: + punycode "^2.3.1" + tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== -traverse@^0.6.7: - version "0.6.7" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.7.tgz#46961cd2d57dd8706c36664acde06a248f1173fe" - integrity sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg== +traverse@^0.6.9: + version "0.6.9" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.9.tgz#76cfdbacf06382d460b76f8b735a44a6209d8b81" + integrity sha512-7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg== + dependencies: + gopd "^1.0.1" + typedarray.prototype.slice "^1.0.3" + which-typed-array "^1.1.15" tree-kill@1.2.2: version "1.2.2" @@ -11496,13 +12680,13 @@ ts-api-utils@^1.0.1, ts-api-utils@^1.3.0: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== -ts-morph@^20.0.0: - version "20.0.0" - resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-20.0.0.tgz#c46b4c231dfc93347091901f1f9a3e13413230fd" - integrity sha512-JVmEJy2Wow5n/84I3igthL9sudQ8qzjh/6i4tmYCm6IqYyKFlNbJZi7oBdjyqcWSWYRu3CtL0xbT6fS03ESZIg== +ts-morph@^22.0.0: + version "22.0.0" + resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-22.0.0.tgz#5532c592fb6dddae08846f12c9ab0fc590b1d42e" + integrity sha512-M9MqFGZREyeb5fTl6gNHKZLqBQA0TjA1lea+CR48R8EBTDuWrNqW6ccC5QvjNR4s6wDumD3LTCjOFSp9iwlzaw== dependencies: - "@ts-morph/common" "~0.21.0" - code-block-writer "^12.0.0" + "@ts-morph/common" "~0.23.0" + code-block-writer "^13.0.1" tsconfig-paths@^3.15.0: version "3.15.0" @@ -11528,7 +12712,7 @@ tslib@2.6.2, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.6. resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -11620,6 +12804,15 @@ typed-array-buffer@^1.0.0: get-intrinsic "^1.2.1" is-typed-array "^1.1.10" +typed-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-typed-array "^1.1.13" + typed-array-byte-length@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" @@ -11630,6 +12823,17 @@ typed-array-byte-length@^1.0.0: has-proto "^1.0.1" is-typed-array "^1.1.10" +typed-array-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + typed-array-byte-offset@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" @@ -11641,6 +12845,18 @@ typed-array-byte-offset@^1.0.0: has-proto "^1.0.1" is-typed-array "^1.1.10" +typed-array-byte-offset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + typed-array-length@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" @@ -11650,11 +12866,35 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" +typed-array-length@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3" + integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" + typed-assert@^1.0.8: version "1.0.9" resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213" integrity sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg== +typedarray.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.3.tgz#bce2f685d3279f543239e4d595e0d021731d2d1a" + integrity sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.0" + es-errors "^1.3.0" + typed-array-buffer "^1.0.2" + typed-array-byte-offset "^1.0.2" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -11789,6 +13029,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -11824,6 +13069,14 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -11901,6 +13154,13 @@ w3c-keyname@^2.2.4: resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5" integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ== +w3c-xmlserializer@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c" + integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA== + dependencies: + xml-name-validator "^5.0.0" + watchpack@2.4.0, watchpack@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" @@ -11933,6 +13193,11 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + webpack-bundle-analyzer@^4.10.2: version "4.10.2" resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd" @@ -12074,6 +13339,26 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +whatwg-encoding@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5" + integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ== + dependencies: + iconv-lite "0.6.3" + +whatwg-mimetype@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a" + integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg== + +whatwg-url@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6" + integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw== + dependencies: + tr46 "^5.0.0" + webidl-conversions "^7.0.0" + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -12114,6 +13399,17 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.13: gopd "^1.0.1" has-tostringtag "^1.0.0" +which-typed-array@^1.1.14, which-typed-array@^1.1.15: + version "1.1.15" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" + integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.2" + which-typed-array@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" @@ -12236,6 +13532,11 @@ ws@^8.13.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== +ws@^8.16.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + ws@~8.11.0: version "8.11.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" @@ -12246,6 +13547,16 @@ xhr2@^0.2.0: resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93" integrity sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw== +xml-name-validator@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673" + integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xmldoc@^1.1.2: version "1.3.0" resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-1.3.0.tgz#7823225b096c74036347c9ec5924d06b6a3cebab" @@ -12278,6 +13589,11 @@ yaml@2.3.4: resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2" integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== +yaml@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed" + integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg== + yargs-parser@21.1.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" @@ -12288,7 +13604,7 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.6.2: +yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.6.2, yargs@^17.7.2: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== @@ -12301,7 +13617,7 @@ yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.6.2: y18n "^5.0.5" yargs-parser "^21.1.1" -yargs@^16.0.0, yargs@^16.1.1, yargs@^16.2.0: +yargs@^16.1.1, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==

    TypRessourceTypRessource
    - + + iconsrc  {{ subject?.iconlabel }} + {{ subject!.valuelabel[0] }}:  + >{{ subject?.valuelabel[0] }}: