Skip to content

Commit

Permalink
Merge pull request #3064 and #3081: Bass strings notation & more styl…
Browse files Browse the repository at this point in the history 
…e and fonts
  • Loading branch information
@lasconic
lasconic committed Mar 20, 2017
2 parents dc04bfa + f54506a commit 92ec3d3
Show file tree
Hide file tree
Showing 15 changed files with 6,478 additions and 2,630 deletions.
306 changes: 297 additions & 9 deletions fonts/fonts_tablature.xml
View file
Expand Up @@ -48,8 +48,13 @@
<fret value="14" letter="1">p</fret>
<fret value="15" letter="1">q</fret>
<fret value="16" letter="1">r</fret>
<mark value="x">x</mark>
<mark value="x">X</mark>
<mark value="ghost">×</mark>
<mark value="slash" number="1">/</mark>
<mark value="slash" number="2">//</mark>
<mark value="slash" number="3">///</mark>
<mark value="slash" number="4">////</mark>
<mark value="slash" number="5">/////</mark>
</fretFont>
<fretFont>
<family>FreeSerif</family>
Expand Down Expand Up @@ -98,8 +103,13 @@
<fret value="14" letter="1">p</fret>
<fret value="15" letter="1">q</fret>
<fret value="16" letter="1">r</fret>
<mark value="x">x</mark>
<mark value="x">X</mark>
<mark value="ghost">×</mark>
<mark value="slash" number="1">/</mark>
<mark value="slash" number="2">//</mark>
<mark value="slash" number="3">///</mark>
<mark value="slash" number="4">////</mark>
<mark value="slash" number="5">/////</mark>
</fretFont>
<fretFont>
<family>MScoreTabulature</family>
Expand All @@ -116,7 +126,7 @@
<fret value="7" letter="0">7</fret>
<fret value="8" letter="0">8</fret>
<fret value="9" letter="0">9</fret>
<fret value="10" letter="0">10</fret>
<fret value="10" letter="0">:</fret>
<fret value="11" letter="0">11</fret>
<fret value="12" letter="0">12</fret>
<fret value="13" letter="0">13</fret>
Expand Down Expand Up @@ -148,12 +158,17 @@
<fret value="14" letter="1">P</fret>
<fret value="15" letter="1">Q</fret>
<fret value="16" letter="1">R</fret>
<mark value="x">x</mark>
<mark value="ghost">×</mark>
<mark value="x">:</mark>
<mark value="ghost">@</mark>
<mark value="slash" number="1">V</mark>
<mark value="slash" number="2">W</mark>
<mark value="slash" number="3">X</mark>
<mark value="slash" number="4">Y</mark>
<mark value="slash" number="5">Z</mark>
</fretFont>
<fretFont>
<family>MScoreTabulature</family>
<displayName>MuseScore Tab Late Renaiss</displayName>
<displayName>MuseScore Phalèse</displayName>
<defaultPitch>10</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<fret value="0" letter="0">0</fret>
Expand All @@ -166,7 +181,7 @@
<fret value="7" letter="0">7</fret>
<fret value="8" letter="0">8</fret>
<fret value="9" letter="0">9</fret>
<fret value="10" letter="0">10</fret>
<fret value="10" letter="0">:</fret>
<fret value="11" letter="0">11</fret>
<fret value="12" letter="0">12</fret>
<fret value="13" letter="0">13</fret>
Expand Down Expand Up @@ -198,15 +213,244 @@
<fret value="14" letter="1">p</fret>
<fret value="15" letter="1">q</fret>
<fret value="16" letter="1">r</fret>
<mark value="x">x</mark>
<mark value="ghost">×</mark>
<mark value="x">:</mark>
<mark value="ghost">`</mark>
<mark value="slash" number="1">V</mark>
<mark value="slash" number="2">W</mark>
<mark value="slash" number="3">X</mark>
<mark value="slash" number="4">Y</mark>
<mark value="slash" number="5">Z</mark>
</fretFont>
<fretFont>
<family>MScoreTabulature</family>
<displayName>MuseScore Bonneuil-de Visée</displayName>
<defaultPitch>10</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<fret value="0" letter="0">0</fret>
<fret value="1" letter="0">1</fret>
<fret value="2" letter="0">2</fret>
<fret value="3" letter="0">3</fret>
<fret value="4" letter="0">4</fret>
<fret value="5" letter="0">5</fret>
<fret value="6" letter="0">6</fret>
<fret value="7" letter="0">7</fret>
<fret value="8" letter="0">8</fret>
<fret value="9" letter="0">9</fret>
<fret value="10" letter="0">:</fret>
<fret value="11" letter="0">11</fret>
<fret value="12" letter="0">12</fret>
<fret value="13" letter="0">13</fret>
<fret value="14" letter="0">14</fret>
<fret value="15" letter="0">15</fret>
<fret value="16" letter="0">16</fret>
<fret value="17" letter="0">17</fret>
<fret value="18" letter="0">18</fret>
<fret value="19" letter="0">19</fret>
<fret value="20" letter="0">20</fret>
<fret value="21" letter="0">21</fret>
<fret value="22" letter="0">22</fret>
<fret value="23" letter="0">23</fret>
<fret value="24" letter="0">24</fret>
<fret value="0" letter="1">Ł</fret>
<fret value="1" letter="1">ł</fret>
<fret value="2" letter="1">Ń</fret>
<fret value="3" letter="1">ń</fret>
<fret value="4" letter="1">Ņ</fret>
<fret value="5" letter="1">ņ</fret>
<fret value="6" letter="1">Ň</fret>
<fret value="7" letter="1">ň</fret>
<fret value="8" letter="1">ʼn</fret>
<fret value="9" letter="1">ŋ</fret>
<fret value="10" letter="1">Ō</fret>
<fret value="11" letter="1">ō</fret>
<fret value="12" letter="1">Ŏ</fret>
<fret value="13" letter="1">ŏ</fret>
<fret value="14" letter="1">Ő</fret>
<fret value="15" letter="1">ő</fret>
<fret value="16" letter="1">Œ</fret>
<mark value="x">:</mark>
<mark value="ghost">`</mark>
<mark value="slash" number="1">V</mark>
<mark value="slash" number="2">W</mark>
<mark value="slash" number="3">X</mark>
<mark value="slash" number="4">Y</mark>
<mark value="slash" number="5">Z</mark>
</fretFont>
<fretFont>
<family>MScoreTabulature</family>
<displayName>MuseScore Bonneuil-Gaultier</displayName>
<defaultPitch>10</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<fret value="0" letter="0">0</fret>
<fret value="1" letter="0">1</fret>
<fret value="2" letter="0">2</fret>
<fret value="3" letter="0">3</fret>
<fret value="4" letter="0">4</fret>
<fret value="5" letter="0">5</fret>
<fret value="6" letter="0">6</fret>
<fret value="7" letter="0">7</fret>
<fret value="8" letter="0">8</fret>
<fret value="9" letter="0">9</fret>
<fret value="10" letter="0">:</fret>
<fret value="11" letter="0">11</fret>
<fret value="12" letter="0">12</fret>
<fret value="13" letter="0">13</fret>
<fret value="14" letter="0">14</fret>
<fret value="15" letter="0">15</fret>
<fret value="16" letter="0">16</fret>
<fret value="17" letter="0">17</fret>
<fret value="18" letter="0">18</fret>
<fret value="19" letter="0">19</fret>
<fret value="20" letter="0">20</fret>
<fret value="21" letter="0">21</fret>
<fret value="22" letter="0">22</fret>
<fret value="23" letter="0">23</fret>
<fret value="24" letter="0">24</fret>
<fret value="0" letter="1">ā</fret>
<fret value="1" letter="1">Ă</fret>
<fret value="2" letter="1">ă</fret>
<fret value="3" letter="1">Ą</fret>
<fret value="4" letter="1">ą</fret>
<fret value="5" letter="1">Ć</fret>
<fret value="6" letter="1">ć</fret>
<fret value="7" letter="1">Ĉ</fret>
<fret value="8" letter="1">ĉ</fret>
<fret value="9" letter="1">ċ</fret>
<fret value="10" letter="1">Č</fret>
<fret value="11" letter="1">č</fret>
<fret value="12" letter="1">Ď</fret>
<fret value="13" letter="1">ď</fret>
<fret value="14" letter="1">Đ</fret>
<fret value="15" letter="1">đ</fret>
<fret value="16" letter="1">Ē</fret>
<mark value="x">:</mark>
<mark value="ghost">Ā</mark>
<mark value="slash" number="1">Ė</mark>
<mark value="slash" number="2">ė</mark>
<mark value="slash" number="3">Ę</mark>
<mark value="slash" number="4">ę</mark>
<mark value="slash" number="5">Ě</mark>
</fretFont>
<fretFont>
<family>MScoreTabulature</family>
<displayName>MuseScore Dowland</displayName>
<defaultPitch>10</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<fret value="0" letter="0">0</fret>
<fret value="1" letter="0">1</fret>
<fret value="2" letter="0">2</fret>
<fret value="3" letter="0">3</fret>
<fret value="4" letter="0">4</fret>
<fret value="5" letter="0">5</fret>
<fret value="6" letter="0">6</fret>
<fret value="7" letter="0">7</fret>
<fret value="8" letter="0">8</fret>
<fret value="9" letter="0">9</fret>
<fret value="10" letter="0">:</fret>
<fret value="11" letter="0">11</fret>
<fret value="12" letter="0">12</fret>
<fret value="13" letter="0">13</fret>
<fret value="14" letter="0">14</fret>
<fret value="15" letter="0">15</fret>
<fret value="16" letter="0">16</fret>
<fret value="17" letter="0">17</fret>
<fret value="18" letter="0">18</fret>
<fret value="19" letter="0">19</fret>
<fret value="20" letter="0">20</fret>
<fret value="21" letter="0">21</fret>
<fret value="22" letter="0">22</fret>
<fret value="23" letter="0">23</fret>
<fret value="24" letter="0">24</fret>
<fret value="0" letter="1">š</fret>
<fret value="1" letter="1">Ţ</fret>
<fret value="2" letter="1">ţ</fret>
<fret value="3" letter="1">Ť</fret>
<fret value="4" letter="1">ť</fret>
<fret value="5" letter="1">Ŧ</fret>
<fret value="6" letter="1">ŧ</fret>
<fret value="7" letter="1">Ũ</fret>
<fret value="8" letter="1">ũ</fret>
<fret value="9" letter="1">Ū</fret>
<fret value="10" letter="1">ū</fret>
<fret value="11" letter="1">č</fret>
<fret value="12" letter="1">Ď</fret>
<fret value="13" letter="1">ď</fret>
<fret value="14" letter="1">Đ</fret>
<fret value="15" letter="1">đ</fret>
<fret value="16" letter="1">Ē</fret>
<mark value="x">:</mark>
<mark value="ghost">Ā</mark>
<mark value="slash" number="1">Ė</mark>
<mark value="slash" number="2">ė</mark>
<mark value="slash" number="3">Ę</mark>
<mark value="slash" number="4">ę</mark>
<mark value="slash" number="5">Ě</mark>
</fretFont>
<fretFont>
<family>MScoreTabulature</family>
<displayName>MuseScore Lute Didactic</displayName>
<defaultPitch>10</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<fret value="0" letter="0">0</fret>
<fret value="1" letter="0">1</fret>
<fret value="2" letter="0">2</fret>
<fret value="3" letter="0">3</fret>
<fret value="4" letter="0">4</fret>
<fret value="5" letter="0">5</fret>
<fret value="6" letter="0">6</fret>
<fret value="7" letter="0">7</fret>
<fret value="8" letter="0">8</fret>
<fret value="9" letter="0">9</fret>
<fret value="10" letter="0">:</fret>
<fret value="11" letter="0">11</fret>
<fret value="12" letter="0">12</fret>
<fret value="13" letter="0">13</fret>
<fret value="14" letter="0">14</fret>
<fret value="15" letter="0">15</fret>
<fret value="16" letter="0">16</fret>
<fret value="17" letter="0">17</fret>
<fret value="18" letter="0">18</fret>
<fret value="19" letter="0">19</fret>
<fret value="20" letter="0">20</fret>
<fret value="21" letter="0">21</fret>
<fret value="22" letter="0">22</fret>
<fret value="23" letter="0">23</fret>
<fret value="24" letter="0">24</fret>
<fret value="0" letter="1">ġ</fret>
<fret value="1" letter="1">Ģ</fret>
<fret value="2" letter="1">ģ</fret>
<fret value="3" letter="1">Ĥ</fret>
<fret value="4" letter="1">ĥ</fret>
<fret value="5" letter="1">Ħ</fret>
<fret value="6" letter="1">ħ</fret>
<fret value="7" letter="1">Ĩ</fret>
<fret value="8" letter="1">ĩ</fret>
<fret value="9" letter="1">ī</fret>
<fret value="10" letter="1">Ĭ</fret>
<fret value="11" letter="1">ĭ</fret>
<fret value="12" letter="1">Į</fret>
<fret value="13" letter="1">į</fret>
<fret value="14" letter="1">İ</fret>
<fret value="15" letter="1">ı</fret>
<fret value="16" letter="1">IJ</fret>
<mark value="x">:</mark>
<mark value="ghost">Ā</mark>
<mark value="slash" number="1">Ķ</mark>
<mark value="slash" number="2">ķ</mark>
<mark value="slash" number="3">ĸ</mark>
<mark value="slash" number="4">Ĺ</mark>
<mark value="slash" number="5">ĺ</mark>
</fretFont>

