Skip to content

Commit

Permalink
Merge commit 'e951c59a6aa14fe47a78e667c8f2d22906582685'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	include/vrv/vrvdef.h
  • Loading branch information
@lpugin
lpugin committed Jun 13, 2017
2 parents b2194a3 + c022d8d commit 5ea1606
Show file tree
Hide file tree
Showing 69 changed files with 1,902 additions and 1,276 deletions.
6 changes: 6 additions & 0 deletions Verovio.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
4D422105199805F800963292 /* att.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D422103199805F700963292 /* att.cpp */; };
4D4221061998A8CE00963292 /* atts_mensural.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE29031940BCC100C76319 /* atts_mensural.cpp */; };
4D4221071998A8CE00963292 /* atts_mensural.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE29031940BCC100C76319 /* atts_mensural.cpp */; };
4D4335BD1ECCA366003BE1A9 /* breath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D4335BC1ECCA366003BE1A9 /* breath.cpp */; };
4D43C30C1A9BB22A00EA28F3 /* view_mensural.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D43C30B1A9BB22A00EA28F3 /* view_mensural.cpp */; };
4D50B53A1C1B40C90081D56E /* atttypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D50B5391C1B40C90081D56E /* atttypes.h */; };
4D50B53B1C1B47540081D56E /* atts_pagebased.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D3FF8D919BADD7A00B105B5 /* atts_pagebased.cpp */; };
Expand Down Expand Up @@ -496,6 +497,8 @@
4D4220FF199805E400963292 /* att.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = att.h; path = include/vrv/att.h; sourceTree = "<group>"; };
4D422100199805E400963292 /* attdef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = attdef.h; path = include/vrv/attdef.h; sourceTree = "<group>"; };
4D422103199805F700963292 /* att.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = att.cpp; path = src/att.cpp; sourceTree = "<group>"; };
4D4335BB1ECCA359003BE1A9 /* breath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = breath.h; path = include/vrv/breath.h; sourceTree = "<group>"; };
4D4335BC1ECCA366003BE1A9 /* breath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = breath.cpp; path = src/breath.cpp; sourceTree = "<group>"; };
4D43C30B1A9BB22A00EA28F3 /* view_mensural.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = view_mensural.cpp; path = src/view_mensural.cpp; sourceTree = "<group>"; };
4D50B5391C1B40C90081D56E /* atttypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = atttypes.h; path = libmei/atttypes.h; sourceTree = "<group>"; };
4D543E211B80AACF004B823C /* view_control.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = view_control.cpp; path = src/view_control.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -912,6 +915,8 @@
4DF28A021A754DE400BA9F7D /* controlelement.h */,
4DB351101C8040B1002DD057 /* anchoredtext.cpp */,
4DB3510D1C80409E002DD057 /* anchoredtext.h */,
4D4335BC1ECCA366003BE1A9 /* breath.cpp */,
4D4335BB1ECCA359003BE1A9 /* breath.h */,
4DB351111C8040B1002DD057 /* dir.cpp */,
4DB3510E1C80409E002DD057 /* dir.h */,
4DDBBB591C7AE45900054AFF /* dynam.cpp */,
Expand Down Expand Up @@ -1466,6 +1471,7 @@
buildActionMask = 2147483647;
files = (
8F086EE2188539540037FD8E /* verticalaligner.cpp in Sources */,
4D4335BD1ECCA366003BE1A9 /* breath.cpp in Sources */,
8F086EE4188539540037FD8E /* barline.cpp in Sources */,
8F086EE5188539540037FD8E /* bboxdevicecontext.cpp in Sources */,
8F086EE6188539540037FD8E /* beam.cpp in Sources */,
Expand Down
2 changes: 2 additions & 0 deletions data/Bravura.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@
<g c="E089" x="20.0" y="-249.0" w="394.0" h="500.0" h-a-x="434" />
<g c="E08A" x="5.0" y="-249.0" w="419.0" h="500.0" h-a-x="424" />
<g c="E08B" x="0.0" y="-359.0" w="418.0" h="720.0" h-a-x="417" />
<g c="E08C" x="-1.0" y="-250.0" w="500.0" h="500.0" h-a-x="500" />
<g c="E08D" x="-1.0" y="-132.0" w="255.0" h="254.0" h-a-x="254" />
<g c="E0A2" x="0.0" y="-125.0" w="422.0" h="250.0" h-a-x="422" >
<a n="cutOutNW" x="0.172" y="0.332"/>
<a n="cutOutSE" x="1.532" y="-0.364"/>
Expand Down
4 changes: 4 additions & 0 deletions data/Bravura/E08C-timeSigPlus.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit">
<path transform="scale(1,-1)"
d="M300 37h185c7 0 14 -5 14 -14v-46c0 -9 -7 -15 -14 -15h-184c-7 0 -14 -6 -14 -16v-182c0 -7 -6 -14 -15 -14h-46c-9 0 -14 7 -14 14v184c0 5 -5 14 -15 14h-184c-7 0 -14 6 -14 15v46c0 9 7 14 14 14h184c6 0 15 9 15 18v181c0 7 5 14 14 14h46c9 0 15 -7 15 -14v-181 c0 -10 5 -18 13 -18z"/>
</symbol>
4 changes: 4 additions & 0 deletions data/Bravura/E08D-timeSigPlusSmall.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit">
<path transform="scale(1,-1)"
d="M153 14h94c4 0 7 -3 7 -7v-24c0 -4 -3 -7 -7 -7h-93c-4 0 -8 -3 -8 -9v-92c0 -4 -3 -7 -7 -7h-24c-4 0 -7 3 -7 7v93c0 3 -2 8 -8 8h-93c-4 0 -8 3 -8 7v24c0 4 4 7 8 7h93c4 0 8 4 8 9v92c0 4 3 7 7 7h24c4 0 7 -3 7 -7v-92c0 -5 3 -9 7 -9z"/>
</symbol>
2 changes: 2 additions & 0 deletions data/Leipzig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,4 +302,6 @@
<g c="E249" x="0.0" y="-570.0" w="276.1" h="1329.0" />
<g c="E24B" x="0.0" y="-760.0" w="276.1" h="1518.0" />
<g c="E4EB" x="-1.0" y="-955.0" w="642.0" h="1632.0" h-a-x="642" />
<g c="E08D" x="0.0" y="-126.4" w="252.8" h="252.8" h-a-x="253" />
<g c="E08C" x="-0.0" y="-170.6" w="341.3" h="341.3" h-a-x="342" />
</bounding-boxes>
4 changes: 4 additions & 0 deletions data/Leipzig/E08C-timeSigPlus.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit">
<path transform="scale(1,-1)"
d="M341.279 -37.7998h-132.839v-132.841h-75.5996v132.841h-132.841v76.6787h132.841v131.762h75.5996v-131.762h132.839v-76.6787z"/>
</symbol>
4 changes: 4 additions & 0 deletions data/Leipzig/E08D-timeSigPlusSmall.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit">
<path transform="scale(1,-1)"
d="M252.8 -28h-98.3994v-98.4004h-56v98.4004h-98.4004v56.7998h98.4004v97.6006h56v-97.6006h98.3994v-56.7998z"/>
</symbol>
2 changes: 1 addition & 1 deletion data/Leipzig/E0A3-noteheadHalf.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit">
<path transform="scale(1,-1)"
d="M96 -132zM200 138l41 -5c-2 0 -41 5 -41 5zM278 64c0 22 -17 39 -43 39c-12 0 -26 -3 -41 -10c-85 -43 -165 -94 -165 -156c5 -25 15 -32 49 -32c67 11 200 95 200 159zM0 -36c0 68 73 174 200 174c66 0 114 -39 114 -97c0 -84 -106 -173 -218 -173c-64 0 -96 32 -96 96z "/>
d="M98 -102zM200 138l41 -5c-2 0 -41 5 -41 5zM278 64c0 22 -17 39 -43 39c-12 0 -26 -3 -41 -10c-85 -43 -165 -94 -165 -156c5 -25 15 -32 49 -32c67 11 200 95 200 159zM0 -36c0 68 73 174 200 174c66 0 114 -39 114 -97c0 -84 -106 -173 -218 -173c-64 0 -96 32 -96 96z "/>
</symbol>
4 changes: 2 additions & 2 deletions emscripten/emscripten_main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const char *vrvToolkit_getElementsAtTime(Toolkit *tk, int millisec)
void vrvToolkit_setOptions(Toolkit *tk, const char *options)
{
if (!tk->ParseOptions(options)) {
vrv::LogError("Could not load JSON options.");
LogError("Could not load JSON options.");
}
}

Expand All @@ -132,7 +132,7 @@ const char *vrvToolkit_renderData(Toolkit *tk, const char *data, const char *opt
bool vrvToolkit_edit(Toolkit *tk, const char *editorAction)
{
if (!tk->Edit(editorAction)) {
vrv::LogError("Could not perform editor action.");
LogError("Could not perform editor action.");
return false;
}
return true;
Expand Down
60 changes: 54 additions & 6 deletions fonts/Leipzig-5.2.sfd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ FontName: Leipzig
FullName: Leipzig
FamilyName: Leipzig
Weight: Regular
Copyright: Created by Etienne Darbellay, Jean-Francois Marti and Laurent Pugin. \nThis font is licensed under the SIL Open Font License \\(http://scripts.sil.org/OFL\\).\nVersion 5.2.28
UComments: "2014-03-21: Created.+AAoA-Version 5.2.0 - adding glyphs (dynamics, ornaments, mensural note heads, etc)+AAoA-Version 5.2.1 - adding repeats+AAoA-Version 5.2.2 - fixing size of some glpyhs+AAoA-Version 5.2.3 - adding mensural clefs+AAoA-Version 5.2.4 - adding more dynam glyphs+AAoA-Version 5.2.5 - adding more dynam glyphs+AAoA-Version 5.2.6 - adding some octaves glyphs+AAoA-Version 5.2.7 - adjusting pedal glyphs+AAoA-Version 5.2.8 - adding perc clef+AAoA-Version 5.2.9 - adding two mensural clefs+AAoA-Version 5.2.10 - adding articulations and two fermatas and bow directions+AAoA-Version 5.2.11 - adding harmonic and reviewing bows+AAoA-Version 5.2.12 - reviewing artic width+AAoA-Version 5.2.13 - adding (very)short/long fermata and breath comma+AAoA-Version 5.2.14 - adding mensural stems+AAoA-Version 5.2.15 - changing ascent/descent to 750/250+AAoA-Version 5.2.16 - adding mensural rests+AAoA-Version 5.2.17 - correcting mensural rests position+AAoA-Version 5.2.18 - adding accid square brackets and reviewing bow directions+AAoA-Version 5.2.19 - adding some quartertone accidentals (Gould and Stein-Zimmermann)+AAoA-Version 5.2.20 - adding some anchor points (accidentals)+AAoA-Version 5.2.21 - adding stem flags (16th to 256th)+AAoA-Version 5.2.22 - fixing anchor point names+AAoA-Version 5.2.23 - adding anchor points to all accidentals+AAoA-Version 5.2.24 - changing 8th flags+AAoA-Version 5.2.25 - reviewing mensural clefs+AAoA-Version 5.2.26 - revising position of some rests+AAoA-Version 5.2.27 - adding some anchor points to note heads+AAoA-Version 5.2.28 - correcting anchor points"
Version: 5.2.28
Copyright: Created by Etienne Darbellay, Jean-Francois Marti and Laurent Pugin. \nThis font is licensed under the SIL Open Font License \\(http://scripts.sil.org/OFL\\).\nVersion 5.2.29
UComments: "2014-03-21: Created.+AAoA-Version 5.2.0 - adding glyphs (dynamics, ornaments, mensural note heads, etc)+AAoA-Version 5.2.1 - adding repeats+AAoA-Version 5.2.2 - fixing size of some glpyhs+AAoA-Version 5.2.3 - adding mensural clefs+AAoA-Version 5.2.4 - adding more dynam glyphs+AAoA-Version 5.2.5 - adding more dynam glyphs+AAoA-Version 5.2.6 - adding some octaves glyphs+AAoA-Version 5.2.7 - adjusting pedal glyphs+AAoA-Version 5.2.8 - adding perc clef+AAoA-Version 5.2.9 - adding two mensural clefs+AAoA-Version 5.2.10 - adding articulations and two fermatas and bow directions+AAoA-Version 5.2.11 - adding harmonic and reviewing bows+AAoA-Version 5.2.12 - reviewing artic width+AAoA-Version 5.2.13 - adding (very)short/long fermata and breath comma+AAoA-Version 5.2.14 - adding mensural stems+AAoA-Version 5.2.15 - changing ascent/descent to 750/250+AAoA-Version 5.2.16 - adding mensural rests+AAoA-Version 5.2.17 - correcting mensural rests position+AAoA-Version 5.2.18 - adding accid square brackets and reviewing bow directions+AAoA-Version 5.2.19 - adding some quartertone accidentals (Gould and Stein-Zimmermann)+AAoA-Version 5.2.20 - adding some anchor points (accidentals)+AAoA-Version 5.2.21 - adding stem flags (16th to 256th)+AAoA-Version 5.2.22 - fixing anchor point names+AAoA-Version 5.2.23 - adding anchor points to all accidentals+AAoA-Version 5.2.24 - changing 8th flags+AAoA-Version 5.2.25 - reviewing mensural clefs+AAoA-Version 5.2.26 - revising position of some rests+AAoA-Version 5.2.27 - adding some anchor points to note heads+AAoA-Version 5.2.28 - correcting anchor points+AAoA-Version 5.2.29 - adding plus time signature symbols"
Version: 5.2.29
ItalicAngle: 0
UnderlinePosition: -50
UnderlineWidth: 50
Expand All @@ -21,7 +21,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1395388130
ModificationTime: 1493532553
ModificationTime: 1495093021
PfmFamily: 17
TTFWeight: 500
TTFWidth: 5
Expand Down Expand Up @@ -50,12 +50,12 @@ NameList: Adobe Glyph List
DisplaySize: -128
AntiAlias: 1
FitToEm: 1
WinInfo: 57940 10 4
WinInfo: 57470 10 4
BeginPrivate: 0
EndPrivate
TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
AnchorClass2: "cutOutNW""" "cutOutSW""" "cutOutSE""" "cutOutNE"""
BeginChars: 1114115 229
BeginChars: 1114115 231

StartChar: uniE0A3
Encoding: 57507 57507 0
Expand Down Expand Up @@ -11870,5 +11870,53 @@ VWidth: 2048
Flags: HW
LayerCount: 2
EndChar

StartChar: uniE08D
Encoding: 57485 57485 229
Width: 253
VWidth: 2048
Flags: HW
LayerCount: 2
Fore
SplineSet
252.799804688 -28 m 5
154.400390625 -28 l 5
154.400390625 -126.400390625 l 5
98.400390625 -126.400390625 l 5
98.400390625 -28 l 5
0 -28 l 5
0 28.7998046875 l 5
98.400390625 28.7998046875 l 5
98.400390625 126.400390625 l 5
154.400390625 126.400390625 l 5
154.400390625 28.7998046875 l 5
252.799804688 28.7998046875 l 5
252.799804688 -28 l 5
EndSplineSet
EndChar

StartChar: uniE08C
Encoding: 57484 57484 230
Width: 342
VWidth: 2048
Flags: HW
LayerCount: 2
Fore
SplineSet
341.279296875 -37.7998046875 m 1
208.440429688 -37.7998046875 l 1
208.440429688 -170.640625 l 1
132.840820312 -170.640625 l 1
132.840820312 -37.7998046875 l 1
0 -37.7998046875 l 1
0 38.87890625 l 1
132.840820312 38.87890625 l 1
132.840820312 170.640625 l 1
208.440429688 170.640625 l 1
208.440429688 38.87890625 l 1
341.279296875 38.87890625 l 1
341.279296875 -37.7998046875 l 1
EndSplineSet
EndChar
EndChars
EndSplineFont
13 changes: 10 additions & 3 deletions fonts/Leipzig.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 27 additions & 1 deletion fonts/json/leipzig-5.2_metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"tupletBracketThickness": "0.16"
},
"fontName": "Leipzig-5.2",
"fontVersion": "5.2.28",
"fontVersion": "5.2.29",
"glyphBBoxes": {
"uniE003": {
"bBoxNE": [
Expand Down Expand Up @@ -362,6 +362,26 @@
-1.276
]
},
"uniE08C": {
"bBoxNE": [
1.3651,
0.6826
],
"bBoxSW": [
0.0,
-0.6826
]
},
"uniE08D": {
"bBoxNE": [
1.0112,
0.5056
],
"bBoxSW": [
0.0,
-0.5056
]
},
"uniE0A2": {
"bBoxNE": [
1.62,
Expand Down Expand Up @@ -2393,6 +2413,12 @@
"uniE08B": {
"codepoint": "0XE08B"
},
"uniE08C": {
"codepoint": "0XE08C"
},
"uniE08D": {
"codepoint": "0XE08D"
},
"uniE0A2": {
"codepoint": "0XE0A2"
},
Expand Down
4 changes: 2 additions & 2 deletions fonts/supported.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@
<glyph glyph-code="E089" smufl-name="timeSig9"/>
<glyph glyph-code="E08A" smufl-name="timeSigCommon"/>
<glyph glyph-code="E08B" smufl-name="timeSigCutCommon"/>
<!--<glyph glyph-code="E08C" smufl-name="timeSigPlus"/>-->
<!--<glyph glyph-code="E08D" smufl-name="timeSigPlusSmall"/>-->
<glyph glyph-code="E08C" smufl-name="timeSigPlus"/>
<glyph glyph-code="E08D" smufl-name="timeSigPlusSmall"/>
<!--<glyph glyph-code="E08E" smufl-name="timeSigFractionalSlash"/>-->
<!--<glyph glyph-code="E08F" smufl-name="timeSigEquals"/>-->
<!--<glyph glyph-code="E090" smufl-name="timeSigMinus"/>-->
Expand Down
8 changes: 4 additions & 4 deletions include/pugi/pugiconfig.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* pugixml parser - version 1.7
* pugixml parser - version 1.8
* --------------------------------------------------------
* Copyright (C) 2006-2015, by Arseny Kapoulkine ([email protected])
* Copyright (C) 2006-2016, by Arseny Kapoulkine ([email protected])
* Report bugs and download new versions at http://pugixml.org/
*
* This library is distributed under the MIT License. See notice at the end
Expand Down Expand Up @@ -49,7 +49,7 @@
#endif

/**
* Copyright (c) 2006-2015 Arseny Kapoulkine
* Copyright (c) 2006-2016 Arseny Kapoulkine
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -62,7 +62,7 @@
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Expand Down
Loading

0 comments on commit 5ea1606

Please sign in to comment.