Merge branch 'rism-digital:develop' into fix/musicxml-backward-ties

rism-digital · Oct 21, 2023 · 6ade359 · 6ade359
2 parents 33ac21f + f8a33ee
commit 6ade359
Show file tree

Hide file tree

Showing 589 changed files with 60,758 additions and 62,178 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -0,0 +1,11 @@
+# Contribution guidelines
+
+This document sets out the methods and practices for contributing to the Verovio project.
+
+## Contributor License Agreement
+
+In order to contribute the the project you need to sign and send us a [Contributor License Agreement](https://rism.digital/resources/verovio-cla.pdf) (CLA). However, following a generally accepted practice, very small contributions (below 20 lines of code) will be accepted without signing the CLA.
+
+## Coding Guidelines
+
+Please follow the [coding guidelines](https://book.verovio.org/contributing/guidelines.html).
diff --git a/.github/workflows/ci_build.yml b/.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 }}

diff --git a/.github/workflows/clang-format-check.yml b/.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:

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-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

diff --git a/.github/workflows/tests_build.yml b/.github/workflows/tests_build.yml
@@ -2,7 +2,7 @@ name: Test Suite Evaluation
 
 on:
   pull_request:
-    branches: develop
+    branches: [develop]
   # TODO: run this task only on PR in production; use push event for testing
   #push:
     #branches:
@@ -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 }}/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,22 @@
 # Changelog
 
-## [unreleased]
+## [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
+* Support for rectangular tone clusters (@eNote-GmbH)
 * Support for delayed turns on chords (@eNote-GmbH)
+* Support for `pgHead@func` and `pgFoot@func` instead of `pgHead2` and `pgFoot2`
+* Support for `ending@lform` and `ending@label`
+* Update key signature handling according to the latest changes in MEI
 * Improve endpoint location for spanning slurs (@eNote-GmbH)
 * Improve layout for inner slurs in cross-staff situations (@eNote-GmbH)
 * Fix validity of MEI output by ensuring correct element order
+* Option --neume-as-note to render neumes as CMWN notes
 * Option --octave-no-spanning-parentheses to prevent () in spanning octave displacements (@eNote-GmbH)
 
 ## [3.15.0] - 2023-03-01

diff --git a/Verovio.podspec b/Verovio.podspec
@@ -1,21 +1,21 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '3.16.0-dev'
-  s.license        = { :type => 'LGPL' }
+  s.version        = '4.1.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