Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

[lilypond.git] / tex / lilyponddefs.tex

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index c862ae144297704b65b39da1305fbfed7508dc71..467f5639951c6118cbba7060c057a05af1f12b25 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -2,7 +2,7 @@
 %%%
 %%%  source file of the GNU LilyPond music typesetter
 %%% 
-%%% (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+%%% (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 %%%                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %%%                 Mats Bengtsson <mats.bengtsson@s3.kth.se>
 %%%
@@ -203,6 +203,8 @@
        \fi
        \pagestyle{empty}
 
+       \usepackage{color}
+
        \lilypondifundefined{lilypondclassic}
          {%% If not in `classic' mode, undo LaTeX's page layout settings
           %% since LilyPond does the layout by itself.
@@ -326,25 +328,40 @@
 %% and the \ifpdf switch is needed before \documentclass, using
 %% \usepackage{ifpdf} is not an option.
 %
-\lilypondifundefined{lilypondpostscript}
-  {\newif\ifpdf
-   \ifx\pdfoutput\undefined
-   \else
-     \ifx\pdfoutput\relax
-     \else
-       \ifcase\pdfoutput
-       \else
-         \pdftrue
-       \fi
-     \fi
-   \fi
-   \ifpdf
-     {\input lily-pdf-defs }
-   \else
-     {\input lily-ps-defs }
-   \fi}
-  {}
-
+\input lily-ps-defs 
+
+% barfs with texi 
+% Runaway argument?
+%{
+%! Forbidden control sequence found while scanning use of \lilypondfirst.
+%<inserted text>
+%                \par
+%<to be read again>
+%                   \newif
+%l.330   {\newif
+%               \ifpdf
+%?
+%
+%%
+%\lilypondifundefined{lilypondpostscript}
+%  {\newif\ifpdf
+%   \ifx\pdfoutput\undefined
+%   \else
+%     \ifx\pdfoutput\relax
+%     \else
+%       \ifcase\pdfoutput
+%       \else
+%         \pdftrue
+%       \fi
+%     \fi
+%   \fi
+%   \ifpdf
+%     {\input lily-pdf-defs }
+%   \else
+%     {\input lily-ps-defs }
+%   \fi}
+%  {}
+%
 %% Restore newline functionality (disabled to avoid \par).
 %%
 \endlinechar \lilyponddefsELC