Skip to content

Commit 928688f

Browse files
authored
Merge pull request #125 from rism-digital/develop-facsimile-neume-line
Merge upstream changes about facsimile neume line
2 parents 11e013d + 55367ea commit 928688f

40 files changed

+1064
-428
lines changed

Verovio.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,12 @@
800800
4DE96E3B21C4373200CB85BE /* bracketspan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DE96E3A21C4373200CB85BE /* bracketspan.cpp */; };
801801
4DE96E3C21C4373200CB85BE /* bracketspan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DE96E3A21C4373200CB85BE /* bracketspan.cpp */; };
802802
4DE96E3D21C4373200CB85BE /* bracketspan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DE96E3A21C4373200CB85BE /* bracketspan.cpp */; };
803+
4DEBE6E12B36E78900B67DFB /* facsimilefunctor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DEBE6E02B36E78900B67DFB /* facsimilefunctor.h */; };
804+
4DEBE6E22B36E78900B67DFB /* facsimilefunctor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DEBE6E02B36E78900B67DFB /* facsimilefunctor.h */; settings = {ATTRIBUTES = (Public, ); }; };
805+
4DEBE6E42B36E79600B67DFB /* facsimilefunctor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEBE6E32B36E79600B67DFB /* facsimilefunctor.cpp */; };
806+
4DEBE6E52B36E79600B67DFB /* facsimilefunctor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEBE6E32B36E79600B67DFB /* facsimilefunctor.cpp */; };
807+
4DEBE6E62B36E9B300B67DFB /* facsimilefunctor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEBE6E32B36E79600B67DFB /* facsimilefunctor.cpp */; };
808+
4DEBE6E72B36E9B400B67DFB /* facsimilefunctor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEBE6E32B36E79600B67DFB /* facsimilefunctor.cpp */; };
803809
4DEC4D5A21C800A000D1D273 /* abbr.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DEC4D5921C8009600D1D273 /* abbr.h */; };
804810
4DEC4D7A21C8048700D1D273 /* abbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEC4D7921C8048700D1D273 /* abbr.cpp */; };
805811
4DEC4D7B21C8048700D1D273 /* abbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEC4D7921C8048700D1D273 /* abbr.cpp */; };
@@ -2014,6 +2020,8 @@
20142020
4DE644F41EDBEA01002FBE6C /* breath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = breath.cpp; path = src/breath.cpp; sourceTree = "<group>"; };
20152021
4DE96E3821C4370E00CB85BE /* bracketspan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bracketspan.h; path = include/vrv/bracketspan.h; sourceTree = "<group>"; };
20162022
4DE96E3A21C4373200CB85BE /* bracketspan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bracketspan.cpp; path = src/bracketspan.cpp; sourceTree = "<group>"; };
2023+
4DEBE6E02B36E78900B67DFB /* facsimilefunctor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = facsimilefunctor.h; path = include/vrv/facsimilefunctor.h; sourceTree = "<group>"; };
2024+
4DEBE6E32B36E79600B67DFB /* facsimilefunctor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = facsimilefunctor.cpp; path = src/facsimilefunctor.cpp; sourceTree = "<group>"; };
20172025
4DEC4D5921C8009600D1D273 /* abbr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = abbr.h; path = include/vrv/abbr.h; sourceTree = "<group>"; };
20182026
4DEC4D7921C8048700D1D273 /* abbr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = abbr.cpp; path = src/abbr.cpp; sourceTree = "<group>"; };
20192027
4DEC4D7D21C804C500D1D273 /* add.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = add.cpp; path = src/add.cpp; sourceTree = "<group>"; };
@@ -3012,6 +3020,8 @@
30123020
E7265E6D29DC6FD200D11F41 /* castofffunctor.h */,
30133021
E763EF4129E939FB0029E56D /* convertfunctor.cpp */,
30143022
E763EF3E29E939C00029E56D /* convertfunctor.h */,
3023+
4DEBE6E32B36E79600B67DFB /* facsimilefunctor.cpp */,
3024+
4DEBE6E02B36E78900B67DFB /* facsimilefunctor.h */,
30153025
E74A806028BC9111005274E7 /* findfunctor.cpp */,
30163026
E74A806528BC97D5005274E7 /* findfunctor.h */,
30173027
E722106528F856C4002CD6E9 /* findlayerelementsfunctor.cpp */,
@@ -3384,6 +3394,7 @@
33843394
40DA9C3720905CEB006BED92 /* ioabc.h in Headers */,
33853395
4DB3D8CD1F83D11100B5FC2B /* harm.h in Headers */,
33863396
40D45EC2204EEAFB009C1EC9 /* instrdef.h in Headers */,
3397+
4DEBE6E12B36E78900B67DFB /* facsimilefunctor.h in Headers */,
33873398
4D94E0E22995411100F49F89 /* meibasic.h in Headers */,
33883399
BD2E4D9B2875882200B04350 /* stem.h in Headers */,
33893400
4DACC9EA2990F29A00B55913 /* attmodule.h in Headers */,
@@ -3441,6 +3452,7 @@
34413452
E7908EA0298582090004C1F9 /* alignfunctor.h in Headers */,
34423453
BB4C4B9822A932E5001F6AF0 /* durationinterface.h in Headers */,
34433454
BB4C4BB722A932F6001F6AF0 /* jsonxx.h in Headers */,
3455+
4DEBE6E22B36E78900B67DFB /* facsimilefunctor.h in Headers */,
34443456
BB4C4B1622A932C8001F6AF0 /* systemelement.h in Headers */,
34453457
BB4C4AC622A932B6001F6AF0 /* measure.h in Headers */,
34463458
E741AD00299A3D3500854426 /* calcslurdirectionfunctor.h in Headers */,
@@ -3926,6 +3938,7 @@
39263938
E7F39C6229A62B430055DBE0 /* adjustclefchangesfunctor.cpp in Sources */,
39273939
E79320682991454000D80975 /* calcstemfunctor.cpp in Sources */,
39283940
4DED4F18294733140073E504 /* altsyminterface.cpp in Sources */,
3941+
4DEBE6E72B36E9B400B67DFB /* facsimilefunctor.cpp in Sources */,
39293942
4DEF8A6521B7AAF90093A76B /* f.cpp in Sources */,
39303943
4D2073F922A3BCE000E0765F /* tabdursym.cpp in Sources */,
39313944
4D16940B1E3A44F300569BF4 /* keysig.cpp in Sources */,
@@ -4206,6 +4219,7 @@
42064219
8F086EF1188539540037FD8E /* keysig.cpp in Sources */,
42074220
E74A806C28BC98B2005274E7 /* functorinterface.cpp in Sources */,
42084221
E7870357299CF06D00156DC4 /* adjustarpegfunctor.cpp in Sources */,
4222+
4DEBE6E62B36E9B300B67DFB /* facsimilefunctor.cpp in Sources */,
42094223
4DEC4D9E21C81E9400D1D273 /* orig.cpp in Sources */,
42104224
4DDBBB5D1C7AE45900054AFF /* hairpin.cpp in Sources */,
42114225
4D43C30C1A9BB22A00EA28F3 /* view_mensural.cpp in Sources */,
@@ -4489,6 +4503,7 @@
44894503
4DB3D8D51F83D12B00B5FC2B /* tempo.cpp in Sources */,
44904504
4DEC4DA021C81E9400D1D273 /* orig.cpp in Sources */,
44914505
E7F39C6329A62B440055DBE0 /* adjustclefchangesfunctor.cpp in Sources */,
4506+
4DEBE6E42B36E79600B67DFB /* facsimilefunctor.cpp in Sources */,
44924507
E79320692991454000D80975 /* calcstemfunctor.cpp in Sources */,
44934508
8F3DD33E18854B2E0051330C /* beam.cpp in Sources */,
44944509
4DED4F19294733140073E504 /* altsyminterface.cpp in Sources */,
@@ -4771,6 +4786,7 @@
47714786
E793206A2991454100D80975 /* calcstemfunctor.cpp in Sources */,
47724787
BB4C4AD722A932B6001F6AF0 /* staff.cpp in Sources */,
47734788
4DED4F1A294733140073E504 /* altsyminterface.cpp in Sources */,
4789+
4DEBE6E52B36E79600B67DFB /* facsimilefunctor.cpp in Sources */,
47744790
BB4C4B9F22A932E5001F6AF0 /* positioninterface.cpp in Sources */,
47754791
BB4C4B5322A932D7001F6AF0 /* halfmrpt.cpp in Sources */,
47764792
BB4C4B8722A932DF001F6AF0 /* num.cpp in Sources */,

0 commit comments

Comments
 (0)