lilypond-0.1.12

diff --git a/tex/eglerdefs.tex b/tex/eglerdefs.tex
index ad2bf20aae3b142ff9b0b1834a84110de86eaa38..76a3e3156118024ee6cd39d67c8d42fb9242230d 100644 (file)
--- a/tex/eglerdefs.tex
+++ b/tex/eglerdefs.tex
@@ -4,7 +4,7 @@
 
 
 \def\musixtwentyfonts{
-  \font\textfont=cmr10
+  \font\normaltextfont=cmr10
         \font\meterfont=cmbx12
         \font\slurufont=oslu20
         \font\slurdfont=osld20
@@ -16,12 +16,12 @@
         \font\musicdraw=opussps
         \font\italicfont=cmti10
         \font\dynfont=cmbxti10 scaled \magstep1
-        \font\mathfont=cmsy10
+        \font\musicmathfont=cmsy10
 }
 
 
 \def\musixsixteenfonts{
-        \font\textfont=cmr8
+        \font\normaltextfont=cmr8
         \font\meterfont=cmbx12
         \font\italicfont=cmti8
         \font\slurufont=oslu16
@@ -33,52 +33,52 @@
         \font\musicfnt=opus16
         \font\dynfont=cmbxti12
         \font\musicdraw=opussps
-        \font\mathfont=cmsy8
+        \font\musicmathfont=cmsy8
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % provide interface to musixtex fonts 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\mdef\quartball{26}
-\mdef\halfball{27}
-\mdef\wholeball{28}
-\mdef\halfrest{13}
-\mdef\wholerest{12}
-\mdef\quartrest{14}
-\mdef\eighthrest{15}
-\mdef\sixteenthrest{16}
-\mdef\thirtysecondrest{17}
-\mdef\sixtyfourthrest{18}
-%\mdef\hundredtwentyeighthrest{67}
-\mdef\sharp{93}
-\mdef\flat{91}
-\mdef\natural{95}
-\mdef\sharpsharp{94}
-\mdef\flatflat{92}
+\musicdef\quartball{26}
+\musicdef\halfball{27}
+\musicdef\wholeball{28}
+\musicdef\halfrest{13}
+\musicdef\wholerest{12}
+\musicdef\quartrest{14}
+\musicdef\eighthrest{15}
+\musicdef\sixteenthrest{16}
+\musicdef\thirtysecondrest{17}
+\musicdef\sixtyfourthrest{18}
+%\musicdef\hundredtwentyeighthrest{67}
+\musicdef\sharp{93}
+\musicdef\flat{91}
+\musicdef\natural{95}
+\musicdef\sharpsharp{94}
+\musicdef\flatflat{92}
 
-\mdef\singledot{'00}
-\mdef\doubledot{'01}
-\mdef\tripledot{'02}
-\mdef\mussepline{155}
+\musicdef\singledot{'00}
+\musicdef\doubledot{'01}
+\musicdef\tripledot{'02}
+\musicdef\mussepline{155}
 
-\mdef\violinclef{65}
-\mdef\bassclef{67}
-\mdef\altoclef{69}
-\mdef\cviolinclef{66}
-\mdef\cbassclef{68}
-\mdef\caltoclef{70}
+\musicdef\violinclef{65}
+\musicdef\bassclef{67}
+\musicdef\altoclef{69}
+\musicdef\cviolinclef{66}
+\musicdef\cbassclef{68}
+\musicdef\caltoclef{70}
 
-\mdef\deighthflag{32}
-\mdef\dsixteenthflag{46}
-\mdef\dthirtysecondflag{47}
-\mdef\dsixtyfourthflag{48}
-\mdef\dhundredtwentyeighthflag{49}
+\musicdef\deighthflag{32}
+\musicdef\dsixteenthflag{46}
+\musicdef\dthirtysecondflag{47}
+\musicdef\dsixtyfourthflag{48}
+\musicdef\dhundredtwentyeighthflag{49}
 
 % pointing up
-\mdef\ueighthflag{40}
-\mdef\usixteenthflag{41}
-\mdef\uthirtysecondflag{42}
-\mdef\usixtyfourthflag{43}
-\mdef\uhundredtwentyeighthflag{44}
+\musicdef\ueighthflag{40}
+\musicdef\usixteenthflag{41}
+\musicdef\uthirtysecondflag{42}
+\musicdef\usixtyfourthflag{43}
+\musicdef\uhundredtwentyeighthflag{44}
 
 \maccentdef\repeatcolon{55}{2/1}
 \def\eighthflag{\topalign{\ueighthflag}}
@@ -112,7 +112,7 @@
 \maccentdef\fermata{80}{-1/1}
 \maccentdef\ifermata{81}{1/1}
 
-\mdef\spicato{28}
-\mdef\ispicato{29}
-\mdef\upbow{23}
-\mdef\downbow{22}
+\musicdef\spicato{28}
+\musicdef\ispicato{29}
+\musicdef\upbow{23}
+\musicdef\downbow{22}

diff --git a/tex/taupindefs.tex b/tex/taupindefs.tex
index d671a2a27a80697c576abe435e0767ec81fcc2c0..dd13f537c13d320ab1e49ee1866792b5091ad3ac 100644 (file)
--- a/tex/taupindefs.tex
+++ b/tex/taupindefs.tex
@@ -1,6 +1,7 @@
 
 \def\musixtwentyfonts{
-  \font\textfont=cmr10
+        \font\normaltextfont=cmr10 %\textfont is a primitive
+        \font\smalltextfont=cmr8
         \font\meterfont=cmbx12
         \font\slurufont=xslu20
         \font\slurdfont=xsld20
@@ -12,12 +13,13 @@
         \font\musicdraw=musixsps
         \font\italicfont=cmti10
         \font\dynfont=cmbxti10 scaled \magstep1
-        \font\mathfont=cmsy10
+        \font\musicmathfont=cmsy10
 }
 
 
 \def\musixsixteenfonts{
-        \font\textfont=cmr8
+        \font\normaltextfont=cmr8 %\textfont is a primitive
+        \font\smalltextfont=cmr6
         \font\meterfont=cmbx12
         \font\italicfont=cmti8
         \font\slurufont=xslu16
@@ -29,57 +31,57 @@
         \font\musicfnt=musix16
         \font\dynfont=cmbxti10
         \font\musicdraw=musixsps
-        \font\mathfont=cmsy8
+        \font\musicmathfont=cmsy8
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % provide interface to musixtex fonts 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\mdef\quartball{'007}
-\mdef\halfball{'010}
-\mdef\wholeball{'011}
-\mdef\breveball{'040}
-\mdef\halfrest{'074}
-\mdef\wholerest{'075}
-\mdef\breverest{'072}
+\musicdef\quartball{'007}
+\musicdef\halfball{'010}
+\musicdef\wholeball{'011}
+\musicdef\breveball{'040}
+\musicdef\halfrest{'074}
+\musicdef\wholerest{'075}
+\musicdef\breverest{'072}
 %% hmm
-\mdef\outsidehalfrest{10}
-\mdef\outsidewholerest{11}
-\mdef\quartrest{62}
-\mdef\eighthrest{63}
-\mdef\sixteenthrest{64}
-\mdef\thirtysecondrest{65}
-\mdef\sixtyfourthrest{66}
-\mdef\hundredtwentyeighthrest{67}
-\mdef\sharp{52}
-\mdef\flat{50}
-\mdef\natural{54}
-\mdef\sharpsharp{53}
-\mdef\flatflat{51}
+\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\sharp{52}
+\musicdef\flat{50}
+\musicdef\natural{54}
+\musicdef\sharpsharp{53}
+\musicdef\flatflat{51}
 
-\mdef\singledot{'00}
-\mdef\doubledot{'01}
-\mdef\tripledot{'02}
-\mdef\mussepline{155}
+\musicdef\singledot{'00}
+\musicdef\doubledot{'01}
+\musicdef\tripledot{'02}
+\musicdef\mussepline{155}
 
-\mdef\violinclef{71}
-\mdef\bassclef{73}
-\mdef\altoclef{75}
-\mdef\cviolinclef{72}
-\mdef\cbassclef{74}
-\mdef\caltoclef{76}
+\musicdef\violinclef{71}
+\musicdef\bassclef{73}
+\musicdef\altoclef{75}
+\musicdef\cviolinclef{72}
+\musicdef\cbassclef{74}
+\musicdef\caltoclef{76}
 
-\mdef\deighthflag{45}
-\mdef\dsixteenthflag{46}
-\mdef\dthirtysecondflag{47}
-\mdef\dsixtyfourthflag{48}
-\mdef\dhundredtwentyeighthflag{49}
+\musicdef\deighthflag{45}
+\musicdef\dsixteenthflag{46}
+\musicdef\dthirtysecondflag{47}
+\musicdef\dsixtyfourthflag{48}
+\musicdef\dhundredtwentyeighthflag{49}
 
 % pointing up
-\mdef\ueighthflag{40}
-\mdef\usixteenthflag{41}
-\mdef\uthirtysecondflag{42}
-\mdef\usixtyfourthflag{43}
-\mdef\uhundredtwentyeighthflag{44}
+\musicdef\ueighthflag{40}
+\musicdef\usixteenthflag{41}
+\musicdef\uthirtysecondflag{42}
+\musicdef\usixtyfourthflag{43}
+\musicdef\uhundredtwentyeighthflag{44}
 
 \maccentdef\repeatcolon{55}{2/1}
 \def\eighthflag{\topalign{\ueighthflag}}
@@ -99,7 +101,7 @@
 \def\ldoubledot{\kern-\notewidth\doubledot}
 \def\ltripledot{\kern-\notewidth\tripledot}
 
-\mdef\turn{67}
+\musicdef\turn{67}
 \maccentdef\sforzato{30}{-3/2}
 \maccentdef\marcato{20}{-1/1}
 \maccentdef\imarcato{21}{1/1}
@@ -114,9 +116,9 @@
 \maccentdef\fermata{80}{-1/1}
 \maccentdef\ifermata{81}{1/1}
 
-\mdef\spicato{28}
-\mdef\ispicato{29}
-\mdef\upbow{23}
-\mdef\downbow{22}
+\musicdef\spicato{28}
+\musicdef\ispicato{29}
+\musicdef\upbow{23}
+\musicdef\downbow{22}
 
 \def\tr{{\it tr}}