From ada9233627f8c84db335bfffe8af42d3e0a8160d Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 26 Dec 2004 13:33:56 +0000
Subject: [PATCH] Fix internalsrefs {Tunable context properties}, {All layout
 objects}, {Music definitions}.

---
 ChangeLog                                  |  7 +++
 Documentation/user/changing-defaults.itely |  6 +--
 tex/lilyponddefs.tex                       | 52 +++++++++++++++++++---
 3 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd4a1743c3..547ee175c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* Documentation/user/changing-defaults.itely: Fix internalsrefs
+	{Tunable context properties},
+	{All layout objects},
+	{Music definitions}.
+
 2004-12-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/lexer.ll: add  <> to catch-all string rule
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index ce6081725f..e3c77b3e40 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -351,7 +351,7 @@ note.
 A full description of all available context properties is in the
 program reference, see
 @ifhtml
-@internalsref{Tunable-context-properties}.
+@internalsref{Tunable context properties}.
 @end ifhtml
 @ifnothtml
 Translation @arrow{} Tunable context properties.
@@ -544,7 +544,7 @@ affects settings that were made in the same context.  In other words, the
 
 Internals: @internalsref{OverrideProperty}, @internalsref{RevertProperty},
 @internalsref{PropertySet}, @internalsref{All-backend-properties}, and
-@internalsref{All-layout-objects}.
+@internalsref{All layout objects}.
 
 
 @refbugs
@@ -1005,7 +1005,7 @@ starts from the output, and ends at the input event.
 The program reference can also be browsed like a normal document.  It
 contains a chapter on
 @ifhtml
-@internalsref{Music-definitions},
+@internalsref{Music definitions},
 @end ifhtml
 @ifnothtml
 @code{Music definitions}
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 456d05d715..e84938eb58 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -315,13 +315,51 @@
 %%
 %% (Don't remove the spaces after the arguments to \input!)
 %%
-\lilypondifundefined{lilypondpostscript}
-  {\lilypondifundefined{pdfoutput}
-     {\input lily-ps-defs }
-     {\pdfoutput = 1
-      \input lily-pdf-defs }}
-  {}
-
+%
+%% In teTeX-3.0, latex is actually pdfetex, and we need
+%% ifpdf.sty to determinine if we are really *tex or pdf*tex.
+%
+%% \input ifpdf.sty
+%
+%% However, ifpfd.sty is too smart for LilyPond, so we copy the
+%% logic here.  Using \input ifpdf.sty is a no-op when using latex,
+%% and the \ifpdf switch is needed before \documentclass, using
+%% \usepackage{ifpdf} is not an option.
+%
+\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
-- 
2.39.5