Squashed commit of the following:

commit 2f0fed8 Merge: d7e0d9c a6355f4 Author: Andrew Hankinson <[email protected]> Date: Tue May 7 14:44:31 2024 +0200 Merge pull request rism-digital#3668 from musicEnfanthen/develop ci(gh-actions): include macos-14 in python wheel workflow (rebased) commit a6355f4 Author: musicEnfanthen <[email protected]> Date: Tue May 7 14:41:37 2024 +0200 ci(gh-actions): include macos-14 in python wheel workflow (rebased) commit d7e0d9c Author: Andrew Hankinson <[email protected]> Date: Tue May 7 11:01:43 2024 +0200 Tested GH actions This configuration has been tested and should work. commit a83cf81 Author: Laurent Pugin <[email protected]> Date: Wed May 1 12:34:16 2024 +0200 Update xcode versions commit 6aa2e96 Merge: ed140f4 8598527 Author: Laurent Pugin <[email protected]> Date: Wed May 1 11:33:47 2024 +0200 Merge pull request rism-digital#3654 from rettinghaus/update-midi Update Midifile library commit ed140f4 Author: Laurent Pugin <[email protected]> Date: Wed May 1 08:28:11 2024 +0200 Rename io.h/cpp to iobase to avoid conflicts. Closes rism-digital#3662 commit 8598527 Author: Klaus Rettinghaus <[email protected]> Date: Tue Apr 23 09:18:31 2024 +0200 update midifile commit da4bac4 Merge: 23b4e2d f6d5828 Author: Laurent Pugin <[email protected]> Date: Fri Apr 19 10:48:53 2024 +0200 Merge pull request rism-digital#3648 from rettinghaus/fix-dynam-extender only draw extender if set explicitly commit f6d5828 Author: Klaus Rettinghaus <[email protected]> Date: Mon Apr 15 09:45:15 2024 +0200 only draw extender if set explicitly commit 23b4e2d Merge: fa32d17 ff4649d Author: Laurent Pugin <[email protected]> Date: Tue Apr 9 10:45:59 2024 +0200 Merge pull request rism-digital#3644 from DavidBauer1984/fix/zip-file-reader Improve ZipFileReader commit ff4649d Author: David Bauer <[email protected]> Date: Mon Apr 8 21:15:06 2024 +0200 Fix HasFile implementation commit fa32d17 Merge: 24c3b85 b541da8 Author: Laurent Pugin <[email protected]> Date: Sat Mar 23 13:47:49 2024 +0100 Merge pull request rism-digital#3636 from rettinghaus/update-clang-action Update clang-format-action commit 24c3b85 Merge: c0e4854 0f834f1 Author: Laurent Pugin <[email protected]> Date: Sat Mar 23 10:45:58 2024 +0100 Merge pull request rism-digital#3628 from rettinghaus/fix/xmltied [skip-ci] fix ties from Dorico commit c0e4854 Merge: baeeaef 478a7c7 Author: Laurent Pugin <[email protected]> Date: Sat Mar 23 10:42:52 2024 +0100 Merge pull request rism-digital#3630 from DavidBauer1984/setlocale Set locale once in toolkit commit b541da8 Author: Klaus Rettinghaus <[email protected]> Date: Fri Mar 22 10:34:33 2024 +0100 formatting commit 2473700 Author: Klaus Rettinghaus <[email protected]> Date: Fri Mar 22 10:30:37 2024 +0100 Update clang-format-check.yml commit 478a7c7 Author: David Bauer <[email protected]> Date: Thu Mar 21 18:24:35 2024 +0100 Add proper methods and apply option in CLI commit ce8273d Author: David Bauer <[email protected]> Date: Thu Mar 21 16:30:44 2024 +0100 Add option --set-locale commit 2a8f0b0 Author: David Bauer <[email protected]> Date: Thu Mar 21 14:51:17 2024 +0100 Set locale in toolkit commit baeeaef Merge: 6a790ff f55d7bd Author: Andrew Hankinson <[email protected]> Date: Thu Mar 21 14:01:01 2024 +0100 Merge pull request rism-digital#3629 from rism-digital/dependabot/pip/fonts/black-24.3.0 Bump black from 22.12.0 to 24.3.0 in /fonts commit f55d7bd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed Mar 20 16:45:18 2024 +0000 Bump black from 22.12.0 to 24.3.0 in /fonts Bumps [black](https://github.com/psf/black) from 22.12.0 to 24.3.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@22.12.0...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> commit 0f834f1 Author: Klaus Rettinghaus <[email protected]> Date: Wed Mar 20 10:32:01 2024 +0100 iterate over node set commit 057ce1c Author: Klaus Rettinghaus <[email protected]> Date: Tue Mar 19 18:23:52 2024 +0100 fix ties from Dorico commit 6a790ff Author: Laurent Pugin <[email protected]> Date: Sun Mar 17 18:29:36 2024 +0100 Update Verovio.podspec to c++20 [skip-ci] commit 9f5d68f Merge: 3a14994 267c023 Author: Laurent Pugin <[email protected]> Date: Tue Mar 12 13:46:16 2024 +0100 Merge pull request rism-digital#3621 from rism-digital/generic-pae-duration Refactor PAE Duration handling commit 267c023 Author: Andrew Hankinson <[email protected]> Date: Tue Mar 12 12:00:13 2024 +0100 Update src/iopae.cpp Co-authored-by: Laurent Pugin <[email protected]> commit 3a14994 Merge: 24dd9de 38747a8 Author: Laurent Pugin <[email protected]> Date: Tue Mar 12 09:07:15 2024 +0100 Merge pull request rism-digital#3617 from Matthew-w56/fix-delete-editing Added ClearCoords call when editing a beam commit 24dd9de Merge: 36a50ed b0092bf Author: Laurent Pugin <[email protected]> Date: Tue Mar 12 08:47:07 2024 +0100 Merge pull request rism-digital#3623 from fernandoherreradelasheras/fix_midi_lyrics_on_quarter_notes Fix issue rism-digital#3622: wrong lyrics position in midi output for <syl> in notes <= quarter commit b0092bf Author: Fernando Herrera <[email protected]> Date: Mon Mar 11 22:59:11 2024 +0100 Fix lyrics position in midi output for <syl> in notes <= quarter commit 67da74a Author: Andrew Hankinson <[email protected]> Date: Mon Mar 11 17:43:30 2024 +0100 Formatting commit 8f2e4ec Author: Andrew Hankinson <[email protected]> Date: Mon Mar 11 17:36:34 2024 +0100 Refactor PAE Duration handling This change extracts the PAE duration handling into a static method that can be used to convert durations to their PAE representations. It also adds a new feature to the feature extractor that includes the note duration on the PAE note. commit 38747a8 Merge: f5c2e3e 633158f Author: Matthew Williams <[email protected]> Date: Thu Mar 7 09:19:38 2024 -0700 Merge branch 'fix-delete-editing' of https://github.com/Matthew-w56/verovio into fix-delete-editing commit f5c2e3e Author: Matthew Williams <[email protected]> Date: Thu Mar 7 09:19:27 2024 -0700 Reset interface variable name commit 36a50ed Merge: b7d4d7b 653fab8 Author: Laurent Pugin <[email protected]> Date: Thu Mar 7 07:27:40 2024 +0100 Merge pull request rism-digital#3606 from fernandoherreradelasheras/fix_colored_notes_with_dur_2 Fix issue rism-digital#3605: draw colored notes and dur="2" with empty note head commit 633158f Author: Matthew Williams <[email protected]> Date: Wed Mar 6 16:32:38 2024 -0700 final clang push commit 31178e0 Author: Matthew Williams <[email protected]> Date: Wed Mar 6 16:08:08 2024 -0700 Fixed clang problem commit a5e4e80 Author: Matthew Williams <[email protected]> Date: Wed Mar 6 15:59:23 2024 -0700 fixed known clang issues commit 2c669be Author: Matthew Williams <[email protected]> Date: Wed Mar 6 15:53:35 2024 -0700 fixed indentation commit bd1e3c7 Author: Matthew Williams <[email protected]> Date: Wed Mar 6 15:47:57 2024 -0700 Adjusted to meet some existing comments commit e1415cb Author: Matthew Williams <[email protected]> Date: Wed Mar 6 13:09:05 2024 -0700 Added ClearCoords call when editing a beam commit 653fab8 Author: Fernando Herrera <[email protected]> Date: Wed Mar 6 18:15:29 2024 +0100 Fix issue rism-digital#3605: draw colored notes and dur="2" with empty note head commit b7d4d7b Merge: 05b1072 b2f9dc7 Author: Laurent Pugin <[email protected]> Date: Mon Mar 4 07:41:41 2024 +0100 Merge pull request rism-digital#3615 from andre2007/c_functions Add toolkit functions to c_wrapper commit b2f9dc7 Author: Andre Pany <[email protected]> Date: Sun Mar 3 21:11:08 2024 +0100 Add toolkit functions to c_wrapper commit 05b1072 Author: Laurent Pugin <[email protected]> Date: Thu Feb 29 09:51:45 2024 +0100 Remove the C binding directory [skip-ci] * Now documented in https://book.verovio.org/installing-or-building-from-sources/library.html commit 6f72343 Author: Laurent Pugin <[email protected]> Date: Thu Feb 29 09:50:06 2024 +0100 Update README.md for Qt [skip-ci] commit 4055bc7 Author: Laurent Pugin <[email protected]> Date: Thu Feb 29 09:48:44 2024 +0100 Update README.md for Android [skip-ci] commit c708a89 Author: Laurent Pugin <[email protected]> Date: Thu Feb 29 09:01:02 2024 +0100 Add c_wrapper.h to the library headers [skip-ci] commit 34eeaf6 Merge: 46bc577 10c6ef3 Author: Laurent Pugin <[email protected]> Date: Thu Feb 29 07:35:16 2024 +0100 Merge pull request rism-digital#3611 from ammatwain/develop Update vrv.cpp commit 10c6ef3 Author: Amedeo Sorpreso <[email protected]> Date: Wed Feb 28 16:59:39 2024 +0100 Update vrv.cpp To ensure correct code formatting for floating-point values, two lines of code have been added to the "StringFormat" method, temporarily resetting the compiler's std::locale configurations. This prevents formatting issues stemming from specific OS or development environment settings, ensuring consistent and accurate numerical representation in the C++ source code during program execution. (At least, they do on my machine; I hope it's the same on yours... :) ) commit 46bc577 Merge: f8f4c11 38c4429 Author: Laurent Pugin <[email protected]> Date: Wed Feb 28 14:28:10 2024 +0100 Merge branch 'develop' of https://github.com/rism-digital/verovio into develop commit f8f4c11 Author: Laurent Pugin <[email protected]> Date: Wed Feb 28 14:27:59 2024 +0100 Add cmake instruction for copying header files commit 38c4429 Merge: 43e44f8 3260a7c Author: Laurent Pugin <[email protected]> Date: Wed Feb 28 13:33:53 2024 +0100 Merge pull request rism-digital#3609 from andre2007/develop [skip-ci] Include info how to build verovio.dll on Windows using MS Build Tools commit 3260a7c Author: andre2007 <[email protected]> Date: Tue Feb 27 20:41:16 2024 +0100 Include info how to build verovio.dll on Windows using MS Build Tools commit 43e44f8 Author: Laurent Pugin <[email protected]> Date: Tue Feb 27 18:38:18 2024 +0100 add CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS [skip-ci] commit cdd3b0d Author: Laurent Pugin <[email protected]> Date: Mon Feb 26 14:37:59 2024 +0100 Add library installation paths [skip-ci] commit 4b90478 Merge: 383dcaf 00a53e5 Author: Laurent Pugin <[email protected]> Date: Mon Feb 26 10:38:29 2024 +0100 Merge pull request rism-digital#3607 from rettinghaus/fonts fonts update with filled half note commit 00a53e5 Author: Klaus Rettinghaus <[email protected]> Date: Sat Feb 24 22:54:52 2024 +0100 add filled half note commit 383dcaf Author: Laurent Pugin <[email protected]> Date: Tue Feb 20 15:56:36 2024 +0100 Write fermata for rest and mRest in PAE output commit 7ce8b6d Author: Laurent Pugin <[email protected]> Date: Tue Feb 20 15:54:07 2024 +0100 Add PAEOutput::HasFermata helper commit 7e54f75 Author: Laurent Pugin <[email protected]> Date: Tue Feb 20 15:51:01 2024 +0100 Fix missing parameter in JS proxy commit 75efb61 Merge: ae00a34 e1f3a07 Author: Laurent Pugin <[email protected]> Date: Mon Feb 19 09:21:12 2024 +0100 Merge pull request rism-digital#3599 from rettinghaus/devlop/restbeam Import breaksec on rests from MusicXML [skip-ci] commit ae00a34 Merge: 105641f 5757ff9 Author: Laurent Pugin <[email protected]> Date: Mon Feb 19 09:18:26 2024 +0100 Merge pull request rism-digital#3601 from rettinghaus/fix-tabNote fix doubled g in SVG commit 5757ff9 Author: Klaus Rettinghaus <[email protected]> Date: Fri Feb 16 12:54:01 2024 +0100 fix doubled graphic commit e1f3a07 Author: Klaus Rettinghaus <[email protected]> Date: Fri Feb 16 10:25:30 2024 +0100 import breaksec commit 105641f Author: Laurent Pugin <[email protected]> Date: Fri Feb 9 13:03:14 2024 +0100 Set macos deployment target [skip-ci]
musicEnfanthen · May 7, 2024 · 7d378c9 · 7d378c9
1 parent e96eb69
commit 7d378c9
Show file tree

