release: 1.4.2

[lilypond.git] / tex / lilyponddefs.tex

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 77b02d7f7a9a49c71209008c070a870c2377b576..de417a1ddd91afb2254da47b6a659338f40eca19 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -8,6 +8,10 @@
 % TeXbook ex 7.7
 \def\ifundefined#1{\expandafter\ifx\csname#1\endcsname\relax}
 %
+% If we must make titles, do so, before we're Skipped.
+\ifx\mustmakelilypondtitle\undefined\else\makelilypondtitle\fi
+\ifx\mustmakelilypondpiecetitle\undefined\else\makelilypondpiecetitle\fi
+%
 % skip if included already
 \def\SkipLilydefs{\endinput}
 \ifundefined{EndLilyPondOutput}
@@ -15,21 +19,61 @@
         \def\SkipLilydefs{}
 \fi
 \SkipLilydefs
+
+% need to do some stuff to turn pagenumbering off
+\ifundefined{documentclass}
+        \input lilypond-plaintex
+\else
+        \input lilypond-latex
+\fi
+
+
 %
 \def\botalign#1{\vbox to 0pt{\vss #1}}
 \def\leftalign#1{\hbox to 0pt{#1\hss}}
 
+\input feta20.tex
+
+% Attempt to keep lilypiecetitle together with the piece:
+\def\myfilbreak{\par\vfil\penalty200\vfilneg}
 
 % stacked horizontal lines
-\def\interscoreline{\vskip 16pt}
+\ifundefined{lilypondpaperinterscoreline}
+        \def\lilypondpaperinterscoreline{16}
+\fi
+\ifundefined{lilypondpaperinterscorelinefill}
+        \def\lilypondpaperinterscorelinefill{0}
+\fi
+
+\def\interscoreline{\vskip\lilypondpaperinterscoreline pt plus %
+  \lilypondpaperinterscorelinefill fill}
+
 \def\placebox#1#2#3{%
         \botalign{\hbox{\raise #1\leftalign{\kern #2{}#3}}}}%
-\input lily-ps-defs
+
+% Are we using PDFTeX?  If so, use pdf definitions.
+\ifx\pdfoutput\undefined  
+  \input lily-ps-defs
+\else
+  \pdfoutput=1
+  \input lily-pdf-defs
+\fi
+
 \def\EndLilyPondOutput{%
-  \csname bye\endcsname
-  }
-  
-  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  
+ \vskip 0pt plus \lilypondpaperinterscorelinefill00 fill\csname bye\endcsname
+}
 \def\postheader{}
-\noindent
+
+% need to do some stuff to turn pagenumbering off
+% they seriously mess up  your fragments.
+
+\ifx\csname nolilyfooter\endcsname\relax
+        \message{[footer defined]}%
+        \csname lilyfooter\texsuffix\endcsname%
+\else
+        \message{[footer empty]}
+        \csname%
+        nolilyfooter\texsuffix\endcsname
+\fi
+
+\endinput