<durationFont>
<family>MScoreTabulature</family>
<displayName>MuseScore Tab Modern</displayName>
<defaultPitch>15</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<beamWidth>0.5</beamWidth>
<stemHeight>3</stemHeight>
<stemWidth>0.1</stemWidth>
<zeroBeamValue>semiminima</zeroBeamValue>
<duration value="longa">Ƞ</duration>
<duration value="brevis">ȡ</duration>
<duration value="semibrevis">Ȣ</duration>
Expand All @@ -225,6 +469,10 @@
<displayName>MuseScore Tab Italian</displayName>
<defaultPitch>15</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<beamWidth>0.15</beamWidth>
<stemHeight>1.75</stemHeight>
<stemWidth>0.15</stemWidth>
<zeroBeamValue>semibrevis</zeroBeamValue>
<duration value="longa">Ȁ</duration>
<duration value="brevis">ȁ</duration>
<duration value="semibrevis">Ȃ</duration>
Expand All @@ -243,6 +491,10 @@
<displayName>MuseScore Tab French</displayName>
<defaultPitch>15</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<beamWidth>0.30</beamWidth>
<stemHeight>3.125</stemHeight>
<stemWidth>0.21</stemWidth>
<zeroBeamValue>semiminima</zeroBeamValue>
<duration value="longa">Ȑ</duration>
<duration value="brevis">ȑ</duration>
<duration value="semibrevis">Ȓ</duration>
Expand All @@ -256,5 +508,41 @@
<duration value="256">Ț</duration>
<duration value="dot">Ȝ</duration>
</durationFont>
<durationFont>
<family>MScoreTabulature</family>
<displayName>MuseScore French Baroque (headless)</displayName>
<defaultPitch>15</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<duration value="longa">Ȱ</duration>
<duration value="brevis">ȱ</duration>
<duration value="semibrevis">Ȳ</duration>
<duration value="minima">ȳ</duration>
<duration value="semiminima">ȴ</duration>
<duration value="fusa">ȵ</duration>
<duration value="semifusa">ȶ</duration>
<duration value="32">ȷ</duration>
<duration value="64">ȸ</duration>
<duration value="128">ȹ</duration>
<duration value="256">Ⱥ</duration>
<duration value="dot">ȼ</duration>
</durationFont>
<durationFont>
<family>MScoreTabulature</family>
<displayName>MuseScore French Baroque</displayName>
<defaultPitch>15</defaultPitch>
<defaultYOffset>0</defaultYOffset>
<duration value="longa">ɀ</duration>
<duration value="brevis">Ɂ</duration>
<duration value="semibrevis">ɂ</duration>
<duration value="minima">Ƀ</duration>
<duration value="semiminima">Ʉ</duration>
<duration value="fusa">Ʌ</duration>
<duration value="semifusa">Ɇ</duration>
<duration value="32">ɇ</duration>
<duration value="64">Ɉ</duration>
<duration value="128">ɉ</duration>
<duration value="256">Ɋ</duration>
<duration value="dot">Ɍ</duration>
</durationFont>

</museScore>
Binary file modified fonts/mscoreTab.otf
View file
Binary file not shown.
Binary file modified fonts/mscoreTab.ttf
View file
Binary file not shown.

0 comments on commit 92ec3d3

Please sign in to comment.