Hide file tree

Showing 41 changed files with 417 additions and 207 deletions.
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -100,11 +100,11 @@ jobs:
 
           - os: macos-latest
             compiler: xcode
-            version: "13.1"
+            version: "14.3"
 
           - os: macos-latest
             compiler: xcode
-            version: "14.2"
+            version: "15.3"
 
           - os: macos-11
             compiler: g++

diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -18,8 +18,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run clang-format style check for C/C++ programs.
-        uses: jidicula/clang-format-action@v4.9.0
+        uses: jidicula/clang-format-action@v4.11.0
         with:
-          clang-format-version: "15"
+          clang-format-version: "18"
           check-path: ${{ matrix.path['check'] }}
           exclude-regex: ${{ matrix.path['exclude'] }}
diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
@@ -23,13 +23,16 @@ jobs:
       fail-fast: false
       # Build the wheels for Linux, Windows and macOS
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, macos-14, windows-latest, ubuntu-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        architecture: [x86, x64]
+        architecture: [x86, x64, arm64]
         include:
-          - os: macos-latest
+          - os: macos-13
             architecture: x64
-            platform_id: macosx_*
+            platform_id: macosx_x86_64
+          - os: macos-14
+            architecture: arm64
+            platform_id: macosx_arm64
           - os: windows-latest
             architecture: x64
             platform_id: win_amd64
