release: 1.3.134

[lilypond.git] / tex / titledefs.tex

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 07b806cbb884d90926ed3c63e73878421aa42447..1c853c8366a9fd0296484432667afa3b20ed08eb 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -4,74 +4,85 @@
 %
 % Version 0.1
 %
-\input lilyponddefs
-\def\EndLilyPondOutput{\endinput}
-%
 \def\thetitle{}
 \def\thesubtitle{}
+\def\thesubsubtitle{}
 \def\thecomposer{}
 \def\thearranger{}
 \def\theinstrument{}
 \def\theopus{}
 \def\thepiece{}
-\def\themetre{}
+\def\themeter{}
 \def\thepoet{}
+\def\theheader{}
+\def\thefooter{}
+\def\theorchestralinstrument{}
 %
 % duh.  LaTeX has a \title too.
 \renewcommand*{\title}[1]{\def\thetitle{#1}}
 \newcommand*{\subtitle}[1]{\def\thesubtitle{#1}}
+\newcommand*{\subsubtitle}[1]{\def\thesubsubtitle{#1}}
 \newcommand*{\composer}[1]{\def\thecomposer{#1}}
 \newcommand*{\arranger}[1]{\def\thearranger{#1}}
 \newcommand*{\instrument}[1]{\def\theinstrument{#1}}
 \newcommand*{\opus}[1]{\def\theopus{#1}}
 \newcommand*{\piece}[1]{\def\thepiece{#1}}
-\newcommand*{\metre}[1]{\def\themetre{#1}}
+\newcommand*{\meter}[1]{\def\themeter{#1}}
 \newcommand*{\poet}[1]{\def\thepoet{#1}}
 %
-\newcommand*{\mudelatitle}[1]{\def\thetitle{#1}}
-\newcommand*{\mudelasubtitle}[1]{\def\thesubtitle{#1}}
-\newcommand*{\mudelacomposer}[1]{\def\thecomposer{#1}}
-\newcommand*{\mudelaarranger}[1]{\def\thearranger{#1}}
-\newcommand*{\mudelainstrument}[1]{\def\theinstrument{#1}}
-\newcommand*{\mudelaopus}[1]{\def\theopus{#1}}
-\newcommand*{\mudelapiece}[1]{\def\thepiece{#1}}
-\newcommand*{\mudelametre}[1]{\def\themetre{#1}}
-\newcommand*{\mudelameter}[1]{\def\themetre{#1}}
-\newcommand*{\mudelapoet}[1]{\def\thepoet{#1}}
+\newcommand*{\lilypondtitle}[1]{\def\thetitle{#1}}
+\newcommand*{\lilypondsubtitle}[1]{\def\thesubtitle{#1}}
+\newcommand*{\lilypondsubsubtitle}[1]{\def\thesubsubtitle{#1}}
+\newcommand*{\lilypondfooter}[1]{\def\thefooter{#1}}
+\newcommand*{\lilypondhead}[1]{\def\theheader{#1}}
+\newcommand*{\lilypondcomposer}[1]{\def\thecomposer{#1}}
+\newcommand*{\lilypondarranger}[1]{\def\thearranger{#1}}
+\newcommand*{\lilypondinstrument}[1]{\def\theinstrument{#1}}
+\newcommand*{\lilypondopus}[1]{\def\theopus{#1}}
+\newcommand*{\lilypondpiece}[1]{\def\thepiece{#1}}
+\newcommand*{\lilypondmetre}[1]{\def\themeter{#1}}
+\newcommand*{\lilypondmeter}[1]{\def\themeter{#1}}
+\newcommand*{\lilypondpoet}[1]{\def\thepoet{#1}}
 %
 %
-\def\mudelanull{}%
+\def\lilypondnull{}%
 %
 \def\makelilytitle{%
   \begin{center}
         \bfseries
-        \ifx\mudelanull\thetitle\else{\huge\thetitle}\\ \fi
-        \ifx\mudelanull\thesubtitle\else{\Large\thesubtitle}\\ \fi
+        \ifx\lilypondnull\thetitle\else{\huge\thetitle}\\ \fi
+        \ifx\lilypondnull\thesubtitle\else{\Large\thesubtitle}\\ \fi
+        \ifx\lilypondnull\thesubsubtitle\else{\large\thesubsubtitle}\\ \fi
   \end{center}
   \bigskip
   % urg
   \edef\saveparskip{\parskip}\parskip-5mm
   \begin{minipage}[t]{0.45\textwidth}
-        \ifx\mudelanull\thepoet\else{\thepoet}\\ \fi
-        \ifx\mudelanull\themetre\else{\themetre}\\ \fi
+        \ifx\lilypondnull\thepoet\else{\thepoet}\\ \fi
+        \ifx\lilypondnull\themeter\else{\themeter}\\ \fi
   \end{minipage}\hspace*{\fill}
   \begin{minipage}[t]{0.45\textwidth}
       \begin{flushright}
-          \ifx\mudelanull\thecomposer\else{\large\normalfont\scshape\thecomposer}\\ \fi
-          \ifx\mudelanull\theopus\else{\theopus}\\ \fi
-          \ifx\mudelanull\thearranger\else{\thearranger}\\ \fi
+          \ifx\lilypondnull\thecomposer\else{\large\normalfont\scshape\thecomposer}\\ \fi
+          \ifx\lilypondnull\theopus\else{\theopus}\\ \fi
+          \ifx\lilypondnull\thearranger\else{\thearranger}\\ \fi
         \end{flushright}%
   \end{minipage}\par
   \parskip\saveparskip
   {\center{\large\theinstrument}\par}
-  {\flushleft{\large\normalfont\scshape\thepiece}}
-  \leavevmode
+  {\flushleft{\large\normalfont\scshape\thepiece}\par}
+%  \leavevmode
+  \global\let\theopus\relax%
+  \global\let\thepiece\relax%
 }
 \def\makelilypiecetitle
 {
-  \bigskip
+  \bigskip\myfilbreak
   {\flushright{\theopus}\par}
-  {\flushleft{\large\normalfont\scshape\thepiece}}
+  {\flushleft{\large\normalfont\scshape\thepiece}\par}
+  \nopagebreak%
+  \global\let\theopus\relax%
+  \global\let\thepiece\relax%
 }
 \endinput