Merge remote-tracking branch 'upstream/develop-tab' into develop-tab

.github/workflows/ci_build.yml

@@ -78,7 +78,7 @@ jobs:
             compiler: g++
             version: "10"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             compiler: g++
             version: "11"
 
@@ -106,7 +106,7 @@ jobs:
             compiler: xcode
             version: "15.3"
 
-          - os: macos-11
+          - os: macos-latest
             compiler: g++
             version: "12"
 

.github/workflows/tests_build.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: FranzDiebold/github-env-vars-action@v2.7.0
+      - uses: FranzDiebold/github-env-vars-action@v2.8.0
       - name: Get Short SHA
         run: |
           echo "SHORT_SHA=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV
@@ -109,14 +109,14 @@ jobs:
           ls -al
 
       - name: Upload results as artefacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-suite-diff
           path: ${{ github.workspace }}/${{ env.OUTPUT_DIR }}/
 
       - name: Check existence of the log.md file
         id: check_files
-        uses: andstor/file-existence-action@v2
+        uses: andstor/file-existence-action@v3
         with:
           files: "${{ github.workspace }}/${{ env.OUTPUT_DIR }}/log.md"
 

bindings/iOS/all.h

@@ -54,7 +54,7 @@
 #import <VerovioFramework/calcchordnoteheadsfunctor.h>
 #import <VerovioFramework/calcdotsfunctor.h>
 #import <VerovioFramework/calcledgerlinesfunctor.h>
-#import <VerovioFramework/calcligaturenoteposfunctor.h>
+#import <VerovioFramework/calcligatureorneumeposfunctor.h>
 #import <VerovioFramework/calcslurdirectionfunctor.h>
 #import <VerovioFramework/calcspanningbeamspansfunctor.h>
 #import <VerovioFramework/calcstemfunctor.h>

cmake/CMakeLists.txt

@@ -57,6 +57,10 @@ else()
         add_definitions(-DDEBUG)
     endif()
 
+    if(WIN32)
+        include_directories(../include/win32)
+    endif()
+
     # jsonxx raises -Wdollar-in-identifier-extension
     # gcc 8.3.1 does not like -Wdollar-in-identifier-extension option.
     add_definitions(-Wall -W -pedantic -Wno-unused-parameter -Wno-dollar-in-identifier-extension)

data/Bravura.xml

@@ -679,6 +679,10 @@
   <g c="E923" x="0.0" y="-125.0" w="266.0" h="251.0" h-a-x="266" n="mensuralProlationCombiningThreeDotsTri" />
   <g c="E924" x="0.0" y="-162.0" w="324.0" h="324.0" h-a-x="324" n="mensuralProlationCombiningDotVoid" />
   <g c="E925" x="0.0" y="-371.0" w="48.0" h="743.0" h-a-x="48" n="mensuralProlationCombiningStroke" />
+  <g c="E926" x="0.0" y="-250.0" w="249.0" h="503.0" h-a-x="249" n="mensuralProportion1" />
+  <g c="E927" x="0.0" y="-250.0" w="331.0" h="503.0" h-a-x="331" n="mensuralProportion2" />
+  <g c="E928" x="0.0" y="-250.0" w="294.0" h="503.0" h-a-x="293" n="mensuralProportion3" />
+  <g c="E929" x="0.0" y="-250.0" w="379.0" h="500.0" h-a-x="379" n="mensuralProportion4" />
   <g c="E938" x="0.0" y="-141.0" w="282.0" h="282.0" h-a-x="282" n="mensuralNoteheadSemibrevisBlack" />
   <g c="E939" x="1.0" y="-141.0" w="282.0" h="282.0" h-a-x="283" n="mensuralNoteheadSemibrevisVoid" />
   <g c="E93C" x="0.0" y="-184.0" w="320.0" h="369.0" h-a-x="320" n="mensuralNoteheadMinimaWhite">
