Merge branch 'develop'

# Conflicts: # CHANGELOG.md # src/svgdevicecontext.cpp
rism-digital · Nov 23, 2022 · 2cb8488 · 2cb8488
2 parents 30d149f + c1af77c
commit 2cb8488
Show file tree

Hide file tree

Showing 186 changed files with 22,209 additions and 18,292 deletions.
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -44,7 +44,7 @@ env:
   # emscripten
   EM_VERSION: latest
   EM_CACHE_FOLDER: "emsdk-cache"
-  EM_CACHE_ID: 1
+  EM_CACHE_ID: 2
 
   # gh-pages
   GH_PAGES_REPO: ${{ github.repository_owner }}/verovio.org # works from rism-digital and from forks
@@ -98,21 +98,21 @@ jobs:
             compiler: clang
             version: "12"
 
-          - os: macos-10.15
+          - os: macos-latest
             compiler: xcode
             version: "11.7"
 
-          - os: macos-10.15
+          - os: macos-latest
             compiler: xcode
-            version: "12.1"
+            version: "12.5.1"
 
-          - os: macos-10.15
+          - os: macos-latest
             compiler: g++
             version: "9"
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Installation step for Ubuntu
       - name: Configure Ubuntu with ${{ matrix.compiler }}-${{ matrix.version }}
@@ -190,7 +190,7 @@ jobs:
 
     steps:
       - name: Set up cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache
         with:
           # path for cache
@@ -239,7 +239,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Create TEMP_DIR
         working-directory: ${{ github.workspace }}
@@ -248,7 +248,7 @@ jobs:
       # Restore system libraries from cache
       - name: Restore cache
         id: restore_cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # path for cache
           path: ${{ env.EM_CACHE_FOLDER }}
@@ -276,11 +276,36 @@ jobs:
 
       - name: Upload js build artifact (${{ matrix.toolkit.target }})
         if: ${{ matrix.toolkit.upload == true }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.TOOLKIT_BUILD }}
           path: ${{ github.workspace }}/${{ env.TEMP_DIR }}/${{ matrix.toolkit.filepath }}
 
