Handle \scoreshift and \outputscale in one

go.  Fix comments.

diff --git a/ChangeLog b/ChangeLog
index c975b7a2ed3996ff715957af028d6d0569330a50..07996b3db88ec3d6c2afe795f36abd24f5971c96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-09-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * tex/lilyponddefs.tex: Handle \scoreshift and \outputscale in one
+       go.  Fix comments.
+
        * cygwin: Cygwin updates.
 
 2002-09-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index e25c304730ed5fa4793588999c434eb62c19de42..acacba8e3db41ce8396528a2815d9e2015c026c6 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -4,6 +4,7 @@
 %
 % This file defines various macros to accomodate lilypond output.
 %
+% Avoid \par while reading this file.
 \edef\lilyponddefsELC{\the\endlinechar}%
 \endlinechar -1\relax
 
@@ -115,25 +116,16 @@
   \csname nolilyfooter\texsuffix\endcsname
 \fi
 
+% It is very bad that lilyponddefs.tex gets included in every lilypond
+% output snippet.  This is necessary because these output snippets
+% often get encapsulated, eg by texinfo. This should be fixed by
+% putting the variable parts in this file into a macro so that loading
+% the file multiple times can be avoided.
 \ifx\outputscale\undefined
   \csname global\endcsname\csname newdimen\endcsname\outputscale
+  \csname global\endcsname\csname newdimen\endcsname\scoreshift
 \fi
 
-\ifundefined{scoreshift}
-\else
-  % It is very ugly to hide \newdimen with \endinput, but I see no
-  % alternative: Since it is defined as \outer in plain.tex, you can
-  % neither use it in macros nor skip in an \if... \fi construction.
-  %
-  % In general, it is very bad that lilyponddefs.tex is read in again
-  % and again...  This should be fixed by putting the variable parts in
-  % this file into a macro so that loading the file multiple times can be
-  % avoided.
-  \endlinechar \lilyponddefsELC
-  \expandafter\endinput
-\fi
-
-\newdimen\scoreshift
-
+% Restore newline functionality (disabled to avoid \par).
 \endlinechar \lilyponddefsELC
 \endinput