patch::: 0.1.17.jcn2: biems

[lilypond.git] / tex / taupindefs.tex

diff --git a/tex/taupindefs.tex b/tex/taupindefs.tex
index bd08318c06a142311cca974f2c8c8612b97de17c..4a47f9dcc8fa925df13a113015969cbd97b457e3 100644 (file)
--- a/tex/taupindefs.tex
+++ b/tex/taupindefs.tex
@@ -1,8 +1,8 @@
-
+\input fetdefs
 \def\musixtwentyfonts{
         \font\normaltextfont=cmr10 %\textfont is a primitive
         \font\smalltextfont=cmr8
-        \font\meterfont=cmbx12
+        \font\meterfont=cmbx15
         \font\slurufont=xslu20
         \font\slurdfont=xsld20
         \font\slurhfont=xslz20
@@ -14,7 +14,7 @@
         \font\italicfont=cmti10
         \font\dynfont=dyn10 scaled \magstep2
         \font\musicmathfont=cmsy10
-        \font\fontentja=font-en-tja20
+        \fettwentydefs
 }
 
 
@@ -33,25 +33,16 @@
         \font\dynfont=dyn10 scaled \magstep1
         \font\musicdraw=musixsps
         \font\musicmathfont=cmsy8
-        \font\fontentja=font-en-tja16
+        \fetsixteendefs
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % provide interface to musixtex fonts 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \def\fetdef#1#2{\def#1{\fetchar{#2}}}
-% ugh, linewidth, ugh, tablexx.ly balldims not used!
-\def\fetdef#1#2{\def#1{\lower.5\staffrulethickness\hbox{\fetchar{#2}}}}
-\def\fetchar#1{\fontentja\char#1}
+% \musicdef\breveball{'040}
+% \musicdef\longaball{'047}
 % \musicdef\quartball{'007}
 % \musicdef\halfball{'010}
 % \musicdef\wholeball{'011}
-% \musicdef\breveball{'040}
-% \musicdef\longaball{'047}
-\fetdef\quartball{'002}
-\fetdef\halfball{'001}
-\fetdef\wholeball{'000}
-\fetdef\breveball{'003}
-\fetdef\longaball{'004}
 \musicdef\halfrest{'074}
 \musicdef\wholerest{'075}
 \musicdef\breverest{'072}
@@ -60,12 +51,12 @@
 %% hmm
 \musicdef\outsidehalfrest{10}
 \musicdef\outsidewholerest{11}
-\musicdef\quartrest{62}
-\musicdef\eighthrest{63}
-\musicdef\sixteenthrest{64}
-\musicdef\thirtysecondrest{65}
-\musicdef\sixtyfourthrest{66}
-\musicdef\hundredtwentyeighthrest{67}
+% \musicdef\quartrest{62}
+% \musicdef\eighthrest{63}
+% \musicdef\sixteenthrest{64}
+% \musicdef\thirtysecondrest{65}
+% \musicdef\sixtyfourthrest{66}
+% \musicdef\hundredtwentyeighthrest{67}
 \musicdef\sharp{52}
 \musicdef\flat{50}
 \musicdef\natural{54}
@@ -136,3 +127,11 @@
 \musicdef\downbow{22}
 
 \def\tr{{\it tr}}
+
+% \def\beamuslope#1#2{{\count0=#2\advance\count0 by#1
+%         \advance\count0 by 122
+%         \musicfnt\char\count0}}
+% \def\beamdslope#1#2{{\count0=#2\advance\count0 by#1
+%         \advance\count0 by 186
+%         \musicfnt\char\count0}}
+