@@ -40,10 +43,20 @@ jobs:
             architecture: x64
             platform_id: manylinux_x86_64
         exclude:
-          - os: macos-latest
+          - os: macos-13
             architecture: x86
+          - os: macos-13
+            architecture: arm64
+          - os: macos-14
+            architecture: x86
+          - os: macos-14
+            architecture: x64
           - os: ubuntu-latest
             architecture: x86
+          - os: ubuntu-latest
+            architecture: arm64
+          - os: windows-latest
+            architecture: arm64
 
     steps:
       #===============================================#
@@ -53,11 +66,12 @@ jobs:
           fetch-depth: 0
 
       - uses: nuget/setup-nuget@v1
+        if: always() && runner.os == 'Windows'
         with:
           nuget-version: "latest"
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.architecture }}
@@ -82,16 +96,14 @@ jobs:
       #===============================================#
       # wheels
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.17.0
         with:
           output-dir: wheelhouse
         env:
-          CIBW_SKIP: cp37-macosx_arm64
           CIBW_BUILD: ${{ env.CIBW_BUILD_IDENTIFIER }}
           CIBW_ARCHS_MACOS: x86_64 arm64
           CIBW_ENVIRONMENT_MACOS:
             MACOSX_DEPLOYMENT_TARGET=10.15
