Skip to content

Commit

Permalink
Merge pull request #144 from rism-digital/develop
Browse files Browse the repository at this point in the history 
Update with RISM
  • Loading branch information
@yinanazhou
yinanazhou authored Jun 18, 2024
2 parents 5bf3635 + c508e2e commit a8bd0d4
Show file tree
Hide file tree
Showing 48 changed files with 792 additions and 185 deletions.
32 changes: 32 additions & 0 deletions Verovio.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1376,6 +1376,18 @@
BD87768627CE8A1A005B97EA /* layerdef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD87768227CE8A11005B97EA /* layerdef.cpp */; };
BD87768727CE8A21005B97EA /* layerdef.h in Headers */ = {isa = PBXBuildFile; fileRef = BD87768127CE89FA005B97EA /* layerdef.h */; };
BD87768827CE8A21005B97EA /* layerdef.h in Headers */ = {isa = PBXBuildFile; fileRef = BD87768127CE89FA005B97EA /* layerdef.h */; };
BD96F7CD2C04A708001CFF6F /* quilisma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7CB2C04A708001CFF6F /* quilisma.cpp */; };
BD96F7D12C04B297001CFF6F /* oriscus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7D02C04B297001CFF6F /* oriscus.cpp */; };
BD96F7D22C04B2B2001CFF6F /* quilisma.h in Headers */ = {isa = PBXBuildFile; fileRef = BD96F7CE2C04A76F001CFF6F /* quilisma.h */; };
BD96F7D32C04B2B3001CFF6F /* quilisma.h in Headers */ = {isa = PBXBuildFile; fileRef = BD96F7CE2C04A76F001CFF6F /* quilisma.h */; };
BD96F7D42C04B2B6001CFF6F /* quilisma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7CB2C04A708001CFF6F /* quilisma.cpp */; };
BD96F7D52C04B2B6001CFF6F /* quilisma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7CB2C04A708001CFF6F /* quilisma.cpp */; };
BD96F7D62C04B2B7001CFF6F /* quilisma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7CB2C04A708001CFF6F /* quilisma.cpp */; };
BD96F7D72C04B2EE001CFF6F /* oriscus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7D02C04B297001CFF6F /* oriscus.cpp */; };
BD96F7D82C04B2EE001CFF6F /* oriscus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7D02C04B297001CFF6F /* oriscus.cpp */; };
BD96F7D92C04B2EF001CFF6F /* oriscus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD96F7D02C04B297001CFF6F /* oriscus.cpp */; };
BD96F7DA2C04B2F2001CFF6F /* oriscus.h in Headers */ = {isa = PBXBuildFile; fileRef = BD96F7CF2C04B26D001CFF6F /* oriscus.h */; };
BD96F7DB2C04B2F2001CFF6F /* oriscus.h in Headers */ = {isa = PBXBuildFile; fileRef = BD96F7CF2C04B26D001CFF6F /* oriscus.h */; };
BDA81C21268B38760065B802 /* metersiggrp.h in Headers */ = {isa = PBXBuildFile; fileRef = BDA81C20268B386C0065B802 /* metersiggrp.h */; };
BDA81C22268B38770065B802 /* metersiggrp.h in Headers */ = {isa = PBXBuildFile; fileRef = BDA81C20268B386C0065B802 /* metersiggrp.h */; };
BDA81C24268B38A10065B802 /* metersiggrp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDA81C23268B38A10065B802 /* metersiggrp.cpp */; };
Expand Down Expand Up @@ -2181,6 +2193,10 @@
BD2E4D992875881B00B04350 /* stem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stem.h; path = include/vrv/stem.h; sourceTree = "<group>"; };
BD87768127CE89FA005B97EA /* layerdef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = layerdef.h; path = include/vrv/layerdef.h; sourceTree = "<group>"; };
BD87768227CE8A11005B97EA /* layerdef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = layerdef.cpp; path = src/layerdef.cpp; sourceTree = "<group>"; };
BD96F7CB2C04A708001CFF6F /* quilisma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = quilisma.cpp; path = src/quilisma.cpp; sourceTree = "<group>"; };
BD96F7CE2C04A76F001CFF6F /* quilisma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quilisma.h; path = include/vrv/quilisma.h; sourceTree = "<group>"; };
BD96F7CF2C04B26D001CFF6F /* oriscus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oriscus.h; path = include/vrv/oriscus.h; sourceTree = "<group>"; };
BD96F7D02C04B297001CFF6F /* oriscus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = oriscus.cpp; path = src/oriscus.cpp; sourceTree = "<group>"; };
BDA81C20268B386C0065B802 /* metersiggrp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = metersiggrp.h; path = include/vrv/metersiggrp.h; sourceTree = "<group>"; };
BDA81C23268B38A10065B802 /* metersiggrp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = metersiggrp.cpp; path = src/metersiggrp.cpp; sourceTree = "<group>"; };
BDC366C52576AF9300E4D826 /* grpsym.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = grpsym.cpp; path = src/grpsym.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2987,10 +3003,14 @@
4D766EF420ACAD41006875D8 /* neume.h */,
8F086ECC188539540037FD8E /* note.cpp */,
8F59292318854BF800FE51AD /* note.h */,
BD96F7D02C04B297001CFF6F /* oriscus.cpp */,
BD96F7CF2C04B26D001CFF6F /* oriscus.h */,
4D674B45255F40B7008AEF4C /* plica.cpp */,
4D674B3E255F40AC008AEF4C /* plica.h */,
1579B3421B15033100B16F5C /* proport.cpp */,
1579B3411B15031D00B16F5C /* proport.h */,
BD96F7CB2C04A708001CFF6F /* quilisma.cpp */,
BD96F7CE2C04A76F001CFF6F /* quilisma.h */,
8F086ED1188539540037FD8E /* rest.cpp */,
8F59292818854BF800FE51AD /* rest.h */,
4DB3072E1AC9ED2500EE0982 /* space.cpp */,
Expand Down Expand Up @@ -3185,6 +3205,7 @@
8F59293918854BF800FE51AD /* clef.h in Headers */,
4DA0EADB22BB77AF00A7EBEB /* editortoolkit_neume.h in Headers */,
BD6E5C41290007CE0039B0F1 /* graphic.h in Headers */,
BD96F7DA2C04B2F2001CFF6F /* oriscus.h in Headers */,
4DB3D89A1F7C326800B5FC2B /* fb.h in Headers */,
4D1D733E1A1D08CD001E08F6 /* glyph.h in Headers */,
E7908E9F298582090004C1F9 /* alignfunctor.h in Headers */,
Expand Down Expand Up @@ -3307,6 +3328,7 @@
E7A1640A29AF344B0099BD6A /* adjustharmgrpsspacingfunctor.h in Headers */,
E7770F8329D0D9F600A9BECF /* adjustslursfunctor.h in Headers */,
4DB3D8F11F83D1AA00B5FC2B /* fig.h in Headers */,
BD96F7D22C04B2B2001CFF6F /* quilisma.h in Headers */,
4DBDD67B2939E1D7009EC466 /* symboltable.h in Headers */,
4DACC9402990ED2600B55913 /* libmei.h in Headers */,
4D89F90C201771A700A4D336 /* num.h in Headers */,
Expand Down Expand Up @@ -3499,6 +3521,7 @@
BB4C4B1422A932C8001F6AF0 /* section.h in Headers */,
BB4C4B8022A932DF001F6AF0 /* fb.h in Headers */,
BB4C4AF622A932BC001F6AF0 /* ref.h in Headers */,
BD96F7DB2C04B2F2001CFF6F /* oriscus.h in Headers */,
BB4C4B6022A932D7001F6AF0 /* mrest.h in Headers */,
4D723AF525E8DB0B0062E0A2 /* zip_file.hpp in Headers */,
E765675A28BBFBA400BC6490 /* functorinterface.h in Headers */,
Expand Down Expand Up @@ -3610,6 +3633,7 @@
4DFD83012A38399C00A3E20B /* repeatmark.h in Headers */,
BB4C4B7622A932D7001F6AF0 /* syl.h in Headers */,
E73E86262A069C640089DF74 /* transposefunctor.h in Headers */,
BD96F7D32C04B2B3001CFF6F /* quilisma.h in Headers */,
BB4C4AEA22A932BC001F6AF0 /* del.h in Headers */,
BB4C4B3422A932CF001F6AF0 /* tempo.h in Headers */,
4DACC9E12990F29A00B55913 /* attconverter.h in Headers */,
Expand Down Expand Up @@ -3928,6 +3952,7 @@
4D1694001E3A44F300569BF4 /* toolkit.cpp in Sources */,
4DACC99B2990F29A00B55913 /* atts_header.cpp in Sources */,
4DACC9A32990F29A00B55913 /* atts_cmnornaments.cpp in Sources */,
BD96F7D72C04B2EE001CFF6F /* oriscus.cpp in Sources */,
4DEC4D9F21C81E9400D1D273 /* orig.cpp in Sources */,
E722106828F85981002CD6E9 /* findlayerelementsfunctor.cpp in Sources */,
4D1694011E3A44F300569BF4 /* MidiEvent.cpp in Sources */,
Expand Down Expand Up @@ -4099,6 +4124,7 @@
4D3C3F0D294B89AF009993E6 /* ornam.cpp in Sources */,
4DACC9972990F29A00B55913 /* atts_facsimile.cpp in Sources */,
E7231E0629B64B33000A2BF3 /* adjustxoverflowfunctor.cpp in Sources */,
BD96F7D42C04B2B6001CFF6F /* quilisma.cpp in Sources */,
4D16943C1E3A44F300569BF4 /* view_beam.cpp in Sources */,
E7BCFFBA281298620012513D /* resources.cpp in Sources */,
40D45EC3204EEAFE009C1EC9 /* instrdef.cpp in Sources */,
Expand Down Expand Up @@ -4399,6 +4425,7 @@
4DEC4D8221C804E000D1D273 /* app.cpp in Sources */,
4DB787632022F0B700394520 /* jsonxx.cc in Sources */,
4DACCA132990F2E600B55913 /* att.cpp in Sources */,
BD96F7CD2C04A708001CFF6F /* quilisma.cpp in Sources */,
4DEEDE641E617C930087E8BC /* elementpart.cpp in Sources */,
4D95D4F61D71866200B2B856 /* controlelement.cpp in Sources */,
BDC366C72576AF9300E4D826 /* grpsym.cpp in Sources */,
Expand All @@ -4419,6 +4446,7 @@
4D1EB6A12A2A40B400AF2F98 /* textlayoutelement.cpp in Sources */,
4D09D3ED1EA8AD8500A420E6 /* horizontalaligner.cpp in Sources */,
4DEC4DA221C81EB300D1D273 /* rdg.cpp in Sources */,
BD96F7D12C04B297001CFF6F /* oriscus.cpp in Sources */,
4D9A9C19199F561200028D93 /* verse.cpp in Sources */,
E76046C328D496B400C36204 /* calcledgerlinesfunctor.cpp in Sources */,
E76A9D4A29A74E4B0044682D /* adjustdotsfunctor.cpp in Sources */,
Expand Down Expand Up @@ -4497,6 +4525,7 @@
8F3DD36018854B390051330C /* view_beam.cpp in Sources */,
4DACC99C2990F29A00B55913 /* atts_header.cpp in Sources */,
4DACC9A42990F29A00B55913 /* atts_cmnornaments.cpp in Sources */,
BD96F7D82C04B2EE001CFF6F /* oriscus.cpp in Sources */,
8F3DD36218854B390051330C /* view_element.cpp in Sources */,
4DB3D8E11F83D15900B5FC2B /* chord.cpp in Sources */,
40C2E4252052A6FA0003625F /* sb.cpp in Sources */,
Expand Down Expand Up @@ -4668,6 +4697,7 @@
4DA0EAEC22BB77C300A7EBEB /* editortoolkit_neume.cpp in Sources */,
8F3DD31E18854AFB0051330C /* bboxdevicecontext.cpp in Sources */,
4DACC9982990F29A00B55913 /* atts_facsimile.cpp in Sources */,
BD96F7D52C04B2B6001CFF6F /* quilisma.cpp in Sources */,
E7231E0729B64B33000A2BF3 /* adjustxoverflowfunctor.cpp in Sources */,
4DB3D8F31F83D1C600B5FC2B /* scoredefinterface.cpp in Sources */,
4D2461DD246BE2E8002BBCCD /* expansionmap.cpp in Sources */,
Expand Down Expand Up @@ -4782,6 +4812,7 @@
BB4C4BBC22A932FC001F6AF0 /* MidiEventList.cpp in Sources */,
4DACC99D2990F29A00B55913 /* atts_header.cpp in Sources */,
4DACC9A52990F29A00B55913 /* atts_cmnornaments.cpp in Sources */,
BD96F7D92C04B2EF001CFF6F /* oriscus.cpp in Sources */,
BB4C4B9122A932DF001F6AF0 /* textelement.cpp in Sources */,
BB4C4B0922A932C3001F6AF0 /* pghead.cpp in Sources */,
E722106728F856C4002CD6E9 /* findlayerelementsfunctor.cpp in Sources */,
Expand Down Expand Up @@ -4953,6 +4984,7 @@
4DACC9992990F29A00B55913 /* atts_facsimile.cpp in Sources */,
BB4C4AB922A932A6001F6AF0 /* iopae.cpp in Sources */,
E7231E0829B64B34000A2BF3 /* adjustxoverflowfunctor.cpp in Sources */,
BD96F7D62C04B2B7001CFF6F /* quilisma.cpp in Sources */,
BB4C4ABB22A932B6001F6AF0 /* instrdef.cpp in Sources */,
BB4C4AB722A932A6001F6AF0 /* iomusxml.cpp in Sources */,
4DACC9EF2990F29A00B55913 /* atts_shared.cpp in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion data/Bravura.css
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions data/Bravura.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -1005,6 +1009,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>
Expand Down
1 change: 1 addition & 0 deletions data/Bravura/E926.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions data/Bravura/E927.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions data/Bravura/E928.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions data/Bravura/E929.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions data/Bravura/F43D.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Loading

0 comments on commit a8bd0d4

Please sign in to comment.