+
+  ############################
+  # Copy the font CSS files  #
+  ############################
+  copy_font_files:
+    name: Copy the font files
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout main repo
+        uses: actions/checkout@v3
+
+      - name: Create TEMP_DIR
+        working-directory: ${{ github.workspace }}
+        run: mkdir -p $TEMP_DIR/data
+
+      - name: Copy build into TEMP_DIR
+        run: cp data/*.css $GITHUB_WORKSPACE/$TEMP_DIR/data/
+
+      - name: Upload font data artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.TOOLKIT_BUILD }}
+          path: ${{ github.workspace }}/${{ env.TEMP_DIR }}
+
   ##################################
   # Check settings for deployment  #
   ##################################
@@ -328,7 +353,7 @@ jobs:
 
     steps:
       - name: Checkout GH_PAGES_REPO into GH_PAGES_DIR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # repository to check out
           repository: ${{ env.GH_PAGES_REPO }}
@@ -341,14 +366,14 @@ jobs:
           path: ${{ env.GH_PAGES_DIR }}
 
       - name: Download TOOLKIT_BUILD artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ env.TOOLKIT_BUILD }}
           path: artifacts/${{ env.TOOLKIT_BUILD }}
 
       - name: Copy artifacts to gh-pages
         run: |
-          cp artifacts/$TOOLKIT_BUILD/* $GH_PAGES_DIR/javascript/develop/
+          cp -r artifacts/$TOOLKIT_BUILD/* $GH_PAGES_DIR/javascript/develop/
 
       - name: Check git status before commit
         working-directory: ${{ env.GH_PAGES_DIR }}
@@ -410,7 +435,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install doxygen
         run: |
@@ -430,7 +455,7 @@ jobs:
         run: (cat verovio.conf ; echo "OUTPUT_DIRECTORY = $GITHUB_WORKSPACE/$DOXYGEN_DIR") | doxygen -
 
       - name: Upload doxygen build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.DOC_BUILD }}
           path: ${{ github.workspace }}/${{ env.DOXYGEN_DIR }}
@@ -447,7 +472,7 @@ jobs:
 
     steps:
       - name: Checkout DOXYGEN_REPO into DOXYGEN_DIR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # repository to check out
           repository: ${{ env.DOXYGEN_REPO }}
@@ -460,7 +485,7 @@ jobs:
           path: ${{ env.DOXYGEN_DIR }}
 
       - name: Download DOC_BUILD artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ env.DOC_BUILD }}
           path: artifacts/${{ env.DOC_BUILD }}

diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -15,7 +15,7 @@ jobs:
     name: Check for ${{ matrix.path['check'] }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Run clang-format style check for C/C++ programs.
         uses: jidicula/[email protected]
         with:

diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
@@ -21,10 +21,10 @@ jobs:
     strategy:
       # Ensure that a wheel builder finishes even if another fails
       fail-fast: false
-      # Build the wheels for Linux, Windows and macOS for Python 3.10
+      # Build the wheels for Linux, Windows and macOS
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         architecture: [x86, x64]
         include:
           - os: macos-latest
@@ -48,7 +48,7 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -57,7 +57,7 @@ jobs:
           nuget-version: "latest"
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.architecture }}
@@ -82,7 +82,7 @@ jobs:
       #===============================================#
       # wheels
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.11.1
         with:
           output-dir: wheelhouse
         env:
@@ -132,7 +132,7 @@ jobs:
 
       #===============================================#
       # Upload artifacts
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: cibuildwheel-${{ runner.os }}-python-${{ matrix.python-version }}
           path: ./wheelhouse/*.whl
@@ -147,12 +147,12 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
 
@@ -208,7 +208,7 @@ jobs:
 
       #===============================================#
       # Upload artifact
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: sdist-${{ runner.os }}-python-3.9
           path: dist/*.tar.gz
@@ -224,10 +224,10 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
           architecture: "x64"
@@ -242,7 +242,7 @@ jobs:
       #===============================================#
       # Prepare artifacts
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: bindings/python/artifacts/
 

diff --git a/.github/workflows/tests_build.yml b/.github/workflows/tests_build.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: FranzDiebold/github-env-vars-action@v2.4.0
+      - uses: FranzDiebold/github-env-vars-action@v2.7.0
       - name: Get Short SHA
         run: |
           echo "SHORT_SHA=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV
@@ -45,7 +45,7 @@ jobs:
           echo "OUTPUT_DIR=${{ github.event.pull_request.number }}/${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
       - name: Checkout GH_PAGES_BRANCH into GH_PAGES_DIR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ env.GH_PAGES_REPO }}
           ref: ${{ env.GH_PAGES_BRANCH }}
@@ -67,7 +67,7 @@ jobs:
           python3 -m pip install diffimg jsondiff lxml xmldiff cairosvg
 
       - name: Checkout the dev branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: develop
           path: ${{ env.DEV_DIR }}/
@@ -88,7 +88,7 @@ jobs:
           python3 ../../doc/test-suite.py ${{ github.workspace }}/${{env.GH_PAGES_DIR}}/musicxmlTestSuite ${{ github.workspace }}/${{ env.TEMP_DIR }}/${{ env.DEV_DIR }}/
 
       - name: Checkout the PR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: ${{ env.PR_DIR }}/
@@ -109,50 +109,19 @@ jobs:
           ls -al
 
       - name: Upload results as artefacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: test-suite-diff
           path: ${{ github.workspace }}/${{ env.OUTPUT_DIR }}/
 
       - name: Check existence of the log.md file
         id: check_files
-        uses: andstor/file-existence-action@v1
+        uses: andstor/file-existence-action@v2
         with:
           files: "${{ github.workspace }}/${{ env.OUTPUT_DIR }}/log.md"
 
-      - name: Check user permission to add a comment
-        id: check_permission
-        uses: scherermichael-oss/action-has-permission@master
-        with:
-          required-permission: write
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run only if user has NOT sufficient permissions
-        if: steps.check_files.outputs.files_exists == 'true' && !steps.check_permission.outputs.has-permission
+      - name: Show the list of changes detected
+        if: steps.check_files.outputs.files_exists == 'true'
         run: |
-          echo "Sorry! Your permissions are insufficient to list the results as a comment."
-          cat ${{ github.workspace }}/${{ env.OUTPUT_DIR }}/log.md
-
-      - name: Generate comment content
-        id: get-comment-body
-        if: steps.check_files.outputs.files_exists == 'true' && steps.check_permission.outputs.has-permission
-        run: |
-          link="Results for the run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})"
-          body="$link\n$(cat ${{ github.workspace }}/${{ env.OUTPUT_DIR }}/log.md)"
-          body="${body//'%'/'%25'}"
-          body="${body//$'\n'/'\r\n'}"
-          echo ::set-output name=body::$body
-
-      - name: Add comment with link
-        if: steps.check_files.outputs.files_exists == 'true' && steps.check_permission.outputs.has-permission
-        uses: actions/github-script@v3
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: "${{ steps.get-comment-body.outputs.body }}"
-            })
+          echo "This is the list of tests for which a change has been detected:"
+          cat ${{ github.workspace }}/${{ env.OUTPUT_DIR }}/log.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [unreleased]
+* Refactoring of the JSON parameters and returned values as dictionaries for the Python binding
+* Support for text font fallback when a glyph is missing in the selected font
+* Support for Plaine and Easie gross and refined contour feature extraction
+* Support for `dblserpent` barlines (@eNote-GmBH)
+* Support for `@dir.dist` and `@tempo.dist` (@eNote-GmBH)
+* Support for persian accidentals (sori and koron)
+* Support for heavy barlines (@eNote-GmBH)
+* Support for log level selection (warning by default)
+* Support for controlling log in the JS toolkit (@WolfgangDrescher)
+* Option --smuflTextFont for controlling text font embedding or linking CSS fonts
+* Option --lyricElision for selecting elision glyph (regular, wide, narrow or unicde)
+* Option --log-level (-l) for controlling the log level from the command-line tool
+* Method getOption(bool) split as getOptions() and getDefaultOptions()
+* Fixes in the PAE importer (@carlolic)
+
 ## [3.12.1] - 2022-10-06
 * Fix `graphic` misssing in ios framework
 * Fix bug when CSS font is not found