Merge pull request rism-digital#123 from DDMAL/update-verovio

Merge Verovio upstream changes

.github/workflows/ci_build.yml

@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Installation step for Ubuntu
       - name: Configure Ubuntu with ${{ matrix.compiler }}-${{ matrix.version }}
@@ -239,7 +239,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create TEMP_DIR
         working-directory: ${{ github.workspace }}
@@ -291,7 +291,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create TEMP_DIR
         working-directory: ${{ github.workspace }}
@@ -353,7 +353,7 @@ jobs:
 
     steps:
       - name: Checkout GH_PAGES_REPO into GH_PAGES_DIR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # repository to check out
           repository: ${{ env.GH_PAGES_REPO }}
@@ -435,7 +435,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install doxygen
         run: |
@@ -472,7 +472,7 @@ jobs:
 
     steps:
       - name: Checkout DOXYGEN_REPO into DOXYGEN_DIR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # repository to check out
           repository: ${{ env.DOXYGEN_REPO }}

.github/workflows/clang-format-check.yml

@@ -16,7 +16,7 @@ jobs:
     name: Check for ${{ matrix.path['check'] }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run clang-format style check for C/C++ programs.
         uses: jidicula/[email protected]
         with:

.github/workflows/python-ci-wheel.yml

@@ -24,7 +24,7 @@ jobs:
       # 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", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         architecture: [x86, x64]
         include:
           - os: macos-latest
@@ -48,7 +48,7 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -82,7 +82,7 @@ jobs:
       #===============================================#
       # wheels
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.1
+        uses: pypa/cibuildwheel@v2.16.1
         with:
           output-dir: wheelhouse
         env:
@@ -147,7 +147,7 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -224,7 +224,7 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v4

.github/workflows/tests_build.yml

@@ -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@v3
+        uses: actions/checkout@v4
         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@v3
+        uses: actions/checkout@v4
         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@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: ${{ env.PR_DIR }}/

.gitignore

@@ -99,3 +99,4 @@ Release/
 # Intermediate font files
 fonts/**/tmp
 libmei/tools/__pycache__
+doc/.venv

CHANGELOG.md

@@ -1,6 +1,24 @@
 # Changelog
 
 ## [unreleased]
+
+## [4.1.0] - 2023-12-15
+* Support for staves ordered by `scoreDef`
+* Support for `rend@letterspacing` and `syl@letterspacing` in MEI vu
+* Support for `nc@loc`
+* Support for `[email protected]`
+* Support for `[email protected]` with `@headshape="diammond"`
+* Support for `[email protected]`
+* Improved metadata in the Humdrum importer (@gregchapman-dev)
+* Improved layout with labels in verses
+* Fix validity of the MEI header output in MEI Basic
+* Fix for the Java binding and cocoaPods
+
+## [4.0.1] - 2023-09-05
+* Fix MEI version in output
+
+## [4.0.0] - 2023-09-05
+* Update schemas to MEI 5.0 and corresponding adjustments
 * Support for `space` within `beam`
 
 ## [3.16.0] - 2023-07-03

Verovio.podspec

@@ -1,21 +1,21 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '3.17.0-dev'
-  s.license        = { :type => 'LGPL' }
+  s.version        = '4.2.0-dev'
+  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' }
   s.summary        = 'Verovio'
   s.source         = { :git => 'https://github.com/rism-digital/verovio.git', :tag => 'version-' + s.version.to_s }
-  s.swift_versions = ['3.0', '4.0', '4.1', '4.2', '5.0','5.1']
+  s.swift_versions = ['3.0', '4.0', '4.1', '4.2', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7']
   s.source_files        = 'src/**/*.{h,cpp,cc}',
-                          'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
-                          'libmei/{dist,addons}/*.{h,cpp}'
+                        'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
+                        'libmei/{dist,addons}/*.{h,cpp}'
   s.public_header_files = 'src/**/*.{h}',
                           'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
                           'libmei/{dist,addons}/*.{h}'
   s.resources      = 'data'
-  s.ios.deployment_target = '10.0'
-  s.osx.deployment_target = '10.13'
+  s.ios.deployment_target = '14.0'
+  s.osx.deployment_target = '10.15'
   s.pod_target_xcconfig = {
       "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
       "CLANG_CXX_LIBRARY" => "libc++",
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
       "MTL_FAST_MATH" => "YES",
       "SUPPORTS_UIKITFORMAC" => "NO",
       "MTL_ENABLE_DEBUG_INFO" => "NO",
-      "PRODUCT_BUNDLE_IDENTIFIER" => "com.rism.VerovioFramework"
+      "PRODUCT_BUNDLE_IDENTIFIER" => "digital.rism.VerovioFramework"
     }
 end
 

Verovio.xcodeproj/project.pbxproj

@@ -2615,8 +2615,9 @@
 				4DF2AF7D1A62F6A50016F869 /* drawinginterface.h */,
 				8F086EBE188539540037FD8E /* durationinterface.cpp */,
 				8F59291518854BF800FE51AD /* durationinterface.h */,
-				4DA0EAD322BB77AF00A7EBEB /* facsimileinterface.h */,
 				4DA0EAE922BB77C300A7EBEB /* facsimileinterface.cpp */,
+				4DA0EAD322BB77AF00A7EBEB /* facsimileinterface.h */,
+				4DE0B9A02988070C00D4C939 /* interface.h */,
 				4D94721E20CA702C00C780C8 /* linkinginterface.cpp */,
 				4D94721C20CA701000C780C8 /* linkinginterface.h */,
 				8F086ECF188539540037FD8E /* pitchinterface.cpp */,
@@ -2771,7 +2772,6 @@
 				4D95D4F41D7185DE00B2B856 /* floatingobject.h */,
 				4D09D3EC1EA8AD8500A420E6 /* horizontalaligner.cpp */,
 				4D14600F1EA8A913007DB90C /* horizontalaligner.h */,
-				4DE0B9A02988070C00D4C939 /* interface.h */,
 				4DACC93F2990ED2600B55913 /* libmei.h */,
 				8F086ECD188539540037FD8E /* object.cpp */,
 				8F59292418854BF800FE51AD /* object.h */,

bindings/java/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.rism.verovio</groupId>
   <artifactId>VerovioToolkit</artifactId>
-  <version>3.17.0-dev</version>
+  <version>4.2.0-dev</version>
   <packaging>jar</packaging>
 
   <name>VerovioToolkit</name>
@@ -29,11 +29,11 @@
                <goal>run</goal>
              </goals>
              <configuration>
-               <tasks>
+               <target>
                  <property name="native.classpath" refid="maven.compile.classpath" />
                  <echo file="${project.build.directory}/compile-classpath" message="${native.classpath}" />
                  <exec dir="." executable="./build.sh" failonerror="true"/>
-               </tasks>
+               </target>
              </configuration>
            </execution>
          </executions>

bindings/python/.pypi-version

@@ -1,3 +1,3 @@
 # dummy file used by setup.py for counting revisions when publishing to test.pypi
 # counting can be reset by making a change to this file
-3.17.0
+4.2.0

codemeta.json

@@ -4,8 +4,8 @@
   "identifier": "Verovio",
   "name": "Verovio",
   "description": "Verovio is a fast, portable and lightweight open-source library for engraving Music Encoding Initiative (MEI) music scores into SVG.",
-  "softwareVersion": "3.17.0-dev",
-  "datePublished": "2023-07-03",
+  "softwareVersion": "4.2.0-dev",
+  "datePublished": "2023-12-15",
   "license": "https://www.gnu.org/licenses/lgpl-3.0",
   "programmingLanguage": [{
     "@type": "ComputerLanguage",

doc/diffTests.sh

@@ -30,8 +30,10 @@ then
     echo "Emptying directories ..."
     rm $indir1/*/*.png
     rm $indir1/*/*.svg
+    rm $indir1/*/*.json
     rm $indir2/*/*.png
     rm $indir2/*/*.svg
+    rm $indir2/*/*.json
     rm $outdir/*/*.png
     rm $outdir/index.html
 fi

emscripten/buildToolkit

@@ -122,6 +122,7 @@ if ($wasmQ) {
 	$LFLAGS .= " -s INITIAL_MEMORY=512MB";
 	$LFLAGS .= " -s STACK_SIZE=256MB";
 	$LFLAGS .= " -s SINGLE_FILE=1";
+	$LFLAGS .= " -s INCOMING_MODULE_JS_API=onRuntimeInitialized";
 	$FLAGS_NAME = "-wasm";
 }
 
@@ -240,16 +241,17 @@ if ($makeQ) {
 
 print "*************\nBuilding makefile...\n";
 my $cmakeCmd = "$EMCMAKE cmake ../cmake $cmake -DCMAKE_CXX_FLAGS=\"$FLAGS\"";
+print "$cmakeCmd\n" if $CHATTY;
 system($cmakeCmd) == 0 or die "system $cmakeCmd failed: $?";
 
 print "*************\nCompiling...\n";
 my $makeCmd = "$EMMAKE make -j 8";
+print "$makeCmd\n" if $CHATTY;
 system($makeCmd);
 
 print "*************\nLinking...\n";
 my $ccCmd = "$EMCC $CHATTY libverovio.a $LFLAGS $FLAGS $embed $exports $extra_exports $output $modularize";
 print "$ccCmd\n" if $CHATTY;
-
 system($ccCmd);
 
 if ($? == 0) {

emscripten/npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verovio",
-  "version": "3.17.0-alpha",
+  "version": "4.2.0-alpha",
   "description": "This is the stable version of the verovio package",
   "main": "dist/verovio-toolkit-wasm.js",
   "exports": {