-          CIBW_TEST_SKIP: cp*-macosx_arm64
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
           CIBW_BEFORE_ALL_MACOS: brew update && brew install swig
@@ -119,7 +131,7 @@ jobs:
       - name: Install from wheel on macOS
         working-directory: wheelhouse
         if: always() && runner.os == 'macOS'
-        run: python -m pip install ./*x86_64.whl
+        run: python -m pip install ./*.whl
 
       # Wildcard use is different with PowerShell
       # cf. https://stackoverflow.com/a/43900040
@@ -136,7 +148,7 @@ jobs:
       # Upload artifacts
       - uses: actions/upload-artifact@v3
         with:
-          name: cibuildwheel-${{ runner.os }}-python-${{ matrix.python-version }}
+          name: cibuildwheel-${{ runner.os }}-python-${{ matrix.python-version }}-${{ matrix.architecture }}
           path: ./wheelhouse/*.whl
 
   #===============================================#
@@ -154,7 +166,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
@@ -229,7 +241,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           architecture: "x64"

diff --git a/Verovio.podspec b/Verovio.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '14.0'
   s.osx.deployment_target = '10.15'
   s.pod_target_xcconfig = {
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
       "CLANG_CXX_LIBRARY" => "libc++",
       "GCC_C_LANGUAGE_STANDARD" => "gnu11",
       "GCC_DYNAMIC_NO_PIC" => "NO",

diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
@@ -103,7 +103,7 @@
 		4D1693FF1E3A44F300569BF4 /* durationinterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EBE188539540037FD8E /* durationinterface.cpp */; };
 		4D1694001E3A44F300569BF4 /* toolkit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EBF188539540037FD8E /* toolkit.cpp */; };
 		4D1694011E3A44F300569BF4 /* MidiEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1BE7671C688F5A0086DC0E /* MidiEvent.cpp */; };
