Merge branch 'develop'

# Conflicts: # CHANGELOG.md # Verovio.podspec # bindings/iOS/all.h # bindings/java/pom.xml # codemeta.json # emscripten/npm/package.json # include/vrv/vrvdef.h
rism-digital · Nov 25, 2024 · e70e09c · e70e09c
2 parents 3b8cc17 + 391d699
commit e70e09c
Show file tree

Hide file tree

Showing 1,042 changed files with 73,576 additions and 94,238 deletions.
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -36,6 +36,7 @@ env:
   # build artifacts
   DOC_BUILD: doc-build
   TOOLKIT_BUILD: toolkit-build
+  FONTS: fonts
 
   # doxygen
   DOXYGEN_REPO: ${{ github.repository_owner }}/verovio-doxygen # works from rism-digital and from forks
@@ -88,23 +89,39 @@ jobs:
 
           - os: ubuntu-20.04
             compiler: clang
-            version: "10"
+            version: "11"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             compiler: clang
-            version: "11"
+            version: "12"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             compiler: clang
             version: "12"
 
-          - os: macos-latest
-            compiler: xcode
-            version: "14.3"
+          - os: ubuntu-22.04
+            compiler: clang
+            version: "12"
+
+          - os: ubuntu-22.04
+            compiler: clang
+            version: "13"
+
+          - os: ubuntu-22.04
+            compiler: clang
+            version: "14"
+
+          - os: ubuntu-22.04
+            compiler: clang
+            version: "11"
+
+          - os: ubuntu-22.04
+            compiler: clang
+            version: "15"
 
           - os: macos-latest
             compiler: xcode
-            version: "15.3"
+            version: "15.4"
 
           - os: macos-latest
             compiler: g++
