From: fred <fred>
Date: Sun, 24 Mar 2002 20:13:04 +0000 (+0000)
Subject: lilypond-1.0.1
X-Git-Tag: release/1.5.59~3022
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dced1bec7b5b9f70fa314476affaa93b09f9edf0;p=lilypond.git
lilypond-1.0.1
---
diff --git a/init/table16.ly b/init/table16.ly
index c78d4be45a..c7ca13d246 100644
--- a/init/table16.ly
+++ b/init/table16.ly
@@ -7,79 +7,73 @@
table_sixteen=
\symboltables {
- \texid "\input lilyponddefs \musixsixteendefs"
+ \font "feta16.afm"
+
% index TeXstring, xmin xmax ymin ymax
"style" = \table {
- "bold" "\setbold{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt
- "dynamic" "\setdynamic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt
- "finger" "\setfinger{%}" 0.0\pt 0.0\pt 0.0\pt 4.0\pt
- "italic" "\setitalic{%}" 0.0\pt 4.\pt 0.0\pt 8.0\pt
- "large" "\setlarge{%}" 0.0\pt 9.50\pt 0.0\pt 10.0\pt
- "number" "\setnumber{%}" 0.0\pt 6.0\pt 0.0\pt 8.0\pt
- "roman" "\settext{%}" 0.0\pt 4.0\pt 0.0\pt 8.0\pt
+ "bold" "\\setbold{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt
+ "dynamic" "\\setdynamic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt
+ "finger" "\\setfinger{%}" 0.0\pt 2.0\pt 0.0\pt 4.0\pt
+ "italic" "\\setitalic{%}" 0.0\pt 4.\pt 0.0\pt 8.0\pt
+ "typewriter" "\\settypewriter{%}" 0.0\pt 4.\pt 0.0\pt 8.0\pt
+ "large" "\\setlarge{%}" 0.0\pt 9.50\pt 0.0\pt 10.0\pt
+ "number" "\\setnumber{%}" 0.0\pt 6.0\pt 0.0\pt 8.0\pt
+ "roman" "\\settext{%}" 0.0\pt 4.5\pt 0.0\pt 8.0\pt
}
"dynamics" = \table {
- "mf" "\dynmf"
- "fff" "\dynfff"
- "ff" "\dynff"
- "f" "\dynf"
- "mp" "\dynmp"
- "p" "\dynp"
- "pp" "\dynpp"
- "ppp" "\dynppp"
- "fp" "\dynfp"
- "sf" "\dynsf"
- "sfz" "\dynsfz"
+ "mf" "\\dynmf"
+ "fff" "\\dynfff"
+ "ff" "\\dynff"
+ "f" "\\dynf"
+ "mp" "\\dynmp"
+ "p" "\\dynp"
+ "pp" "\\dynpp"
+ "ppp" "\\dynppp"
+ "fp" "\\dynfp"
+ "sf" "\\dynsf"
+ "sfz" "\\dynsfz"
}
"align" = \table {
- "-1" "\leftalign{%}"
- "0" "\centeralign{%}"
- "1" "\rightalign{%}"
+ "-1" "\\leftalign{%}"
+ "0" "\\centeralign{%}"
+ "1" "\\rightalign{%}"
}
- "slur" = \table {
- "whole" "\slurchar%{%}"
- "half" "\hslurchar%{%}"
- }
"bars" = \table {
- "empty" "\emptybar"
+ "empty" "\\emptybar"
"" "" 0.0\pt 0.0\pt 0.0\pt 16.0\pt
- "|" "\maatstreep{%}" 0.0\pt 0.64\pt 0.0\pt 16.0\pt
- "||" "\doublebar{%}" 0.0\pt 4.0\pt 0.0\pt 16.0\pt
- "|." "\finishbar{%}" -4.0\pt 0.0\pt 0.0\pt 16.0\pt
- ".|" "\startbar{%}" 0.0\pt 4.0\pt 0.0\pt 16.0\pt
- ":|" "\repeatbar" -8.0\pt 0.0\pt 0.0\pt 16.0\pt
- "|:" "\startrepeat" 0.0\pt 8.0\pt 0.0\pt 16.0\pt
- ":|:" "\repeatbarstartrepeat" 0.0\pt 16.0\pt 0.0\pt 16.0\pt
+ "|" "\\maatstreep{%}" 0.0\pt 0.64\pt 0.0\pt 16.0\pt
+ "||" "\\doublebar{%}" 0.0\pt 4.0\pt 0.0\pt 16.0\pt
+ "|." "\\finishbar{%}" -4.0\pt 0.0\pt 0.0\pt 16.0\pt
+ ".|" "\\startbar{%}" 0.0\pt 4.0\pt 0.0\pt 16.0\pt
+ ".|." "\\fatdoublebar{%}" 0.0\pt 10.0\pt 0.0\pt 20.0\pt
+ ":|" "\\repeatbar" -8.0\pt 0.0\pt 0.0\pt 16.0\pt
+ "|:" "\\startrepeat" 0.0\pt 8.0\pt 0.0\pt 16.0\pt
+ ":|:" "\\repeatbarstartrepeat" 0.0\pt 16.0\pt 0.0\pt 16.0\pt
}
"meters" = \table {
- "C" "\fourfourmeter" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
- "C2" "\allabreve" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
+ "C" "\\fourfourmeter" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
+ "C2" "\\allabreve" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
}
% dims ignored for this table
"param" = \table {
-% "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt
- "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 32.0\pt 80.0\pt
- "bracket" "\staffbracket{%}" 0.0\pt 4.0\pt 16.0\pt 128.0\pt
- "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -8.0\pt 8.0\pt
- "rule" "\rulesym{%}{%}"
- "stem" "\stem{%}{%}"
- "fill" "\hbox{}"
- % ugh. 8pt
- "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -5.0\pt 5.0\pt
- "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -5.0\pt 5.0\pt
+ "brace" "\\pianobrace{%}" 0.0\pt 0.0\pt 32.0\pt 80.0\pt
+ "bracket" "\\staffbracket{%}" 0.0\pt 4.0\pt 16.0\pt 128.0\pt
+ "time_signature" "\\generalmeter{%}{%}" 0.0\pt 10.0\pt -8.0\pt 8.0\pt
+ "rule" "\\rulesym{%}{%}"
+ "stem" "\\stem{%}{%}"
+ "fill" "\\hbox{}"
}
"beamslopes" = \table {
- "slope" "\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt
- "horizontal" "\rulesym{%}{%}"
+ "slope" "\\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt
+ "horizontal" "\\rulesym{%}{%}"
}
- \include "feta16.ly"
}
diff --git a/init/table20.ly b/init/table20.ly
index 0ee27d15b3..483c775ef2 100644
--- a/init/table20.ly
+++ b/init/table20.ly
@@ -7,84 +7,77 @@
table_twenty =
\symboltables {
- \texid "\input lilyponddefs \musixtwentydefs"
+ \font "feta20.afm"
% index TeXstring, xmin xmax ymin ymax
"style" = \table {
- "bold" "\setbold{%}" 0.0\pt 5.50\pt 0.0\pt 8.0\pt
- "dynamic" "\setdynamic{%}" 0.0\pt 0.0\pt 0.0\pt 10.0\pt
- "finger" "\setfinger{%}" 0.0\pt 0.0\pt 0.0\pt 5.0\pt
- "italic" "\setitalic{%}" 0.0\pt 5.5\pt 0.0\pt 10.0\pt
- "large" "\setlarge{%}" 0.0\pt 6.50\pt 0.0\pt 12.0\pt
- "number" "\setnumber{%}" 0.0\pt 8.0\pt 0.0\pt 10.0\pt
- "roman" "\settext{%}" 0.0\pt 5.0\pt 0.0\pt 10.0\pt
+ "bold" "\\setbold{%}" 0.0\pt 5.50\pt 0.0\pt 8.0\pt
+ "dynamic" "\\setdynamic{%}" 0.0\pt 0.0\pt 0.0\pt 10.0\pt
+ "finger" "\\setfinger{%}" 0.0\pt 4.5\pt 0.0\pt 5.0\pt
+ "typewriter" "\\settypewriter{%}" 0.0\pt 5.5\pt 0.0\pt 10.0\pt
+ "italic" "\\setitalic{%}" 0.0\pt 5.5\pt 0.0\pt 10.0\pt
+ "large" "\\setlarge{%}" 0.0\pt 6.50\pt 0.0\pt 12.0\pt
+ "Large" "\\setLarge{%}" 0.0\pt 6.50\pt 0.0\pt 12.0\pt
+ "mark" "\\setmark{%}" 0.0\pt 6.50\pt 0.0\pt 12.0\pt
+ "number" "\\setnumber{%}" 0.0\pt 8.0\pt 0.0\pt 10.0\pt
+ "roman" "\\settext{%}" 0.0\pt 5.6\pt 0.0\pt 10.0\pt
}
"dynamics" = \table {
- "mf" "\dynmf"
- "fff" "\dynfff"
- "ff" "\dynff"
- "f" "\dynf"
- "mp" "\dynmp"
- "p" "\dynp"
- "pp" "\dynpp"
- "ppp" "\dynppp"
- "fp" "\dynfp"
- "sf" "\dynsf"
- "sfz" "\dynsfz"
+ "mf" "\\dynmf"
+ "fff" "\\dynfff"
+ "ff" "\\dynff"
+ "f" "\\dynf"
+ "mp" "\\dynmp"
+ "p" "\\dynp"
+ "pp" "\\dynpp"
+ "ppp" "\\dynppp"
+ "fp" "\\dynfp"
+ "sf" "\\dynsf"
+ "sfz" "\\dynsfz"
}
"align" = \table {
- "-1" "\leftalign{%}"
- "0" "\centeralign{%}"
- "1" "\rightalign{%}"
+ "-1" "\\leftalign{%}"
+ "0" "\\centeralign{%}"
+ "1" "\\rightalign{%}"
}
- "slur" = \table {
- "whole" "\slurchar%{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt
- "half" "\hslurchar%{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt
- }
-
"bars" = \table {
- "empty" "\emptybar"
+ "empty" "\\emptybar"
"" "" 0.0\pt 0.0\pt 0.0\pt 16.0\pt
- "|" "\maatstreep{%}" 0.0\pt 0.64\pt 0.0\pt 20.0\pt
- "||" "\doublebar{%}" 0.0\pt 5.0\pt 0.0\pt 20.0\pt
- "|." "\finishbar{%}" -5.0\pt 0.0\pt 0.0\pt 20.0\pt
- ".|" "\startbar{%}" 0.0\pt 4.0\pt 0.0\pt 20.0\pt
- ":|" "\repeatbar" -10.0\pt 0.0\pt 0.0\pt 20.0\pt
- "|:" "\startrepeat" 0.0\pt 10.0\pt 0.0\pt 20.0\pt
- ":|:" "\repeatbarstartrepeat" 0.0\pt 20.0\pt 0.0\pt 20.0\pt
+ "|" "\\maatstreep{%}" 0.0\pt 0.64\pt 0.0\pt 20.0\pt
+ "||" "\\doublebar{%}" 0.0\pt 5.0\pt 0.0\pt 20.0\pt
+ "|." "\\finishbar{%}" -5.0\pt 0.0\pt 0.0\pt 20.0\pt
+ ".|" "\\startbar{%}" 0.0\pt 4.0\pt 0.0\pt 20.0\pt
+ ".|." "\\fatdoublebar{%}" 0.0\pt 10.0\pt 0.0\pt 20.0\pt
+ ":|" "\\repeatbar" -10.0\pt 0.0\pt 0.0\pt 20.0\pt
+ "|:" "\\startrepeat" 0.0\pt 10.0\pt 0.0\pt 20.0\pt
+ ":|:" "\\repeatbarstartrepeat" 0.0\pt 20.0\pt 0.0\pt 20.0\pt
}
"meters" = \table {
- "C" "\fourfourmeter" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
- "C2" "\allabreve" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
+ "C" "\\fourfourmeter" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
+ "C2" "\\allabreve" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
}
% dims ignored for this table
"param" = \table {
-% "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt
- "bracket" "\staffbracket{%}" 0.0\pt 0.0\pt 20.0\pt 160.0\pt
- "rule" "\rulesym{%}{%}"
- "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 40.0\pt 100.0\pt
- "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
- "stem" "\stem{%}{%}"
- "fill" "\hbox{}"
- % ugh. 8\pt
- "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -6.25\pt 6.25\pt
- "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -6.25\pt 6.25\pt
+ "bracket" "\\staffbracket{%}" 0.0\pt 0.0\pt 20.0\pt 160.0\pt
+ "rule" "\\rulesym{%}{%}"
+ "brace" "\\pianobrace{%}" 0.0\pt 0.0\pt 40.0\pt 100.0\pt
+ "time_signature" "\\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt
+ "stem" "\\stem{%}{%}"
+ "fill" "\\hbox{}"
}
"beamslopes" = \table {
- "slope" "\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt
- "horizontal" "\rulesym{%}{%}"
+ "slope" "\\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt
+ "horizontal" "\\rulesym{%}{%}"
}
- % ugh what's our outdir called?
- \include "feta20.ly"
}