X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tex%2Flilyponddefs.tex;h=880545417ff9cef62406c58d6b3dbf1ef032a038;hb=ca2d0a9a20ea2aef0065c10b52319e520a680871;hp=feff7b983e3b089a8a1c2dc18b74d8b5a0a695d3;hpb=2181534bd94587fcac8f1769f2dda7bece693649;p=lilypond.git

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index feff7b983e..880545417f 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -1,251 +1,202 @@
-%%
-%% include file for LilyPond
-%%
-%% this file defines various macros to accomodate lilypond output
-
-% TeXbook ex 7.7
-\def\ifundefined#1{\expandafter\ifx\csname#1\endcsname\relax}
-
-% skip if included already
-\def\SkipLilydefs{\endinput}
-\ifundefined{EndLilyPondOutput}
-        \def\EndLilyPondOutput{\csname bye\endcsname}
-        \def\SkipLilydefs{}
-\fi
-\SkipLilydefs
-
-\ifundefined{mudelacopyright}
-        \def\mudelacopyright{\copyright\ \number\year}
-\fi
-\ifundefined{LilyIdString}
-        \def\LilyIdString{Lily was here}
-\fi
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% macros to shorten other definitions
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\musicdef#1#2{\def#1{\musicchar{#2}}}
-\def\musicchar#1{\musicfnt\char#1}
-\def\rationalmultiply#1*#2/#3{\multiply #1 by #2 \divide #1 by #3}
-
-
-\def\maccentraise#1#2{\dimen0=\noteheight
-        \rationalmultiply\dimen0*#2%
-        \raise\dimen0\hbox{#1}}
-\def\maccentdef#1#2#3{\def#1{\maccentraise{\musicchar{#2}}{#3}}}
-\def\vertcenter#1{\vbox to 0pt{\vss #1\vss}}
-
-\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
-\newcount\n
-\newdimen\balkheight
-\newdimen\notewidth
-\newdimen\noteheight
-\newdimen\staffrulethickness
-\newdimen\interstaffrule
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% set fonts and primary dimensions
-\def\musixtwentydefs{
-        \balkheight=20pt
-        \notewidth=6pt
-        \noteheight=5pt
-        \staffrulethickness=0.4pt
-        \musixtwentyfonts
-        \font\textmusic=cmmi12
-        \musixcalc
-}
-
-\def\musixsixteendefs{
-        \balkheight=16pt
-        \staffrulethickness=0.4pt
-        \notewidth=5pt
-        \noteheight=4pt
-        \musixsixteenfonts
-        \font\textmusic=cmmi10
-        \musixcalc
-}
+% lilyponddefs.tex
+%
+% Include file for LilyPond.
+%
+% This file defines various macros to acommodate lilypond output.
+%
+% It should run with plain TeX, LaTeX, pdftex, and texinfo.
+%
+% 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
 
-\def\textsharp{\raise.4ex\hbox{\textmusic\char"5D}}
-\def\textflat{\raise.2ex\hbox{\mus\char"5B}}
+% the next three macros are taken from LaTeX
+\long\gdef\lilypondfirst#1#2{#1}
 
+\long\gdef\lilypondsecond#1#2{#2}
 
+\gdef\lilypondifundefined#1{
+  \expandafter\ifx\csname#1\endcsname\relax
+    \expandafter\lilypondfirst
+  \else
+    \expandafter\lilypondsecond
+  \fi
+}
 
+\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}
+        \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}
+}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% do derivative calcs
+\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\musixcalc{
-        \interlinedist=\fontdimen5\musicfnt
-        \smallspace=.3\interlinedist
-        \interstaffrule=\balkheight
-        \divide\interstaffrule by 4
+% this is an inversed \loop ... \repeat macro
+\def\lilypondloop#1\lilypondrepeat{
+  \def\lilypondbody{#1}
+  \lilyponditerate
 }
 
+\def\lilyponditerate{
+  % \if ...
+    \lilypondbody
+    \let\lilypondnext \relax
+  \else
+    \let\lilypondnext \lilyponditerate
+  \fi
+  \lilypondnext
+}
 
-\input dyndefs
-
-\input taupindefs
-
-\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}}
-%? 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}}
-
-%compatibility
-\def\repeatbar{\repeatstopbar}
-\def\startrepeat{\repeatstartbar}
-\def\repeatbarstartrepeat{\repeatstopstart}
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% parametric symbols
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\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\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{\botalign{\vbox to0.5\balkheight{\vss \meterfont#1}%
-        \nointerlineskip
-        \vbox to 0.5\balkheight{\vss\meterfont #2}}}
-
-% 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 #3 width#2%
-                        \vss}\nointerlineskip
-                \repeat
-        }}
-
-%%
-% Ugh. Need to redo this. Wish we had PS.
-%
-\def\toplines#1{ % why space needed here?
-        \topalign{\hbox{\kern-\notewidth\lines{#1}{1.6\notewidth}{1.6\staffrulethickness}}}}
+% the following macro is executed only once
+\gdef\lilypondspecial{
+  \special{header=music-drawing-routines.ps}
+  \gdef\lilypondspecial{}
+}
 
-\def\botlines#1{ % idem ditto
-        \botalign{\hbox{\kern-\notewidth\lines{#1}{1.6\notewidth}{1.6\staffrulethickness}}}}
+% the feta characters
+\input feta20
 
-%
-% a staffsymbol with #1 lines, width #2
-% bottom at baseline
-\def\linestafsym#1#2{\leftalign{\botalign{\lines{#1}{#2}{\staffrulethickness}}}}
+\global\font\fetasixteen = feta16
+\gdef\fetafont{\fetasixteen}
+\gdef\fetachar#1{\hbox{\fetasixteen#1}}
 
-\def\stem#1#2{\vrule height#2 depth-#1}
+\gdef\botalign#1{
+  \vbox to 0pt{\vss #1}
+}
+\gdef\leftalign#1{
+  \hbox to 0pt{#1\hss}
+}
 
-\def\placebox#1#2#3{%
-        \botalign{\hbox{\raise #1\leftalign{\kern #2{}#3}}}%
+\gdef\lyitem#1#2#3{
+  \botalign{
+    \hbox{\raise #1\outputscale
+          \leftalign{\kern #2\outputscale #3}}
+  }
 }
 
+\gdef\lybox#1#2#3{
+  \hbox to #1\outputscale {
+    \lower\scoreshift \vbox to #2\outputscale {
+      \hbox{#3}
+      \vss
+    }
+    \hss
+  }
+}
 
-\def\beamslope#1#2{{\count0=#2\advance\count0 by#1\musicfnt\char\count0}}
-\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\settext#1{\normaltextfont #1}
-\def\setitalic#1{\italicfont #1}
-\def\setdynamic#1{\dynfont #1}
-
-% 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\lyvrule#1#2#3#4{
+  \kern #1\outputscale
+  \vrule width #2\outputscale depth #3\outputscale height #4\outputscale
 }
 
+% Attempt to keep lilypiecetitle together with the piece:
+%
+% TODO: figure this out.
+\gdef\myfilbreak{}%\par\vfil\penalty200\vfilneg}
+
+\lilypondifundefined{lilypondpaperinterscorelinefill}
+  {\gdef\lilypondpaperinterscorelinefill{0}}
+  {\gdef\lilypondpaperinterscorelinefill{1}}
+
+\gdef\interscoreline{
+  \vskip \lilypondpaperinterscoreline \lilypondpaperunit
+    plus \lilypondpaperinterscorelinefill fill
+}
 
-\def\interscoreline{\vskip 16pt}
-        
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 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}}
-
-\def\postheader{}
-\ifundefined{documentclass}
-        \footline={\ifnum\pageno=1
-        {\smalltextfont\mudelacopyright\hfil \LilyIdString
-        }\else{\hfil\the\pageno\hfil}\fi
-}\else
-        %% 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}}
-\fi
-
- 
+% 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