X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tex%2Flilyponddefs.tex;h=7b5fbabcc88d48208f1cbfcbfdebe017bc971572;hb=9788f60c9ffae07c05386539b424fe1961d7075c;hp=08ad2b5190c718321312881761484bf337c65469;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 08ad2b5190..7b5fbabcc8 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -22,6 +22,11 @@ \ifundefined{LilyIdString} \def\LilyIdString{Lily was here} \fi +\ifundefined{documentclass} + \input lilypond-plaintex +\else + \input lilypond-latex +\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % macros to shorten other definitions @@ -55,113 +60,50 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % set fonts and primary dimensions % ugh + +\def\cmrtwenty{ + \font\smalltextfont=cmr8 + \font\textmusic=cmmi12 +} + +\def\cmrsixteen{ + \font\smalltextfont=cmr6 + \font\textmusic=cmmi10 + } +\def\cmrthirteen{ + \font\smalltextfont=cmr6 + \font\textmusic=cmmi9 + } +\def\cmreleven{ + \font\smalltextfont=cmr5 + \font\textmusic=cmmi8 + } + +%%%%%%% +% \def\musixtwentydefs{ - \twentyfonts - \musixcalc + \twentyfonts + \csname cmrtwenty\texsuffix\endcsname + \musixcalc } - \def\cmrtwenty{ - \font\smalltextfont=cmr8 - \font\meterfont=cmbx12 at 15pt - \font\textmusic=cmmi12 -% \font\musicmathfont=cmsy10 %%Not used?? /MB - \ifundefined{documentclass} - \font\normaltextfont=cmr10 %\textfont is a primitive - \font\italicfont=cmti10 scaled \magstep1 - \font\boldfont=cmbx10 - \font\largefont=cmbx12 - \font\typewriterfont=cmtt10 - %\font\Largefont=cmbx14 - \font\Largefont=cmbx12 scaled \magstep 2 - \font\hugefont=cmbx12 scaled \magstep 3 - \else -% \def\settext##1{{\normalfont\normalsize ##1}} - \def\settext##1{{\normalfont ##1}} - \def\setitalic##1{\textit{\normalsize ##1}} - \def\setbold##1{\textbf{\normalsize ##1}} - \def\settypewriter##1{\texttt{\normalsize ##1}} - \def\setlarge##1{\textbf{\large ##1}} - \def\setLarge##1{\textbf{\Large ##1}} - \def\sethuge##1{\textbf{\huge ##1}} - \fi - } - \def\cmrsixteen{ - \font\smalltextfont=cmr6 - \font\meterfont=cmbx12 - \font\textmusic=cmmi10 - \ifundefined{documentclass} - \font\normaltextfont=cmr8 %\textfont is a primitive - \font\italicfont=cmti9 - \font\boldfont=cmbx8 - \font\typewriterfont=cmtt9 - \font\largefont=cmbx10 - \font\Largefont=cmbx12 - \font\hugefont=cmbx12 scaled \magstep 2 - \else - \def\settext##1{{\normalfont\footnotesize ##1}} - \def\setitalic##1{\textit{\small ##1}} - \def\setbold##1{\textbf{\footnotesize ##1}} - \def\settypewriter##1{\texttt{\normalsize ##1}} - \def\setlarge##1{\textbf{\normalsize ##1}} - \def\setLarge##1{\textbf{\large ##1}} - \def\sethuge##1{\textbf{\Large ##1}} - \fi - } - \def\cmrthirteen{ - \font\smalltextfont=cmr6 - \font\meterfont=cmbx9 - \font\textmusic=cmmi9 - \ifundefined{documentclass} - \font\normaltextfont=cmr7 - \font\italicfont=cmti7 - \font\boldfont=cmbx7 - \font\largefont=cmbx9 - \font\typewriterfont=cmtt7 - \font\Largefont=cmbx10 - \font\hugefont=cmbx12 - \else - \def\settext##1{{\normalfont\scriptsize ##1}} - \def\setitalic##1{\textit{\scriptsize ##1}} - \def\setbold##1{\textbf{\scriptsize ##1}} - \def\setlarge##1{\textbf{\small ##1}} - \def\setLarge##1{\textbf{\normalsize ##1}} - \def\sethuge##1{\textbf{\large ##1}} - \fi - } - \def\cmreleven{ - \font\smalltextfont=cmr5 - \font\meterfont=cmbx8 - \font\textmusic=cmmi8 - \ifundefined{documentclass} - \font\normaltextfont=cmr6 - \font\italicfont=cmti6 - \font\boldfont=cmbx6 - \font\typewriterfont=cmtt6 - \font\largefont=cmbx8 - \font\Largefont=cmbx9 - \font\hugefont=cmbx10 - \else - \def\settext##1{{\normalfont\tiny ##1}} - \def\setitalic##1{\textit{\tiny ##1}} - \def\setbold##1{\textbf{\tiny ##1}} - \def\setlarge##1{\textbf{\footnotesize ##1}} - \def\setLarge##1{\textbf{\small ##1}} - \def\sethuge##1{\textbf{\normalsize ##1}} - \fi - } \def\musixsixteendefs{ \sixteenfonts + \csname cmrsixteen\texsuffix\endcsname \musixcalc -} + } \def\musixtwentysixdefs{ - \twentysixfonts - \musixcalc -} + \csname cmrtwentysix\texsuffix\endcsname + \twentysixfonts + \musixcalc + } \def\musixthirteendefs{ \thirteenfonts - \musixcalc + \csname cmrthirteen\texsuffix\endcsname + \musixcalc } \def\musixelevendefs{ + \csname cmreleven\texsuffix\endcsname \elevenfonts \musixcalc } @@ -171,15 +113,15 @@ \def\textflat{\raise.2ex\hbox{\textmusic\char"5B}} - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % do derivative calcs % this has to be synced with the font definition \def\musixcalc{ \staffheight=\mudelapaperbarsize pt - \interlinedist=\staffheight + + % ugh. Can extract ex dim from TFM + \interlinedist=\staffheight \divide\interlinedist by 4 \notewidth=\mudelapapernotewidth pt @@ -190,13 +132,9 @@ \stemthickness=\staffrulethickness } -% stacked numbers; may be overruled in fetdefs -\def\generalmeter#1#2{\vbox to 0pt{\vss\hbox{\meterfont - #1}\nointerlineskip - \hbox{\meterfont #2}\vss}} -% stacked horizontal lines +% stacked horizontal lines \def\interscoreline{\vskip 16pt} \def\setdynamic#1{\dynfont #1} \def\setfinger#1{\fingerfont #1} @@ -207,7 +145,9 @@ \def\columnerrormark{\placebox{-5pt}{0pt}{\bf C!}} \def\scorelineerrormark{\placebox{0pt}{-10pt}{\bf L!}} \def\errormark{{\bf E!}} -\def\unknown{{\bf u}} +\def\unknown{% + %{\bf u} %FIXME +} \input dyndefs \input fetdefs @@ -225,34 +165,10 @@ %compatibility %urg -\fetdef\repeatcolon{18} -\def\repeatbar{\repeatstopbar} -\def\startrepeat{\repeatstartbar} -\def\repeatbarstartrepeat{\repeatstopstart} - -\def\vruler#1{{% - \def\wid{\dimen0}% - \def\inc{\dimen1}% - \wid=#1pt - \inc=\wid - \divide\inc by #1 - \divide\wid by 2 - \here=-\wid - \loop\ifdim\here<\wid\advance\here by\inc - \hbox to0pt{\vbox to0pt{\vss\hrule width2pt height 0.05pt\kern\here}\hss}% - \repeat% -}} -\def\hruler#1#2{\hbox{% - \def\wid{\dimen0}% - \def\here{\dimen3}% - \wid=#1pt - \divide\wid by 2 - \here=-\wid - \loop\ifdim\here<\wid\advance\here by #2 - \hbox to0pt{\kern\here\vrule width0.05pt height 1pt depth 1pt\hss}% - \repeat% -}} - +\fetdef\repeatcolon{20} +\def\repeatbar#1{\repeatstopbar} +\def\startrepeat#1{\repeatstartbar} +\def\repeatbarstartrepeat#1{\repeatstopstart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % parametric symbols @@ -269,9 +185,6 @@ \def\fatdoublebar#1{\hbox{\phantom{\repeatcolon\kern2\smallspace}\thickbar{#1}\kern\smallspace\thickbar{#1}}} -\def\stem#1#2{\hbox{\kern -.5\stemthickness - \vrule width\stemthickness height#2 depth-#1}} - % ugh % see e.g. input/test/beam-pos.ly @@ -302,15 +215,6 @@ %\let\rulesym\tinyrulesym %\let\rulesym\openrulesym -\ifundefined{documentclass} - \def\settext#1{\normaltextfont #1} - \def\setitalic#1{\italicfont #1} - \def\setbold#1{\boldfont #1} - \def\settypewriter#1{\typewriterfont #1} - \def\setlarge#1{\largefont #1} - \def\setLarge#1{\Largefont #1} - \def\sethuge#1{\hugefont #1} -\fi % the interline symbol. Redefine to remove it. \def\defaultlineseparator{\vbox{\mussepline\vskip -5pt\mussepline}} \def\lineseparator{\defaultlineseparator} @@ -324,38 +228,24 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\postheader{} +% +% macros suck. \ifundefined{nolilyfooter} gives wierd errors from time +% to time. +% +% +% Warning: the order is conceptually weird. It says: - -\ifundefined{documentclass}% -% \ifundefined{nolilyfooter} -% Can't nest \ifundefined ?? - \footline={\ifnum\pageno=1\smalltextfont\mudelacopyright\hfil \LilyIdString - \else\hfil\the\pageno\hfil\fi}% - \advance\hoffset by -.6in - % \fi% +% if not defined (``nolilyfooter''): +% do_footer () +% else +% dont_do_footer () +% +\ifx\csname nolilyfooter\endcsname\relax + \message{[footer defined]}% + \csname lilyfooter\texsuffix\endcsname% \else -\let\nopagenumbers\relax - %% FIXME - \def\ps@plain{ - \renewcommand{\@oddhead}{}% - \renewcommand{\@evenfoot}{}% - \renewcommand{\@evenhead}{}% - \renewcommand{\@oddfoot}{% - \ifnum\thepage=1{\hfil \LilyIdString}% - \else{% - foo\hfil\the\pageno\hfil}% - \fi}} - \def\ps@empty{ - \renewcommand{\@oddhead}{}% - \renewcommand{\@evenfoot}{}% - \renewcommand{\@evenhead}{}% - \renewcommand{\@oddfoot}{% - \ifnum\thepage=1{\hfil \LilyIdString}% - \else{foo\hfil\the\pageno\hfil}% - \fi}}% + \message{[footer empty]} + \csname% + nolilyfooter\texsuffix\endcsname \fi -\nopagenumbers - -% debugging stuff: -% \vbox to 0pt{\vskip .5cm \hruler{48}{3pt}\vss}