X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tex%2Flilyponddefs.tex;h=5cc6d4ffcf95e3b7b6172efe765fad235816cfaa;hb=377bdb36c4f09fb20a1c55b0358cc5d0714eb85e;hp=41b37ec2e8ce4fa729f6bc32b0e9310cbd07166e;hpb=d954259e38ae122745d17f36d4748349852e9aca;p=lilypond.git

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 41b37ec2e8..5cc6d4ffcf 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -1,252 +1,205 @@
-%%
-%% include file for LilyPond
-%%
-%% this file defines various macros to accomodate lilypond output
-%% 
-%% let's not make par before endinput
+% lilyponddefs.tex
 %
-% TeXbook ex 7.7
-\def\ifundefined#1{\expandafter\ifx\csname#1\endcsname\relax}
+% Include file for LilyPond.
 %
-% skip if included already
-\def\SkipLilydefs{\endinput}
-\ifundefined{EndLilyPondOutput}
-        \def\EndLilyPondOutput{\csname bye\endcsname}
-        \def\SkipLilydefs{}
-\fi
-\SkipLilydefs
+% This file defines various macros to acommodate lilypond output.
 %
-\ifundefined{mudelacopyright}
-        \def\mudelacopyright{\copyright\ \number\year}
-\fi
-\ifundefined{LilyIdString}
-        \def\LilyIdString{Lily was here}
-\fi
-\ifundefined{documentclass}
-        \input lilypond-plaintex
-\else
-        \input lilypond-latex
-\fi
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% macros to shorten other definitions
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\musicmathdef#1#2{\def#1{\musicmathchar{#2}}}
-\def\musicmathchar#1{\musicmathfont\char#1}
-
-\def\topalign#1{\vbox to 0pt{#1\vss}}
-\def\botalign#1{\vbox to 0pt{\vss #1}}
-
-\def\centeralign#1{\hbox to 0pt{\hss#1\hss}}
-\def\leftalign#1{\hbox to 0pt{#1\hss}}
-\def\rightalign#1{\hbox to 0pt{\hss#1}}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% set up dimensions
-\parindent=0pt
-\newdimen\smallspace
-\newdimen\interlinedist
-
-\newdimen\stemthickness
-\newcount\n                     %duh. meaningful identifiers.
-\newdimen\staffheight
-\newdimen\notewidth
-\newdimen\noteheight
-\newdimen\stafflinethickness
-\newdimen\interstaffline
-\newdimen\dist
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 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
-        }
-
-%%%%%%%
+% It should run with plain TeX, LaTeX, pdftex, and texinfo.
 %