@@ -276,9 +293,9 @@ jobs:
 
       - name: Upload js build artifact (${{ matrix.toolkit.target }})
         if: ${{ matrix.toolkit.upload == true }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.4.3
         with:
-          name: ${{ env.TOOLKIT_BUILD }}
+          name: ${{ env.TOOLKIT_BUILD }}-${{ github.run_id }}
           path: ${{ github.workspace }}/${{ env.TEMP_DIR }}/${{ matrix.toolkit.filepath }}
 
 
@@ -301,9 +318,9 @@ jobs:
         run: cp data/*.css $GITHUB_WORKSPACE/$TEMP_DIR/data/
 
       - name: Upload font data artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.4.3
         with:
-          name: ${{ env.TOOLKIT_BUILD }}
+          name: ${{ env.FONTS }}-${{ github.run_id }}
           path: ${{ github.workspace }}/${{ env.TEMP_DIR }}
 
   ##################################
@@ -366,15 +383,25 @@ jobs:
           path: ${{ env.GH_PAGES_DIR }}
 
       - name: Download TOOLKIT_BUILD artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4.1.7
         with:
-          name: ${{ env.TOOLKIT_BUILD }}
+          name: ${{ env.TOOLKIT_BUILD }}-${{ github.run_id }}
           path: artifacts/${{ env.TOOLKIT_BUILD }}
 
-      - name: Copy artifacts to gh-pages
+      - name: Copy the toolkit artifacts to gh-pages
         run: |
           cp -r artifacts/$TOOLKIT_BUILD/* $GH_PAGES_DIR/javascript/develop/
 
+      - name: Download FONTS artifacts
+        uses: actions/[email protected]
+        with:
+          name: ${{ env.FONTS }}-${{ github.run_id }}
+          path: artifacts/${{ env.FONTS }}
+
+      - name: Copy the fonts artifacts to gh-pages
+        run: |
+          cp -r artifacts/$FONTS/* $GH_PAGES_DIR/javascript/develop/
+
       - name: Check git status before commit
         working-directory: ${{ env.GH_PAGES_DIR }}
         run: |
@@ -455,9 +482,9 @@ jobs:
         run: (cat verovio.conf ; echo "OUTPUT_DIRECTORY = $GITHUB_WORKSPACE/$DOXYGEN_DIR") | doxygen -
 
       - name: Upload doxygen build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.4.3
         with:
-          name: ${{ env.DOC_BUILD }}
+          name: ${{ env.DOC_BUILD }}-${{ github.run_id }}
           path: ${{ github.workspace }}/${{ env.DOXYGEN_DIR }}
 
   ###############################################
@@ -485,9 +512,9 @@ jobs:
           path: ${{ env.DOXYGEN_DIR }}
 
       - name: Download DOC_BUILD artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4.1.7
         with:
-          name: ${{ env.DOC_BUILD }}
+          name: ${{ env.DOC_BUILD }}-${{ github.run_id }}
           path: artifacts/${{ env.DOC_BUILD }}
 
       - name: Remove old doc and copy build artifacts to DOXYGEN_DIR

diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
@@ -24,7 +24,7 @@ jobs:
       # Build the wheels for Linux, Windows and macOS
       matrix:
         os: [macos-13, macos-14, windows-latest, ubuntu-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         architecture: [x86, x64, arm64]
         include:
           - os: macos-13
@@ -96,19 +96,19 @@ jobs:
       #===============================================#
       # wheels
       - name: Build wheels
-        uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce # v2.17.0
+        uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b # v2.21.3
         with:
           output-dir: wheelhouse
         env:
           CIBW_BUILD: ${{ env.CIBW_BUILD_IDENTIFIER }}
           CIBW_ARCHS_MACOS: x86_64 arm64
           CIBW_ENVIRONMENT_MACOS:
-            MACOSX_DEPLOYMENT_TARGET=10.15
+            MACOSX_DEPLOYMENT_TARGET=11
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
           CIBW_BEFORE_ALL_MACOS: brew update && brew install swig
           CIBW_BEFORE_ALL_WINDOWS: choco install swig -f -y
-          CIBW_BEFORE_BUILD: swig -version && bash -c 'cd tools; ./get_git_commit.sh' && swig -c++ -python -py3 ./bindings/python/verovio.i
+          CIBW_BEFORE_BUILD: swig -version && bash -c 'cd tools; ./get_git_commit.sh' && swig -c++ -python -py3 -fastproxy -olddefs ./bindings/python/verovio.i
 
       #===============================================#
       # Check build
@@ -256,7 +256,7 @@ jobs:
       #===============================================#
       # Prepare artifacts
       - name: Download artifacts
-        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        uses: actions/download-artifact@v4.1.7 # v4.1.7
         with:
           path: bindings/python/artifacts/
 

diff --git a/.github/workflows/tests_build.yml b/.github/workflows/tests_build.yml
@@ -32,7 +32,7 @@ jobs:
   ###################################################
   build_python:
     name: Build the test suite
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: FranzDiebold/[email protected]
@@ -62,7 +62,7 @@ jobs:
           mkdir -p ${{ env.OUTPUT_DIR }}
           ls -alh
           ls -alh ${{ env.OUTPUT_DIR }}
-          sudo apt-get install openresolv wireguard
+          sudo apt-get install wireguard
           sudo echo "${{ secrets.VPN_CONFIGURATION }}" > wg0.conf
           python3 -m pip install diffimg jsondiff lxml xmldiff cairosvg
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [4.4.0] – 2024-11-25
+* Support for CMME import
+* Support for conversion from mensural to CMN (with `--mensural-to-cmn`)
+* Improved mensural cast-off (without `barLine`)
+* Improved justification of last / single pages (@brdvd)
+* Improved performance by optimizing glyph lookup (@brdvd)
+* Improved facsimile rendering
+* Connection of ledger lines to notes or accidentals with `--svg-html5`
+* Refactoring of internal time alignment using fraction instead of double
+* Option `--timemap` for controlling the time map from the command-line
+* Option `--mensural-to-measure` renamed `--mensural-to-cmn`
+* Option `--duration-equivalence` (`brevis`, `semibrevis` or `minima`) for mensural alignment
+* Option `--mensural-responsive-view` for cast-off on simplified encoding
+
+## [4.3.1] - 2024-09-10
+* Fix JS builds (JavaScript release only)
+
 ## [4.3.0] - 2024-09-10
 * Support (initial) for Volpiano input
 * Support for neumatic notation oriscus and quilisma

diff --git a/Verovio.podspec b/Verovio.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '4.3.0'
+  s.version        = '4.4.0'
   s.license        = { :type => 'LGPL', :file => 'COPYING' }
   s.homepage       = 'https://www.verovio.org/index.xhtml'
   s.authors        = { 'Contributors List' => 'https://github.com/rism-digital/verovio/graphs/contributors' }