-		4D1694021E3A44F300569BF4 /* io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* io.cpp */; };
+		4D1694021E3A44F300569BF4 /* iobase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* iobase.cpp */; };
 		4D1694031E3A44F300569BF4 /* harm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D796B5D1D78641900A15238 /* harm.cpp */; };
 		4D1694041E3A44F300569BF4 /* space.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB3072E1AC9ED2500EE0982 /* space.cpp */; };
 		4D1694051E3A44F300569BF4 /* iodarms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC1188539540037FD8E /* iodarms.cpp */; };
@@ -926,7 +926,7 @@
 		8F086EE9188539540037FD8E /* doc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EBD188539540037FD8E /* doc.cpp */; };
 		8F086EEA188539540037FD8E /* durationinterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EBE188539540037FD8E /* durationinterface.cpp */; };
 		8F086EEB188539540037FD8E /* toolkit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EBF188539540037FD8E /* toolkit.cpp */; };
-		8F086EEC188539540037FD8E /* io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* io.cpp */; };
+		8F086EEC188539540037FD8E /* iobase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* iobase.cpp */; };
 		8F086EED188539540037FD8E /* iodarms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC1188539540037FD8E /* iodarms.cpp */; };
 		8F086EEE188539540037FD8E /* iomei.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC2188539540037FD8E /* iomei.cpp */; };
 		8F086EEF188539540037FD8E /* iomusxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC3188539540037FD8E /* iomusxml.cpp */; };