@@ -712,6 +716,7 @@
   <g c="E99B" x="0.0" y="-115.0" w="154.0" h="230.0" h-a-x="154" n="chantQuilisma" />
   <g c="E99E" x="0.0" y="-246.0" w="153.0" h="360.0" h-a-x="153" n="chantOriscusLiquescens" />
   <g c="E99F" x="0.0" y="-92.0" w="124.0" h="185.0" h-a-x="124" n="chantStrophicus" />
+  <g c="E9A1" x="0.0" y="-57.0" w="91.0" h="115.0" h-a-x="91" n="chantPunctumDeminutum" />
   <g c="E9B0" x="0.0" y="0.0" w="154.0" h="164.0" h-a-x="139" n="chantPodatusLower" />
   <g c="E9B1" x="-127.0" y="-3.0" w="141.0" h="198.0" h-a-x="0" n="chantPodatusUpper" />
   <g c="E9B2" x="-62.0" y="-121.0" w="76.0" h="188.0" h-a-x="14" n="chantDeminutumUpper" />
@@ -745,6 +750,7 @@
   <g c="E9F8" x="0.0" y="0.0" w="138.0" h="165.0" h-a-x="138" n="mensuralRestSemifusa" />
   <g c="EA02" x="1.0" y="0.0" w="613.0" h="411.0" h-a-x="615" n="mensuralCustosUp" />
   <g c="EA06" x="0.0" y="-101.0" w="60.0" h="416.0" h-a-x="60" n="chantCustosStemUpPosMiddle" />
+  <g c="EA2A" x="0.0" y="-131.0" w="319.0" h="263.0" h-a-x="319" n="medRenOriscusCMN" />
   <g c="EA50" x="20.0" y="-1.0" w="215.0" h="252.0" h-a-x="255" n="figbass0" />
   <g c="EA51" x="20.0" y="0.0" w="117.0" h="254.0" h-a-x="157" n="figbass1" />
   <g c="EA52" x="20.0" y="-3.0" w="202.0" h="256.0" h-a-x="242" n="figbass2" />
@@ -1005,6 +1011,7 @@
   <g c="F433" x="0.0" y="0.0" w="200.0" h="300.0" h-a-x="200" n="pluckedSnapPizzicatoAboveGerman" />
   <g c="F434" x="0.0" y="-8.0" w="923.0" h="563.0" h-a-x="922" n="keyboardPedalPedNoDot" />
   <g c="F435" x="0.0" y="-15.0" w="1014.0" h="606.0" h-a-x="1014" n="keyboardPedalSostNoDot" />
+  <g c="F43D" x="0.0" y="-251.0" w="455.0" h="504.0" h-a-x="455" n="mensuralProportion4Old" />
   <g c="F43F" x="0.0" y="-169.0" w="529.0" h="338.0" h-a-x="529" n="noteheadDoubleWholeAlt">
     <a n="noteheadOrigin" x="0.14" y="0.0" />
   </g>

data/Bravura/E926.xml

@@ -0,0 +1 @@
+<symbol id="E926" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -242v25s0 8 7 8c87 0 88 14 88 73v251c0 47 -10 49 -52 49c0 0 -5 -1 -10 -1c-7 0 -16 2 -16 8l1 20s5 11 15 11c9 0 60 8 96 44c0 0 9 7 17 7c7 0 13 -5 13 -24v-366c0 -64 16 -72 80 -72c3 0 10 -1 10 -6v-24c0 -3 -1 -11 -12 -11h-227c-3 0 -10 1 -10 8z" /></symbol>

data/Bravura/E927.xml

@@ -0,0 +1 @@
+<symbol id="E927" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 -250c0 0 -9 4 -9 14c0 16 12 47 27 57c12 8 227 151 227 269c0 49 -22 99 -89 99c-66 0 -120 -87 -124 -91s-10 -10 -16 -10c-1 0 -3 0 -4 1c-10 5 -14 13 -14 23c0 9 4 19 9 26c3 3 5 7 8 11c31 43 75 104 153 104c85 0 152 -72 152 -156c0 -82 -58 -137 -78 -156 c-19 -19 -124 -112 -124 -112s-22 -14 -22 -23c0 -5 6 -8 22 -8c20 0 131 2 140 2c6 0 10 17 17 47c3 13 6 26 13 26h26c5 -1 6 -7 6 -11c0 -31 2 -62 2 -94c0 -4 -1 -18 -20 -18h-302z" /></symbol>

