release: 1.3.140

[lilypond.git] / tex / titledefs.tex

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 8e0bd60b004c4731682ac1bb72a538dc27e3d87e..92e3747de496574ef465dca179be9c87836a4da2 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -1,84 +1,53 @@
-%
-% ideally, we should create a LaTeX/TeX class
-% for setting music in different sizes.
-%
-% Version 0.1
-%
-\def\thetitle{}
-\def\thesubtitle{}
-\def\thecomposer{}
-\def\thearranger{}
-\def\theinstrument{}
-\def\theopus{}
-\def\thepiece{}
-\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*{\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*{\meter}[1]{\def\themeter{#1}}
-\newcommand*{\poet}[1]{\def\thepoet{#1}}
-%
-\newcommand*{\lilypondtitle}[1]{\def\thetitle{#1}}
-\newcommand*{\lilypondsubtitle}[1]{\def\thesubtitle{#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\lilypondnull{}%
-%
-\def\makelilytitle{%
+%%
+%% LilyPond titling for LaTeX
+%%
+%% Note
+%%
+%%    Defining a value, but leaving it empty:
+%%        \def\lilypondfoo{}
+%%    makes LaTeX break on the \\ in:
+%%        \ifx\lilypondfoo\undefined\else{\lilypondfoo\\}\fi
+%%
+\def\makelilypondtitle
+{
   \begin{center}
         \bfseries
-        \ifx\lilypondnull\thetitle\else{\huge\thetitle}\\ \fi
-        \ifx\lilypondnull\thesubtitle\else{\Large\thesubtitle}\\ \fi
+        \ifx\lilypondtitle\undefined\else{\huge\lilypondtitle\\}\fi
+        \ifx\lilypondsubtitle\undefined\else{\Large\lilypondsubtitle\\}\fi
+        \ifx\lilypondsubsubtitle\undefined\else{\large\lilypondsubsubtitle\\}\fi
   \end{center}
   \bigskip
   % urg
   \edef\saveparskip{\parskip}\parskip-5mm
   \begin{minipage}[t]{0.45\textwidth}
-        \ifx\lilypondnull\thepoet\else{\thepoet}\\ \fi
-        \ifx\lilypondnull\themeter\else{\themeter}\\ \fi
+        \ifx\lilypondpoet\undefined\else{\lilypondpoet\\}\fi
+        \ifx\lilypondmeter\undefined\else{\lilypondmeter\\}\fi
   \end{minipage}\hspace*{\fill}
   \begin{minipage}[t]{0.45\textwidth}
       \begin{flushright}
-          \ifx\lilypondnull\thecomposer\else{\large\normalfont\scshape\thecomposer}\\ \fi
-          \ifx\lilypondnull\theopus\else{\theopus}\\ \fi
-          \ifx\lilypondnull\thearranger\else{\thearranger}\\ \fi
+          \ifx\lilypondcomposer\undefined\else{\large\normalfont\scshape\lilypondcomposer\\}\fi
+          \ifx\lilypondopus\undefined\else{\lilypondopus\\}\fi
+          \ifx\lilypondarranger\undefined\else{\lilypondarranger\\}\fi
         \end{flushright}%
   \end{minipage}\par
   \parskip\saveparskip
-  {\center{\large\theinstrument}\par}
-  {\flushleft{\large\normalfont\scshape\thepiece}\par}
+  \ifx\lilypondinstrument\undefined\else{\center{\large\lilypondinstrument}\par}\fi
+  \ifx\lilypondpiece\undefined\else{\flushleft{\large\normalfont\scshape\lilypondpiece}\par}\fi
 %  \leavevmode
-  \global\let\theopus\relax%
-  \global\let\thepiece\relax%
+  \global\let\lilypondopus\relax%
+  \global\let\lilypondpiece\relax%
+  \global\let\mustmakelilypondtitle\undefined%
 }
-\def\makelilypiecetitle
+%
+\def\makelilypondpiecetitle
 {
   \bigskip\myfilbreak
-  {\flushright{\theopus}\par}
-  {\flushleft{\large\normalfont\scshape\thepiece}\par}
+  \ifx\lilypondopus\undefined\else{\flushright{\lilypondopus}\par}\fi
+  \ifx\lilypondpiece\undefined\else{\flushleft{\large\normalfont\scshape\lilypondpiece}\par}\fi
   \nopagebreak%
-  \global\let\theopus\relax%
-  \global\let\thepiece\relax%
+  \global\let\lilypondopus\relax%
+  \global\let\lilypondpiece\relax%
+  \global\let\mustmakelilypondpiecetitle\undefined%
 }
 \endinput