@@ -960,7 +960,7 @@
 		8F3DD31E18854AFB0051330C /* bboxdevicecontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EB9188539540037FD8E /* bboxdevicecontext.cpp */; };
 		8F3DD32018854AFB0051330C /* devicecontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EBC188539540037FD8E /* devicecontext.cpp */; };
 		8F3DD32218854AFB0051330C /* svgdevicecontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086ED5188539540037FD8E /* svgdevicecontext.cpp */; };
-		8F3DD32418854B090051330C /* io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* io.cpp */; };
+		8F3DD32418854B090051330C /* iobase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* iobase.cpp */; };
 		8F3DD32618854B090051330C /* iodarms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC1188539540037FD8E /* iodarms.cpp */; };
 		8F3DD32818854B090051330C /* iomei.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC2188539540037FD8E /* iomei.cpp */; };
 		8F3DD32A18854B090051330C /* iomusxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC3188539540037FD8E /* iomusxml.cpp */; };
@@ -1006,7 +1006,7 @@
 		8F59293B18854BF800FE51AD /* doc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291418854BF800FE51AD /* doc.h */; };
 		8F59293C18854BF800FE51AD /* durationinterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291518854BF800FE51AD /* durationinterface.h */; };
 		8F59293D18854BF800FE51AD /* toolkit.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291618854BF800FE51AD /* toolkit.h */; };
-		8F59293E18854BF800FE51AD /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291718854BF800FE51AD /* io.h */; };
+		8F59293E18854BF800FE51AD /* iobase.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291718854BF800FE51AD /* iobase.h */; };
 		8F59293F18854BF800FE51AD /* iodarms.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291818854BF800FE51AD /* iodarms.h */; };
 		8F59294018854BF800FE51AD /* iomei.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291918854BF800FE51AD /* iomei.h */; };
 		8F59294118854BF800FE51AD /* iomusxml.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291A18854BF800FE51AD /* iomusxml.h */; };
@@ -1068,8 +1068,8 @@
 		BB4C4AAA22A932A0001F6AF0 /* devicecontextbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D797B041A67C55F007637BD /* devicecontextbase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BB4C4AAB22A932A0001F6AF0 /* svgdevicecontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086ED5188539540037FD8E /* svgdevicecontext.cpp */; };
 		BB4C4AAC22A932A0001F6AF0 /* svgdevicecontext.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59292C18854BF800FE51AD /* svgdevicecontext.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BB4C4AAD22A932A6001F6AF0 /* io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* io.cpp */; };
-		BB4C4AAE22A932A6001F6AF0 /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291718854BF800FE51AD /* io.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BB4C4AAD22A932A6001F6AF0 /* iobase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC0188539540037FD8E /* iobase.cpp */; };
+		BB4C4AAE22A932A6001F6AF0 /* iobase.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F59291718854BF800FE51AD /* iobase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BB4C4AAF22A932A6001F6AF0 /* ioabc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 402197931F2E09DA00182DF1 /* ioabc.cpp */; };
 		BB4C4AB022A932A6001F6AF0 /* ioabc.h in Headers */ = {isa = PBXBuildFile; fileRef = 402197921F2E09CB00182DF1 /* ioabc.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BB4C4AB122A932A6001F6AF0 /* iodarms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F086EC1188539540037FD8E /* iodarms.cpp */; };
