Updated Leland style values

iveshenry18 · Dec 4, 2020 · 5452b87 · 5452b87
1 parent 0a11f68
commit 5452b87
Show file tree

Hide file tree

Showing 32 changed files with 138 additions and 143 deletions.
diff --git a/fonts/leland/Leland.otf b/fonts/leland/Leland.otf
diff --git a/fonts/leland/metadata.json b/fonts/leland/metadata.json
@@ -16,16 +16,16 @@
         "pedalLineThickness": 0.11,
         "repeatBarlineDotSeparation": 0.7,
         "repeatEndingLineThickness": 0.11,
-        "slurEndpointThickness": 0.06,
-        "slurMidpointThickness": 0.18,
+        "slurEndpointThickness": 0.07,
+        "slurMidpointThickness": 0.21,
         "staffLineThickness": 0.11,
         "stemThickness": 0.11,
         "subBracketThickness": 0.11,
         "textEnclosureThickness": 0.11,
         "thickBarlineThickness": 0.55,
         "thinBarlineThickness": 0.18,
-        "tieEndpointThickness": 0.06,
-        "tieMidpointThickness": 0.18,
+        "tieEndpointThickness": 0.07,
+        "tieMidpointThickness": 0.21,
         "tupletBracketThickness": 0.1
     },
     "fontName": "Leland",