data/Bravura/E928.xml

@@ -0,0 +1 @@
+<symbol id="E928" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -158c0 2 1 5 8 5c9 0 19 -9 30 -19c11 -11 12 -32 70 -32s118 60 118 118c0 57 -44 80 -116 80h-22s-8 0 -8 8v16s0 9 6 9c19 0 104 32 104 127c0 33 -24 48 -64 48s-76 -47 -84 -55c-1 -1 -6 -6 -9 -6s-21 26 -21 31c0 3 10 13 14 17c19 20 63 64 118 64 c58 0 109 -39 109 -101c0 -61 -64 -100 -64 -100s-5 -2 -5 -4c0 -1 1 -3 5 -4c1 0 2 -1 3 -1c20 -6 102 -33 102 -120c0 -93 -111 -173 -216 -173c-42 0 -78 20 -78 47v45z" /></symbol>

data/Bravura/E929.xml

@@ -0,0 +1 @@
+<symbol id="E929" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -85v17s2 9 8 17l223 293s5 8 14 8h22s12 0 12 -11v-263c0 -2 1 -8 9 -8h86c2 0 5 -1 5 -6v-49c0 -3 -1 -8 -7 -8h-86s-7 -3 -7 -11v-138s-1 -6 -7 -6h-67s-5 3 -5 12s2 135 2 135s0 10 -9 10h-183s-10 1 -10 8zM77 -30c0 -4 5 -4 5 -4h111c7 0 9 6 9 6v163 c0 2 0 3 -1 3c-2 0 -8 -8 -8 -8s-100 -133 -111 -149c-4 -5 -5 -9 -5 -11z" /></symbol>

data/Bravura/E9A1.xml

@@ -0,0 +1 @@
+<symbol id="E9A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -55v83c0 20 21 30 43 30c24 0 48 -11 48 -31v-82s0 -2 -1 -2s-1 0 -3 2c-4 4 -18 11 -39 11h-2c-19 0 -35 -7 -41 -11c-1 -1 -3 -2 -4 -2c0 0 -1 0 -1 2z" /></symbol>

data/Bravura/EA2A.xml

@@ -0,0 +1 @@
+<symbol id="EA2A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -75c0 44 12 114 34 205h26v-12c0 -16 -1 -31 -1 -44c0 -40 4 -64 23 -64c32 0 175 122 214 122c16 0 23 -19 23 -55c0 -44 -11 -115 -34 -207h-25v12c0 16 1 31 1 44c0 40 -4 65 -23 65c-32 0 -175 -122 -214 -122c-16 0 -24 19 -24 56z" /></symbol>

data/Bravura/F43D.xml

@@ -0,0 +1 @@
+<symbol id="F43D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -181c0 8 6 15 18 15c3 0 6 -1 10 -2c1 0 2 -1 3 -1c13 -3 35 -8 50 -8c47 0 79 21 115 46c-74 68 -125 152 -125 225c0 127 104 159 157 159c42 0 159 -33 159 -157c0 -69 -64 -147 -133 -211c43 -47 83 -64 111 -64c15 0 28 3 36 5c3 1 4 1 6 1c17 3 30 9 38 9 c2 0 3 0 4 -1c5 -2 6 -9 6 -14c0 0 -33 -46 -42 -58c-5 -8 -8 -13 -16 -13c-3 0 -6 1 -10 2c-60 17 -120 58 -172 100c-70 -58 -134 -98 -134 -98c-6 -4 -11 -5 -15 -5c-8 0 -13 5 -13 5s-38 43 -49 55c-3 3 -4 7 -4 10zM227 218c-56 0 -77 -56 -77 -117s42 -127 42 -127 c15 -28 30 -50 45 -69c69 74 69 156 69 195c0 48 -24 118 -79 118z" /></symbol>