@@ -2093,7 +2093,7 @@
 		8F086EBD188539540037FD8E /* doc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = doc.cpp; path = src/doc.cpp; sourceTree = "<group>"; };
 		8F086EBE188539540037FD8E /* durationinterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = durationinterface.cpp; path = src/durationinterface.cpp; sourceTree = "<group>"; };
 		8F086EBF188539540037FD8E /* toolkit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = toolkit.cpp; path = src/toolkit.cpp; sourceTree = "<group>"; };
-		8F086EC0188539540037FD8E /* io.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = io.cpp; path = src/io.cpp; sourceTree = "<group>"; };
+		8F086EC0188539540037FD8E /* iobase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iobase.cpp; path = src/iobase.cpp; sourceTree = "<group>"; };
 		8F086EC1188539540037FD8E /* iodarms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iodarms.cpp; path = src/iodarms.cpp; sourceTree = "<group>"; };
 		8F086EC2188539540037FD8E /* iomei.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = iomei.cpp; path = src/iomei.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		8F086EC3188539540037FD8E /* iomusxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iomusxml.cpp; path = src/iomusxml.cpp; sourceTree = "<group>"; };
@@ -2134,7 +2134,7 @@
 		8F59291418854BF800FE51AD /* doc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = doc.h; path = include/vrv/doc.h; sourceTree = "<group>"; };
 		8F59291518854BF800FE51AD /* durationinterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = durationinterface.h; path = include/vrv/durationinterface.h; sourceTree = "<group>"; };
 		8F59291618854BF800FE51AD /* toolkit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = toolkit.h; path = include/vrv/toolkit.h; sourceTree = "<group>"; };
-		8F59291718854BF800FE51AD /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = io.h; path = include/vrv/io.h; sourceTree = "<group>"; };
+		8F59291718854BF800FE51AD /* iobase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iobase.h; path = include/vrv/iobase.h; sourceTree = "<group>"; };
 		8F59291818854BF800FE51AD /* iodarms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iodarms.h; path = include/vrv/iodarms.h; sourceTree = "<group>"; };
 		8F59291918854BF800FE51AD /* iomei.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = iomei.h; path = include/vrv/iomei.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		8F59291A18854BF800FE51AD /* iomusxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iomusxml.h; path = include/vrv/iomusxml.h; sourceTree = "<group>"; };
@@ -2833,8 +2833,8 @@
 		8F086F37188539C50037FD8E /* io */ = {
 			isa = PBXGroup;
 			children = (
-				8F086EC0188539540037FD8E /* io.cpp */,
-				8F59291718854BF800FE51AD /* io.h */,
+				8F086EC0188539540037FD8E /* iobase.cpp */,
+				8F59291718854BF800FE51AD /* iobase.h */,
 				402197931F2E09DA00182DF1 /* ioabc.cpp */,
 				402197921F2E09CB00182DF1 /* ioabc.h */,
 				8F086EC1188539540037FD8E /* iodarms.cpp */,
@@ -3194,7 +3194,7 @@
 				4DEC4DD621C8295700D1D273 /* del.h in Headers */,
 				4DB726C81B8BB0F30040231B /* text.h in Headers */,
 				4D308101203DB69D00BC44F6 /* ref.h in Headers */,
-				8F59293E18854BF800FE51AD /* io.h in Headers */,
+				8F59293E18854BF800FE51AD /* iobase.h in Headers */,
 				4DF092A22497706600239195 /* phrase.h in Headers */,
 				8F59293F18854BF800FE51AD /* iodarms.h in Headers */,
 				4DDBBB571C7AE43E00054AFF /* hairpin.h in Headers */,
@@ -3442,7 +3442,7 @@
 				4DACC9E92990F29A00B55913 /* atts_fingering.h in Headers */,
 				BB4C4A9422A9328F001F6AF0 /* doc.h in Headers */,
 				BB4C4A9922A9328F001F6AF0 /* horizontalaligner.h in Headers */,
-				BB4C4AAE22A932A6001F6AF0 /* io.h in Headers */,
+				BB4C4AAE22A932A6001F6AF0 /* iobase.h in Headers */,
 				BB4C4BAA22A932EB001F6AF0 /* view.h in Headers */,
 				4DACC9DD2990F29A00B55913 /* atts_header.h in Headers */,
 				BB4C4BC422A9330D001F6AF0 /* pugixml.hpp in Headers */,
@@ -3920,7 +3920,7 @@
 				E722106828F85981002CD6E9 /* findlayerelementsfunctor.cpp in Sources */,
 				4D1694011E3A44F300569BF4 /* MidiEvent.cpp in Sources */,
 				4DA0EAEF22BB77C300A7EBEB /* editortoolkit_cmn.cpp in Sources */,
-				4D1694021E3A44F300569BF4 /* io.cpp in Sources */,
+				4D1694021E3A44F300569BF4 /* iobase.cpp in Sources */,
 				4D1694031E3A44F300569BF4 /* harm.cpp in Sources */,
 				4D79641926C1522B0026288B /* pageelement.cpp in Sources */,
 				4DB3D8DE1F83D15200B5FC2B /* btrem.cpp in Sources */,
@@ -4214,7 +4214,7 @@
 				4D1BE76D1C688F5A0086DC0E /* MidiEvent.cpp in Sources */,
 				E75EA9FD29CC3A88003A97A7 /* calcarticfunctor.cpp in Sources */,
 				35FDEBD124B6DC5B00AC1696 /* fing.cpp in Sources */,
-				8F086EEC188539540037FD8E /* io.cpp in Sources */,
+				8F086EEC188539540037FD8E /* iobase.cpp in Sources */,
 				E75A69A029CCF8A200414819 /* adjustbeamsfunctor.cpp in Sources */,
 				4DACC9762990F29A00B55913 /* atts_neumes.cpp in Sources */,
 				4D796B5E1D78641900A15238 /* harm.cpp in Sources */,
@@ -4638,7 +4638,7 @@
 				E7E9C11729B0A20400CFCE2F /* adjustaccidxfunctor.cpp in Sources */,
 				8F3DD33818854B250051330C /* system.cpp in Sources */,
 				4D72A5E1208A37F0009DEC1E /* mnum.cpp in Sources */,
-				8F3DD32418854B090051330C /* io.cpp in Sources */,
+				8F3DD32418854B090051330C /* iobase.cpp in Sources */,
 				4DACC9D62990F29A00B55913 /* atts_pagebased.cpp in Sources */,
 				4DA0EACD22BB779400A7EBEB /* zone.cpp in Sources */,
 				4DEC4DBC21C8288900D1D273 /* choice.cpp in Sources */,
@@ -4791,7 +4791,7 @@
 				BB4C4A9322A9328F001F6AF0 /* doc.cpp in Sources */,
 				4D8135212322C41800F59C01 /* keyaccid.cpp in Sources */,
 				BB4C4B9922A932E5001F6AF0 /* linkinginterface.cpp in Sources */,
-				BB4C4AAD22A932A6001F6AF0 /* io.cpp in Sources */,
+				BB4C4AAD22A932A6001F6AF0 /* iobase.cpp in Sources */,
 				E74A806A28BC9843005274E7 /* functorinterface.cpp in Sources */,
 				4DD7C0FD27A55CEA00B9C017 /* timemap.cpp in Sources */,
 				E78833632994EC7E00D44B01 /* calcchordnoteheadsfunctor.cpp in Sources */,

diff --git a/bindings/iOS/all.h b/bindings/iOS/all.h
@@ -121,7 +121,7 @@
 #import <VerovioFramework/humlib.h>
 #import <VerovioFramework/instrdef.h>
 #import <VerovioFramework/interface.h>
-#import <VerovioFramework/io.h>
+#import <VerovioFramework/iobase.h>
 #import <VerovioFramework/ioabc.h>
 #import <VerovioFramework/iodarms.h>
 #import <VerovioFramework/iohumdrum.h>