@@ -93,7 +93,7 @@
         },
         "U+F5DD": {
             "bBoxNE": [
-                1.544,
+                1.56,
                 1.812
             ],
             "bBoxSW": [
@@ -133,7 +133,7 @@
         },
         "U+F5E1": {
             "bBoxNE": [
-                2.224,
+                2.24,
                 1.81
             ],
             "bBoxSW": [
@@ -2251,7 +2251,7 @@
                 -0.528
             ]
         },
-        "noteheadDiamondBlack": {
+        "noteheadDiamondBlackWide": {
             "bBoxNE": [
                 1.372,
                 0.6
@@ -2261,7 +2261,7 @@
                 -0.596
             ]
         },
-        "noteheadDiamondHalf": {
+        "noteheadDiamondHalfWide": {
             "bBoxNE": [
                 1.372,
                 0.6
@@ -3683,11 +3683,11 @@
         "uniE0AF": {
             "codepoint": "0XE0AF"
         },
-        "uniE0D9": {
-            "codepoint": "0XE0D9"
+        "uniE0DA": {
+            "codepoint": "0XE0DA"
         },
-        "uniE0DB": {
-            "codepoint": "0XE0DB"
+        "uniE0DC": {
+            "codepoint": "0XE0DC"
         },
         "uniE1B2": {
             "codepoint": "0XE1B2"
@@ -5288,7 +5288,7 @@
                 0.168
             ]
         },
-        "noteheadDiamondBlack": {
+        "noteheadDiamondBlackWide": {
             "stemDownNW": [
                 0.0,
                 0.0
@@ -5298,7 +5298,7 @@
                 0.0
             ]
         },
-        "noteheadDiamondHalf": {
+        "noteheadDiamondHalfWide": {
             "stemDownNW": [
                 0.0,
                 0.0

diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -157,7 +157,7 @@ static const StyleType styleTypes[] {
       { Sid::startBarlineSingle,      "startBarlineSingle",      QVariant(false) },
       { Sid::startBarlineMultiple,    "startBarlineMultiple",    QVariant(true) },
 
-      { Sid::bracketWidth,            "bracketWidth",            Spatium(0.45) },
+      { Sid::bracketWidth,            "bracketWidth",            Spatium(0.44) },
       { Sid::bracketDistance,         "bracketDistance",         Spatium(0.1) },
       { Sid::akkoladeWidth,           "akkoladeWidth",           Spatium(1.6) },
       { Sid::akkoladeBarDistance,     "akkoladeBarDistance",     Spatium(.4) },
@@ -235,7 +235,7 @@ static const StyleType styleTypes[] {
       { Sid::hairpinContHeight,       "hairpinContHeight",       Spatium(0.5) },
       { Sid::hairpinLineWidth,        "hairpinWidth",            Spatium(0.12) },
       { Sid::hairpinFontFace,         "hairpinFontFace",         "Edwin" },
-      { Sid::hairpinFontSize,         "hairpinFontSize",         12.0 },
+      { Sid::hairpinFontSize,         "hairpinFontSize",         10.0 },
       { Sid::hairpinLineSpacing,      "hairpinLineSpacing",      1.0 },
       { Sid::hairpinFontSpatiumDependent, "hairpinFontSpatiumDependent", true },
       { Sid::hairpinFontStyle,        "hairpinFontStyle",        int(FontStyle::Italic) },
@@ -445,8 +445,8 @@ static const StyleType styleTypes[] {
       { Sid::ArpeggioLineWidth,       "ArpeggioLineWidth",       Spatium(.18) },
       { Sid::ArpeggioHookLen,         "ArpeggioHookLen",         Spatium(.8) },
       { Sid::ArpeggioHiddenInStdIfTab,"ArpeggioHiddenInStdIfTab",QVariant(false)},
-      { Sid::SlurEndWidth,            "slurEndWidth",            Spatium(.06) },
-      { Sid::SlurMidWidth,            "slurMidWidth",            Spatium(.18) },
+      { Sid::SlurEndWidth,            "slurEndWidth",            Spatium(.07) },
+      { Sid::SlurMidWidth,            "slurMidWidth",            Spatium(.21) },
       { Sid::SlurDottedWidth,         "slurDottedWidth",         Spatium(.10)  },
       { Sid::MinTieLength,            "minTieLength",            Spatium(1.0) },
       { Sid::SlurMinDistance,         "slurMinDistance",         Spatium(0.5) },
@@ -568,7 +568,7 @@ static const StyleType styleTypes[] {
       { Sid::tupletStemRightDistance, "tupletStemRightDistance", Spatium(.5) },
       { Sid::tupletNoteLeftDistance,  "tupletNoteLeftDistance",  Spatium(-0.5) },
       { Sid::tupletNoteRightDistance, "tupletNoteRightDistance", Spatium(0.0) },
-      { Sid::tupletBracketWidth,      "tupletBracketWidth",      Spatium(0.44) },
+      { Sid::tupletBracketWidth,      "tupletBracketWidth",      Spatium(0.1) },
       { Sid::tupletDirection,         "tupletDirection",         QVariant::fromValue<Direction>(Direction::AUTO) },
       { Sid::tupletNumberType,        "tupletNumberType",        int(TupletNumberType::SHOW_NUMBER) },
       { Sid::tupletBracketType,       "tupletBracketType",       int(TupletBracketType::AUTO_BRACKET) },

diff --git a/mtest/libmscore/compat206/accidentals-ref.mscx b/mtest/libmscore/compat206/accidentals-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/ambitus-ref.mscx b/mtest/libmscore/compat206/ambitus-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/articulations-double-ref.mscx b/mtest/libmscore/compat206/articulations-double-ref.mscx
@@ -20,6 +20,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -42,7 +43,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/articulations-ref.mscx b/mtest/libmscore/compat206/articulations-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -33,7 +34,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/barlines-ref.mscx b/mtest/libmscore/compat206/barlines-ref.mscx
@@ -20,6 +20,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -42,7 +43,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/breath-ref.mscx b/mtest/libmscore/compat206/breath-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/clefs-ref.mscx b/mtest/libmscore/compat206/clefs-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/drumset-ref.mscx b/mtest/libmscore/compat206/drumset-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/fermata-ref.mscx b/mtest/libmscore/compat206/fermata-ref.mscx
@@ -20,6 +20,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -41,7 +42,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/frame_text2-ref.mscx b/mtest/libmscore/compat206/frame_text2-ref.mscx
@@ -32,6 +32,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -50,6 +51,7 @@
       <hairpinHeight>1.2</hairpinHeight>
       <hairpinWidth>0.13</hairpinWidth>
       <hairpinFontFace>FreeSerif</hairpinFontFace>
+      <hairpinFontSize>12</hairpinFontSize>
       <hairpinFramePadding>0</hairpinFramePadding>
       <hairpinFrameWidth>0</hairpinFrameWidth>
       <pedalPosBelow x="0" y="4"/>
@@ -62,7 +64,6 @@
       <chordSymbolAFontFace>FreeSerif</chordSymbolAFontFace>
       <chordSymbolAFramePadding>0</chordSymbolAFramePadding>
       <chordSymbolAFrameWidth>0</chordSymbolAFrameWidth>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/hairpin-ref.mscx b/mtest/libmscore/compat206/hairpin-ref.mscx
@@ -20,6 +20,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -41,7 +42,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/intrumentNameAlign-ref.mscx b/mtest/libmscore/compat206/intrumentNameAlign-ref.mscx
@@ -20,6 +20,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -41,7 +42,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/lidemptytext-ref.mscx b/mtest/libmscore/compat206/lidemptytext-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="0"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/markers-ref.mscx b/mtest/libmscore/compat206/markers-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/noteheads-ref.mscx b/mtest/libmscore/compat206/noteheads-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>

diff --git a/mtest/libmscore/compat206/tuplets-ref.mscx b/mtest/libmscore/compat206/tuplets-ref.mscx
@@ -11,6 +11,7 @@
       <endBarWidth>0.5</endBarWidth>
       <doubleBarDistance>0.46</doubleBarDistance>
       <endBarDistance>0.65</endBarDistance>
+      <bracketWidth>0.45</bracketWidth>
       <clefLeftMargin>0.64</clefLeftMargin>
       <timesigLeftMargin>0.5</timesigLeftMargin>
       <clefKeyRightMargin>1.75</clefKeyRightMargin>
@@ -32,7 +33,6 @@
       <pedalLineWidth>0.15</pedalLineWidth>
       <trillPosAbove x="0" y="-1"/>
       <harmonyFretDist>0.5</harmonyFretDist>
-      <slurEndWidth>0.07</slurEndWidth>
       <slurMidWidth>0.15</slurMidWidth>
       <musicalSymbolFont>Emmentaler</musicalSymbolFont>
       <musicalTextFont>MScore Text</musicalTextFont>