* tex/lilyponddefs.tex: Uncommented feta character support.

[lilypond.git] / tex / lilyponddefs.tex

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index f6bca234e4b9dc038fe6ce0f5bf344da892f6847..36ad14fbe7f21977ca58858fef8cb1f1a28997de 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -4,9 +4,20 @@
 %% 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}
+
+% The feta characters
+\input feta20.tex
+
+\font\fetasixteen=feta16
+\def\fetafont{\fetasixteen}
+\def\fetachar#1{\hbox{\fetasixteen#1}}
+
+% 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}
@@ -23,36 +34,45 @@
         \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
-\ifundefined{mudelapaperinterscoreline}
-        \def\interscoreline{\vskip 16pt\myfilbreak}
+%
+% TODO: figure this out.
+%
+
+\def\myfilbreak{} %\par\vfil\penalty200\vfilneg}
+
+
+\ifundefined{lilypondpaperinterscorelinefill}
+        \def\lilypondpaperinterscorelinefill{0}
 \else
-        \def\interscoreline{\vskip\mudelapaperinterscoreline pt\myfilbreak}
+        \def\lilypondpaperinterscorelinefill{1}
 \fi
+
+\def\interscoreline{\vskip \lilypondpaperinterscoreline \lilypondpaperunit plus \lilypondpaperinterscorelinefill fill}
+
 \def\placebox#1#2#3{%
         \botalign{\hbox{\raise #1\leftalign{\kern #2{}#3}}}}%
 
-% Are we using PDFTeX?  If so, use pdf definitions to translate
-% \embeddedps commands to embedded PDF.
+% Are we using PDFTeX?  If so, use pdf definitions.
+% MiKTeX checks \pdfoutput the wrong way, makes our
+% check more complicated.
 \ifx\pdfoutput\undefined  
   \input lily-ps-defs
 \else
-  \pdfoutput=1
-  \input lily-pdf-defs
+  \ifx\pdfoutput\relax
+    \input lily-ps-defs
+  \else
+    \pdfoutput=1
+    \input lily-pdf-defs
+  \fi
 \fi
 
 \def\EndLilyPondOutput{%
-  \csname bye\endcsname
+ \vskip 0pt plus \lilypondpaperinterscorelinefill00 fill\csname bye\endcsname
 }
 \def\postheader{}
 
@@ -67,8 +87,5 @@
         \csname%
         nolilyfooter\texsuffix\endcsname
 \fi
-
-% fix chord.cc::banter_str before removing these
-\input fetdefs
-
+\newdimen\outputscale
 \endinput