partial: 0.1.59.jcn

[lilypond.git] / tex / taupindefs.tex

diff --git a/tex/taupindefs.tex b/tex/taupindefs.tex
index 4a47f9dcc8fa925df13a113015969cbd97b457e3..3c5921c4f161009b87189d29d99bafaee85bae2f 100644 (file)
--- a/tex/taupindefs.tex
+++ b/tex/taupindefs.tex
@@ -1,8 +1,5 @@
-\input fetdefs
 \def\musixtwentyfonts{
-        \font\normaltextfont=cmr10 %\textfont is a primitive
-        \font\smalltextfont=cmr8
-        \font\meterfont=cmbx15
+        \font\dynfont=cmbxti10 scaled \magstep2
         \font\slurufont=xslu20
         \font\slurdfont=xsld20
         \font\slurhfont=xslz20
@@ -11,9 +8,6 @@
         \font\hslurhfont=xslhz20
         \font\musicfnt=musix20
         \font\musicdraw=musixsps
-        \font\italicfont=cmti10
-        \font\dynfont=dyn10 scaled \magstep2
-        \font\musicmathfont=cmsy10
         \fettwentydefs
 }
 
@@ -21,8 +15,6 @@
 \def\musixsixteenfonts{
         \font\normaltextfont=cmr8 %\textfont is a primitive
         \font\smalltextfont=cmr6
-        \font\meterfont=cmbx12
-        \font\italicfont=cmti8
         \font\slurufont=xslu16
         \font\slurdfont=xsld16
         \font\slurhfont=xslz20 % sigh
@@ -30,7 +22,7 @@
         \font\hslurdfont=xslhd16
         \font\hslurhfont=xslhz20
         \font\musicfnt=musix16
-        \font\dynfont=dyn10 scaled \magstep1
+        \font\dynfont=cmbxti10 scaled \magstep1
         \font\musicdraw=musixsps
         \font\musicmathfont=cmsy8
         \fetsixteendefs
@@ -127,6 +119,7 @@
 \musicdef\downbow{22}
 
 \def\tr{{\it tr}}
+\def\pianobrace#1{{\musicdraw\char#1}}
 
 % \def\beamuslope#1#2{{\count0=#2\advance\count0 by#1
 %         \advance\count0 by 122
@@ -135,3 +128,18 @@
 %         \advance\count0 by 186
 %         \musicfnt\char\count0}}
 
+
+
+\def\beamslope#1#2{{\count0=#2\advance\count0 by#1
+        \advance\count0by128
+        {\vetfont\char\count0}}}
+
+\def\slurcharh#1{{\slurhfont\char#1}}
+\def\slurcharu#1{{\slurufont\char#1}}
+\def\slurchard#1{{\slurdfont\char#1}}
+\def\hslurcharh#1{{\hslurhfont\char#1}}
+\def\hslurcharu#1{{\hslurufont\char#1}}
+\def\hslurchard#1{{\hslurdfont\char#1}}
+\def\brace#1{\count0=148\advance\count0 by #1\musicdraw\char\count0}
+\def\crescendosym#1{\count0=84\advance\count0 by #1\musicdraw\char\count0}
+\def\decrescendosym#1{\count0=116\advance\count0 by #1\musicdraw\char\count0}