-\def\musixtwentydefs{
-      \twentyfonts
-      \csname cmrtwenty\texsuffix\endcsname
-      \musixcalc
-}
-
-\def\musixsixteendefs{
-        \sixteenfonts
-        \csname cmrsixteen\texsuffix\endcsname
-        \musixcalc
-        }
-\def\musixtwentysixdefs{
-      \csname cmrtwentysix\texsuffix\endcsname
-          \twentysixfonts
-         \musixcalc
-        }
-\def\musixthirteendefs{
-        \thirteenfonts
-        \csname cmrthirteen\texsuffix\endcsname
-       \musixcalc
-}
-\def\musixelevendefs{
-        \csname cmreleven\texsuffix\endcsname
-        \elevenfonts
-        \musixcalc
-}
-
-\def\textsharp{\raise.4ex\hbox{\textmusic\char"5D}}
-\def\textnatural{\raise.4ex\hbox{\textmusic\char"5C}}
-\def\textflat{\raise.2ex\hbox{\textmusic\char"5B}}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% do derivative calcs
+% To avoid interferences, lilyponddefs.tex should be loaded within a group.
+% To load it only once, most of the definitions must be global.
+%
+% The overall structure of a file created by LilyPond is as follows:
+%
+%   <lilypond parameter definitions>
+%   \ifx\lilypondstart \undefined
+%     \input lilyponddefs
+%   \fi
+%   \lilypondstart
+%   <font setup and note output>
+%   \lilypondend
+%
+% No footers and headers are provided for the stand-alone run (i.e., for
+% directly saying `latex <LilyPond output>'.
+%
+%
+% Avoid \par while reading this file.
+\edef\lilyponddefsELC{\the\endlinechar}%
+\endlinechar -1\relax
 
-% this has to be synced with the font definition
-\def\musixcalc{
-        \staffheight=\mudelapaperbarsize pt
+% the next three macros are taken from LaTeX
+\long\gdef\lilypondfirst#1#2{#1}
 
-        % ugh.  Can extract ex dim from TFM
-        \interlinedist=\staffheight 
-        \divide\interlinedist by 4
-        \notewidth=\mudelapapernotewidth pt
+\long\gdef\lilypondsecond#1#2{#2}
 
-        \smallspace=.3\interlinedist
-        \interstaffline=\staffheight
-        \divide\interstaffline by 4
-        \stafflinethickness=\mudelapaperrulethickness pt
-        \stemthickness=\stafflinethickness
+\gdef\lilypondifundefined#1{
+  \expandafter\ifx\csname#1\endcsname\relax
+    \expandafter\lilypondfirst
+  \else
+    \expandafter\lilypondsecond
+  \fi
 }
 
-
-
-% stacked horizontal lines 
-\def\interscoreline{\vskip 16pt}
-\def\setdynamic#1{\dynfont #1}
-\def\setfinger#1{\fingerfont #1}
-\def\setnumber#1{\fetanummer #1}
-\def\setnumberj#1{\fetanummerj #1}
-\def\setmark#1{\markfont #1}
-
-% big fat marks, if errors are detected.
-\def\columnerrormark{\placebox{-5pt}{0pt}{\bf C!}}
-\def\scorelineerrormark{\placebox{0pt}{-10pt}{\bf L!}}
-\def\errormark{{\bf E!}}
-\def\unknown{%
-  %{\bf u} %FIXME
+\gdef\lilypondstart{
+  \begingroup
+  \catcode `\@=11\relax
+  % \@nodocument is defined as \relax after `\begin{document}'
+  \lilypondifundefined{@nodocument}
+    {
+      % either plain TeX or texinfo or not at the beginning of LaTeX input
+      \def\x{\endgroup}
+    }
+    {
+      % provide a proper LaTeX preamble (for A4 paper format)
+      \def\x{
+        \endgroup
+        \def\lilyponddocument{}
+        \documentclass[a4paper]{article}
+	\nofiles
+        \pagestyle{empty}
+        % \begin is defined as \outer in texinfo, thus we use \csname
+        \csname begin\endcsname{document}
+        % center staves horizontally on page
+        \ifdim\lilypondpaperlinewidth\lilypondpaperunit > 0pt
+          \hsize\lilypondpaperlinewidth\lilypondpaperunit
+          % we abuse \scoreshift temporarily
+          \scoreshift \paperwidth
+          \advance\scoreshift -\the\hsize
+          \scoreshift 0.5\scoreshift
+          \advance\scoreshift -1in
+          \oddsidemargin \scoreshift
+          \evensidemargin \scoreshift
+        \fi
+        \parindent 0pt
+      }
+    }
+
+  \x
+
+  \lilypondifundefined{mustmakelilypondtitle}
+    {}
+    {\makelilypondtitle}
+
+  \lilypondifundefined{mustmakelilypondpiecetitle}
+    {}
+    {\makelilypondpiecetitle}
 }
 
-\input dyndefs
-\input fetdefs
-
-
-
-\def\emptybar{}
+\gdef\lilypondend{
+  \lilypondifundefined{lilypondbook}
+    {\lilypondifundefined{lilypondpaperlastpagefill}
+      {\vskip 0pt plus \lilypondpaperinterscorelinefill00 fill}
+      {}
+    }
+    {}
+
+  \begingroup
+  \lilypondifundefined{lilyponddocument}
+    {
+      \def\x{\endgroup}
+    }
+    {
+      \def\x{
+        \endgroup
+        \csname end\endcsname{document}
+      }
+    }
+
+  \x
+}
 
-\def\defaultthinbar{\thinbar{\staffheight}}
-\def\defaultthickbar{\thickbar{\staffheight}}
-%? what-s wrong with rightalign?
-\def\repeatstopbar{\rightalign{\repeatcolon\kern2\smallspace\defaultthinbar\kern\smallspace\defaultthickbar}}
-\def\repeatstartbar{\hbox{\defaultthickbar\kern\smallspace\defaultthinbar\kern2\smallspace\repeatcolon}}
-\def\repeatstopstart{\hbox{\repeatcolon\kern2\smallspace\defaultthickbar\kern\smallspace\defaultthickbar\kern2\smallspace\repeatcolon}}
+% this is an inversed \loop ... \repeat macro
+\def\lilypondloop#1\lilypondrepeat{
+  \def\lilypondbody{#1}
+  \lilyponditerate
+}
 
-%compatibility
-%urg
-\fetdef\repeatcolon{21}
-\def\repeatbar#1{\repeatstopbar}
-\def\startrepeat#1{\repeatstartbar}
-\def\repeatbarstartrepeat#1{\repeatstopstart}
+\def\lilyponditerate{
+  % \if ...
+    \lilypondbody
+    \let\lilypondnext \relax
+  \else
+    \let\lilypondnext \lilyponditerate
+  \fi
+  \lilypondnext
+}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% parametric symbols
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% the following macro is executed only once
+\gdef\lilypondspecial{
+  \special{header=music-drawing-routines.ps}
+  \gdef\lilypondspecial{}
+}
 
-\def\doublebar#1{\hbox{\thinbar{#1}\hskip\smallspace\thinbar{#1}}}
-\def\thinbar#1{\dimen0=#1%
-        \vrule height .5\dimen0 depth .5\dimen0 width 1.6\stafflinethickness} % 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\fatdoublebar#1{\hbox{\phantom{\repeatcolon\kern2\smallspace}\thickbar{#1}\kern\smallspace\thickbar{#1}}}
+% the feta characters
+\input feta20
 
-\def\extender#1{\vrule width#1 height .8\stafflinethickness}
+\global\font\fetasixteen = feta16
+\gdef\fetafont{\fetasixteen}
+\gdef\fetachar#1{\hbox{\fetasixteen#1}}
 
-% ugh
-% see e.g. input/test/beam-pos.ly
-%
-% something's wrong with the aligment; sometimes all symbols
-% look to be placed a bit too high (there's an ugly fix for
-% the staccato-dot in script.cc)
-% but this varies from line to line: it seems that xdvi
-% does some rounding; i can't really check this from screen on i
-% 600x600 res.
-%
-\def\rulesym#1#2{\dimen0=#1     %obsolete
-        \vrule height .5\dimen0 depth .5\dimen0 width #2}
-\def\shiftedrulesym#1#2{\dimen0=#1%
-        \vrule height .7\dimen0 depth .3\dimen0 width #2}
-\def\tinyrulesym#1#2{\dimen0=#1%
-        \vrule height .1\dimen0 depth .1\dimen0 width #2}
-%would be nice for checking alignment
-\def\openrulesym#1#2{\dimen0=#1%
-        \vbox to \dimen0{\vss%
-        \hbox{\vrule height .1\dimen0 width #2}%
-        \hbox{\vrule height .2\dimen0 width 0pt}%
-        \hbox{\vrule height .4\dimen0 width #2}%
-        \hbox{\vrule height .2\dimen0 width 0pt}%
-        \hbox{\vrule height .1\dimen0 width #2}%
-        \vss}}
-%\let\rulesym\shiftedrulesym
-%\let\rulesym\tinyrulesym
-%\let\rulesym\openrulesym
-
-% the interline symbol. Redefine to remove it.
-\def\defaultlineseparator{\vbox{\mussepline\vskip -5pt\mussepline}}
-\def\lineseparator{\defaultlineseparator}
-\def\beauty{%
-        \par\vskip 10pt plus 30pt minus 10pt\par
-        \hskip -5pt\lineseparator
-        \par\vskip 10pt plus 30pt minus 10pt\par
+\gdef\botalign#1{
+  \vbox to 0pt{\vss #1}
+}
+\gdef\leftalign#1{
+  \hbox to 0pt{#1\hss}
 }
 
+\gdef\lyitem#1#2#3{
+  \botalign{
+    \hbox{\raise #1\outputscale
+          \leftalign{\kern #2\outputscale #3}}
+  }
+}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\postheader{}
-
-%
-% macros suck. \ifundefined{nolilyfooter} gives wierd errors from time
-%        to time.
-%
+\gdef\lybox#1#2#3{
+  \hbox to #1\outputscale {
+    \lower\scoreshift \vbox to #2\outputscale {
+      \hbox{#3}
+      \vss
+    }
+    \hss
+  }
+}
 
-%
-% Warning: the order is conceptually weird.  It says:
+\gdef\lyvrule#1#2#3#4{
+  \kern #1\outputscale
+  \vrule width #2\outputscale depth #3\outputscale height #4\outputscale
+}
 
-% if not defined (``nolilyfooter''):
-%    do_footer ()
-% else 
-%    dont_do_footer ()
+% Attempt to keep lilypiecetitle together with the piece:
 %
-\ifx\csname nolilyfooter\endcsname\relax
-        \message{[footer defined]}%
-        \csname lilyfooter\texsuffix\endcsname%
-\else
-        \message{[footer empty]}
-        \csname%
-        nolilyfooter\texsuffix\endcsname
-\fi
+% TODO: figure this out.
+\gdef\myfilbreak{}%\par\vfil\penalty200\vfilneg}
+
+\lilypondifundefined{lilypondpaperinterscorelinefill}
+  {\gdef\lilypondpaperinterscorelinefill{0}}
+  {\gdef\lilypondpaperinterscorelinefill{1}}
+
+%% Allow overriding of interscoreline, eg for lilypond --preview
+\lilypondifundefined{interscoreline}
+{\gdef\interscoreline{
+  \vskip \lilypondpaperinterscoreline \lilypondpaperunit
+    plus \lilypondpaperinterscorelinefill fill
+}}{}
+
+% Are we using PDFTeX?  If so, use pdf definitions.
+% MiKTeX checks \pdfoutput the wrong way, thus we use \csname.
+\lilypondifundefined{lilypondpostscript}
+  {
+    \lilypondifundefined{pdfoutput}
+      {\input lily-ps-defs }
+      {
+        \pdfoutput = 1
+        \input lily-pdf-defs %
+      }
+  }
+  {}
+
+\newdimen\outputscale
+\newdimen\scoreshift
+
+% Restore newline functionality (disabled to avoid \par).
+\endlinechar \lilyponddefsELC
+\endinput
+
+% EOF