X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tex%2Flilyponddefs.tex;h=c862ae144297704b65b39da1305fbfed7508dc71;hb=01c7f176c310496ba9f19d43ee3e80440a6128a9;hp=456d05d715f5b54a3a8ebad1050ace40a8139415;hpb=b477819ccceb2fe03407476902162b6bfad925a7;p=lilypond.git

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 456d05d715..c862ae1442 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -315,11 +315,34 @@
 %%
 %% (Don't remove the spaces after the arguments to \input!)
 %%
+%
+%% 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.
+%
 \lilypondifundefined{lilypondpostscript}
-  {\lilypondifundefined{pdfoutput}
+  {\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 }
-     {\pdfoutput = 1
-      \input lily-pdf-defs }}
+   \fi}
   {}
 
 %% Restore newline functionality (disabled to avoid \par).