X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tex%2Flilyponddefs.tex;h=67cfd2e3bfdb8245d043d642e6e1ed83bb3ac6c5;hb=c3e003dacb5689ffe384d3a2f2d5dc2afb9439bb;hp=4e3b74bc83017fa269b695bd86001f38c988b7f2;hpb=460999e232e2126654185e5f5675f72cea495b13;p=lilypond.git diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 4e3b74bc83..67cfd2e3bf 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -2,10 +2,12 @@ %% include file for LilyPond %% %% this file defines various macros to accomodate lilypond output - +%% +%% let's not make par before endinput +% % TeXbook ex 7.7 \def\ifundefined#1{\expandafter\ifx\csname#1\endcsname\relax} - +% % skip if included already \def\SkipLilydefs{\endinput} \ifundefined{EndLilyPondOutput} @@ -13,7 +15,7 @@ \def\SkipLilydefs{} \fi \SkipLilydefs - +% \ifundefined{mudelacopyright} \def\mudelacopyright{\copyright\ \number\year} \fi @@ -51,10 +53,9 @@ \parindent=0pt \newdimen\smallspace \newdimen\interlinedist -\newdimen\ledgerlinethickness \newdimen\stemthickness \newcount\n -\newdimen\balkheight +\newdimen\staffheight \newdimen\notewidth \newdimen\noteheight \newdimen\staffrulethickness @@ -65,26 +66,64 @@ % set fonts and primary dimensions % ugh \def\musixtwentydefs{ - \balkheight=20pt - \notewidth=7.15pt - \noteheight=5pt - \musixtwentyfonts - \font\textmusic=cmmi12 + \twentyfonts \musixcalc } -\def\musixsixteendefs{ - \balkheight=16pt - \notewidth=5.93pt - \noteheight=4pt - \musixsixteenfonts +\def\cmrtwenty{ + \font\meterfont=cmbx15 + \font\italicfont=cmti10 scaled \magstep1 + \font\musicmathfont=cmsy10 + \font\normaltextfont=cmr10 %\textfont is a primitive + \font\smalltextfont=cmr8 + \font\boldfont=cmbx10 + \font\textmusic=cmmi12 +} +\def\cmrsixteen{ + \font\smalltextfont=cmr6 + \font\normaltextfont=cmr8 %\textfont is a primitive + \font\meterfont=cmbx12 + \font\italicfont=cmti9 \font\textmusic=cmmi10 + \font\boldfont=cmbx8 +} +\def\cmreleven{ + \font\smalltextfont=cmr5 + \font\normaltextfont=cmr6 + \font\meterfont=cmbx8 + \font\italicfont=cmti6 + \font\textmusic=cmmi8 + \font\boldfont=cmbx6 +} + +\def\cmrthirteen{ + \font\smalltextfont=cmr6 + \font\normaltextfont=cmr7 + \font\meterfont=cmbx9 + \font\italicfont=cmti7 + \font\textmusic=cmmi9 + \font\boldfont=cmbx7 +} +\def\musixsixteendefs{ + \sixteenfonts + \musixcalc +} +\def\musixtwentysixdefs{ + \twentysixfonts + \musixcalc +} +\def\musixthirteendefs{ + \thirteenfonts + \musixcalc +} +\def\musixelevendefs{ + \elevendefs \musixcalc } \def\textsharp{\raise.4ex\hbox{\textmusic\char"5D}} \def\textnatural{\raise.4ex\hbox{\textmusic\char"5C}} -\def\textflat{\raise.2ex\hbox{\mus\char"5B}} +\def\textflat{\raise.2ex\hbox{\textmusic\char"5B}} @@ -92,61 +131,42 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % do derivative calcs -% FIXME: should read from TFM/AFM/fetalog -% - % this has to be synced with the font definition \def\musixcalc{ - \interlinedist=\fontdimen5\musicfnt + \staffheight=\mudelapaperbarsize pt + \interlinedist=\staffheight + \divide\interlinedist by 4 + \notewidth=\mudelapapernotewidth pt + \smallspace=.3\interlinedist - \interstaffrule=\balkheight + \interstaffrule=\staffheight \divide\interstaffrule by 4 - - % [D.K.Roush & J.S.Gourlay] say this should be 0.072 - % We know better - \staffrulethickness=0.1\interlinedist + \staffrulethickness=\mudelapaperrulethickness pt \stemthickness=\staffrulethickness - \ledgerlinethickness=2\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 \input dyndefs +\input fetdefs -\input taupindefs +%\input taupindefs %\input eglerdefs -\musicmathdef\cup{91} % \cup -\musicmathdef\wedge{94} % \wedge -\musicmathdef\striepke{0} % heu? - -%% custom characters --- this should go: add to (meta!) font -% \def\myheel{\kern-.5ex\vbox{\cup}\kern-.5ex} -% \def\mytoe{\kern-.5ex\vbox{\wedge}\kern-.5ex} -\def\myheel{\vbox{\cup}} -\def\mytoe{\vbox{\wedge}} -% \def\mystriepke{\kern-1.1ex\vbox{\hbox{\kern-.05em\striepke}}\kern-1.1ex} -\def\mystriepke{\kern-1.8ex\vbox{\hbox{\kern-.05em\striepke}}\kern-1.8ex} - -\def\heel{\vbox{\myheel}} -\def\toe{\vbox{\mytoe}} -\def\backorfront{\mystriepke} - -\def\bheel{\vbox{\myheel\mystriepke}} -\def\btoe{\vbox{\mytoe\mystriepke}} -\def\fheel{\vbox{\mystriepke\myheel}} -\def\ftoe{\vbox{\mystriepke\mytoe}} -\def\heeltoe{\vbox{\myheel\mytoe}} -\def\toeheel{\vbox{\mytoe\myheel}} -%% \def\emptybar{} -\def\defaultthinbar{\thinbar{\balkheight}} -\def\defaultthickbar{\thickbar{\balkheight}} +\def\defaultthinbar{\thinbar{\staffheight}} +\def\defaultthickbar{\thickbar{\staffheight}} %? what-s wrong with rightalign? \def\repeatstopbar{\hss\rightalign{\repeatcolon\hskip2\smallspace\defaultthinbar\hskip\smallspace\defaultthickbar}} \def\repeatstartbar{\hbox{\defaultthickbar\kern\smallspace\defaultthinbar\kern2\smallspace\repeatcolon}} -\def\repeatstopstart{\hbox{\repeatcolon\kern2\smallspace\defaultthinbar\kern\smallspace\defaultthickbar\kern\smallspace\defaultthickbar\kern\smallspace\defaultthinbar\kern2\smallspace\repeatcolon}} +\def\repeatstopstart{\hbox{\repeatcolon\kern2\smallspace\defaultthickbar\kern\smallspace\defaultthickbar\kern2\smallspace\repeatcolon}} %compatibility \def\repeatbar{\repeatstopbar} @@ -182,49 +202,14 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\doublebar#1{\hbox{\thinbar{#1}\hskip\smallspace\thinbar{#1}}} -\def\thinbar#1{\vrule height #1 width 1.6\staffrulethickness} % TODO parametric. -\def\thickbar#1{\vrule height #1 width 2\smallspace} +\def\thinbar#1{\dimen0=#1% + \vrule height .5\dimen0 depth .5\dimen0 width 1.6\staffrulethickness} % TODO parametric. +\def\thickbar#1{\dimen0=#1% + \vrule height .5\dimen0 depth .5\dimen0 width 2\smallspace} \def\maatstreep#1{\thinbar{#1}} \def\startbar#1{\leftalign{\thickbar{#1}\kern\smallspace\thinbar{#1}}} \def\finishbar#1{\rightalign{\thinbar{#1}\kern\smallspace\thickbar{#1}}} -\def\pianobrace#1{{\musicdraw\char#1}} -\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}} -% stacked numbers -\def\generalmeter#1#2{\vbox to 0pt{\vss\hbox{\meterfont - #1}\nointerlineskip - \hbox{\meterfont #2}\vss}} - -% stacked horizontal lines -\def\lines#1#2#3{% - \vbox{\kern-\interstaffrule - \n=0\nointerlineskip% - \loop\ifnum\n<#1\advance\n by1% - \kern\interstaffrule - \nointerlineskip - \vbox to 0pt{\hrule height .5#3 depth .5#3 width#2% - \vss}\nointerlineskip - \repeat - }} - -%% -% Ugh. Need to redo this. Wish we had PS. -% -\def\topledgerlines#1#2{\dist#1 - \topalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{\ledgerlinethickness}}}} - -\def\botledgerlines#1#2{\dist#1 - \botalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{\ledgerlinethickness}}}} - -% -% a staffsymbol with #1 lines, width #2 -% bottom at baseline -\def\linestafsym#1#2{\leftalign{\botalign{\lines{#1}{#2}{\staffrulethickness}}}} \def\stem#1#2{\hbox{\kern -.5\stemthickness \vrule width\stemthickness height#2 depth-#1}} @@ -234,13 +219,13 @@ } -\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} -\def\rulesym#1#2{\vrule height #1 width #2} +\def\rulesym#1#2{\dimen0=#1% + \vrule height .5\dimen0 depth .5\dimen0 width #2} \def\settext#1{\normaltextfont #1} \def\setitalic#1{\italicfont #1} +\def\setbold#1{\boldfont #1} \def\setdynamic#1{\dynfont #1} +\def\setfinger#1{\fingerfont #1} % the interline symbol. Redefine to remove it. \def\defaultlineseparator{\vbox{\mussepline\vskip -5pt\mussepline}}