Merge branch 'develop'

# Conflicts:
#	CHANGELOG.md
#	Verovio.podspec
#	bindings/java/pom.xml
#	codemeta.json
#	emscripten/npm/package.json
#	include/vrv/vrvdef.h

.github/workflows/ci_build.yml

@@ -45,6 +45,7 @@ env:
   # emscripten
   EM_VERSION: latest
   EM_CACHE_FOLDER: "emsdk-cache"
+  EM_CACHE_ID: 1
 
   # gh-pages
   GH_PAGES_REPO: ${{ github.repository_owner }}/verovio.org # works from rism-digital and from forks
@@ -226,7 +227,7 @@ jobs:
           # path for cache
           path: ${{ env.EM_CACHE_FOLDER }}
           # key for cache
-          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}
+          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}-${{ env.EM_CACHE_ID }}
 
       - name: Set up emsdk
         uses: mymindstorm/setup-emsdk@v11
@@ -282,11 +283,11 @@ jobs:
           # path for cache
           path: ${{ env.EM_CACHE_FOLDER }}
           # key for cache
-          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}
+          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}-${{ env.EM_CACHE_ID }}
 
       # Install and/or activate emsdk
       - name: Set up emsdk
-        uses: mymindstorm/setup-emsdk@v7
+        uses: mymindstorm/setup-emsdk@v11
         with:
           version: ${{ env.EM_VERSION }}
           actions-cache-folder: ${{ env.EM_CACHE_FOLDER }}

.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.9
+      # Build the wheels for Linux, Windows and macOS for Python 3.10
       matrix:
         os: [macos-latest, windows-latest, ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         architecture: [x86, x64]
         include:
           - os: macos-latest
@@ -82,15 +82,14 @@ jobs:
       #===============================================#
       # wheels
       - name: Build wheels
-        uses: joerick/cibuildwheel@f3dae81e82da2a2a36338269e32f3adb7b42dc8c
+        uses: pypa/cibuildwheel@v2.3.1
         with:
           output-dir: wheelhouse
         env:
           CIBW_SKIP: cp27-* # manylinux2014 not compatible with python 2.7
           CIBW_BUILD: ${{ env.CIBW_BUILD_IDENTIFIER }}
-          # TODO: change back to "manylinux2014" when cibuildwheel releases new version
-          CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64:2021-02-17-8d1372a
-          CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2014_i686:2021-02-17-8d1372a
+          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

.gitignore

@@ -94,5 +94,3 @@ Release/
 *.vcxproj*
 *.sln
 
-# Fonts
-fonts/tmp/

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [unreleased]
+* Support for `beatRpt@beatdef`
+* Support for `scoreDef` and `staffDef` `@dur.default` (@eNote-GmBH)
+* Support for MIDI output of grace notes and multi-measure rests (@eNote-GmBH)
+* Support for `@stem.sameas` on notes for orchestra scores
+* Support for MIDI output of arpeggios (@eNote-GmBH)
+* Support for tuplets in ABC importer (@eNote-GmBH)
+* Support for `beamSpan` (@eNote-GmBH)
+* Support for lyrics, tuplets and multiple tunes (`mdiv`) in ABC import (@eNote-GmBH)
+* Improved double stemmed beams (@eNote-GmBH)
+* Improved tablature MIDI output (@paul-bayleaf)
+* Improved PAE importer (nested beams, mensural dots, stemless notes)
+* Improved vertical positioning with half staff spacing above and below the systems
+* Improved justification (@eNote-GmBH)
+* Improved handling of the SMUFL fonts (@eNote-GmBH)
+* Additional parameters to the redoLayout method for faster cached layout redoing
+* Additional parameters to the renderToTimemap method for including rests and measure
+* Additional ids for rests and measure added to the getElementsAtTime methods
+* Option --svg-css for passing an additional CSS to be included in the SVG output
+* Preliminary support for stems and beam for guitar tablature
+* Preliminary support for tablature MusicXML import (@paul-bayleaf)
+
 ## [3.8.1] - 2022-01-10
 * Fix bug in PAE importer for durations and for key signatures
 
@@ -9,7 +31,6 @@
 * Improved layout with beams and control events (ornaments, fingering, etc.) (@eNote-GmBH)
 * Improve enharmonic tie overlap with accidentals (@eNote-GmBH)
 * Improved Plaine and Easie validation output with error codes and values
-* Improved adjacent note tie and enharmonic tie overlap (eNote-GmBH)
 * Additional parameters to the getMEI method for exporting selected content (@eNote-GmBH)
 * Option --multi-rest-thickness to control the thickness of measure rests (@eNote-GmBH)