* tex/titledefs.tex: Replaced \ifx\blabla\undefined

	with \lilypondifundefined{blabla}. Solves problem with multiple
	titles in the same lilypond-book document.

diff --git a/ChangeLog b/ChangeLog
index fb15b26d9bf50690c079eecbce536659ef7d80eb..028f5ef80f0beee1896e6719e5027fcd1c64c255 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-22  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * tex/titledefs.tex: Replaced \ifx\blabla\undefined
+       with \lilypondifundefined{blabla}. Solves problem with multiple
+       titles in the same lilypond-book document.
+
 2004-03-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * spelling patch courtesy Edward Sutton.

diff --git a/autogen.sh b/autogen.sh
index 55560b9d937caf6bfa0045f2289270078e9992c7..f851875cab1db911e683eb93339d0d4b3a9240a0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# WARNING WARNING WARNING
-# do not edit! this is autogen.sh, generated from /home/hanwen/usr/src/lilypond/stepmake/autogen.sh
-#!/bin/sh
 # Run this to generate configure and initial GNUmakefiles
 
 srcdir=`dirname $0`

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index edc1b032a64daed900992cc2013e1c14f8a941d2..3ca748c76401fbd05b12f5556bccb5bd27e87a65 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -21,109 +21,95 @@
 
 \def\makelilypondtitle{
   \begin{center}
-    \ifx\lilyponddedication\undefined
-    \else
-      {\normalfont\lilyponddedication\\}
-    \fi
-
+    \lilypondifundefined{lilyponddedication}
+    {}
+    {\normalfont\lilyponddedication\\}
+    
     \bfseries
-
-    \ifx\lilypondtitle\undefined
-    \else
-      {\huge\lilypondtitle\\}
-    \fi
-
-    \ifx\lilypondsubtitle\undefined
-    \else
-      {\Large\lilypondsubtitle\\}
-    \fi
-
-    \ifx\lilypondsubsubtitle\undefined
-    \else
-      {\large\lilypondsubsubtitle\\}
-    \fi
+    
+    \lilypondifundefined{lilypondtitle}
+    {}
+    {\huge\lilypondtitle\\}
+    
+    \lilypondifundefined{lilypondsubtitle}
+    {}
+    {\Large\lilypondsubtitle\\}
+    
+    \lilypondifundefined{lilypondsubsubtitle}
+    {}
+    {\large\lilypondsubsubtitle\\}
   \end{center}
-
+  
   \bigskip
-
+  
   \begin{minipage}[t]{0.45\textwidth}
-    \ifx\lilypondpoet\undefined
-    \else
-      {\lilypondpoet\\}
-    \fi
-
-    \ifx\lilypondtexttranslator\undefined
-    \else
-      {\lilypondtexttranslator\\}
-    \fi
-
-    \ifx\lilypondmeter\undefined
-    \else
-      {\lilypondmeter\\}
-    \fi
+    \lilypondifundefined{lilypondpoet}
+    {}
+    {\lilypondpoet\\}
+    
+    \lilypondifundefined{lilypondtexttranslator}
+    {}
+    {\lilypondtexttranslator\\}
+    
+    \lilypondifundefined{lilypondmeter}
+    {}
+    {\lilypondmeter\\}
   \end{minipage}
-
+  
   \hspace*{\fill}
-
+  
   \begin{minipage}[t]{0.45\textwidth}
     \begin{flushright}
-      \ifx\lilypondcomposer\undefined
-      \else
-        {\large\normalfont\scshape\lilypondcomposer\\}
-      \fi
-
-      \ifx\lilypondopus\undefined
-      \else
-        {\lilypondopus\\}
-      \fi
-
-      \ifx\lilypondarranger\undefined
-      \else
-        {\lilypondarranger\\}
-      \fi
+      \lilypondifundefined{lilypondcomposer}
+      {}
+      {\large\normalfont\scshape\lilypondcomposer\\}
+      
+      \lilypondifundefined{lilypondopus}
+      {}
+      {\lilypondopus\\}
+      
+      \lilypondifundefined{lilypondarranger}
+      {}
+      {\lilypondarranger\\}
     \end{flushright}
   \end{minipage}
-
+  
   \par
-
-  \ifx\lilypondinstrument\undefined
-  \else
-    {\center{\large\lilypondinstrument}
-     \par}
-  \fi
-
-  \ifx\lilypondpiece\undefined
-  \else
-    {\flushleft{\large\normalfont\lilypondpiece}
-     \par}
-  \fi
-
+  
+  \lilypondifundefined{lilypondinstrument}
+  {}
+  {\center{\large\lilypondinstrument}
+    \par}
+  
+  \lilypondifundefined{lilypondpiece}
+  {}
+  {\flushleft{\large\normalfont\lilypondpiece}
+    \par}
+  
 % \leavevmode
 
-  \global\let\lilypondopus\relax
-  \global\let\lilypondpiece\relax
+  \global\let\lilypondopus\undefined
+  \global\let\lilypondpiece\undefined
   \global\let\mustmakelilypondtitle\undefined
 }
 
 \def\makelilypondpiecetitle{
   \bigskip\myfilbreak
 
-  \ifx\lilypondopus\undefined
-  \else
-    {\flushright{\lilypondopus}
-     \par}
-  \fi
-
-  \ifx\lilypondpiece\undefined
-  \else
-    {\flushleft{\large\normalfont\scshape\lilypondpiece}
-     \par}
-  \fi
-
+  \lilypondifundefined{lilypondopus}
+  {}
+  {\flushright{\lilypondopus}
+    \par}
+  
+  \lilypondifundefined{lilypondpiece}
+  {}
+  {\flushleft{\large\normalfont\scshape\lilypondpiece}
+    \par}
+  
   \nopagebreak
 
-  \global\let\lilypondopus\relax
-  \global\let\lilypondpiece\relax
+  \global\let\lilypondopus\undefined
+  \global\let\lilypondpiece\undefined
   \global\let\mustmakelilypondpiecetitle\undefined
 }
 
@@ -131,32 +117,27 @@
 % these names can't be changed: they're used in mutopia headers
 
 \def\theheader{
-  \ifx\lilypondhead\undefined
-  \else
-    \lilypondhead
-  \fi
+  \lilypondifundefined{lilypondhead}
+  {}
+  \lilypondhead
 }
 
 \def\thefooter{
-  \ifx\lilypondfooter\undefined
-  \else
-    \lilypondfooter
-  \fi
+  \lilypondifundefined{lilypondfooter}
+  {}
+  \lilypondfooter
 }
 
 \def\makelilypondtagline{
-  \ifx\undefined\lilypondtagline
-  \else
-    \lilypondtagline
-  \fi
+  \lilypondifundefined{lilypondtagline}
+  {}
+  \lilypondtagline
 }
 
 \def\thecopyright{
-  \ifx\lilypondcopyright\undefined
-    \thefooter
-  \else
-    \lilypondcopyright
-  \fi
+  \lilypondifundefined{lilypondcopyright}
+  \thefooter
+  \lilypondcopyright
 }
 
 % Moved header and footer definitions here from the lilypond script.