X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=init%2Ftable16.ly;h=c7ca13d24652d4faf99b5fa4d8bdbc73a7d6285e;hb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;hp=c78d4be45a7bc8a74a9429648d6bbf4a1c1c3a9c;hpb=1e95a0be01466d1c98644f7705c8e07e41cc645c;p=lilypond.git

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"
 }