1.1 --- a/NEWS	Thu Sep 29 17:02:57 2005 +0200
     1.2 +++ b/NEWS	Thu Sep 29 17:08:52 2005 +0200
     1.3 @@ -125,9 +125,6 @@
     1.4  * Delimiters of outer tokens (string etc.) now produce separate LaTeX
     1.5  macros (\isachardoublequoteopen, isachardoublequoteclose etc.).
     1.6  
     1.7 -* Isabelle's pdfsetup.sty now requires ifpdf.sty (which is part of
     1.8 -common LaTeX distributions) for robust checking of PDF output mode.
     1.9 -
    1.10  * isatool usedir: new option -C (default true) controls whether option
    1.11  -D should include a copy of the original document directory; -C false
    1.12  prevents unwanted effects such as copying of administrative CVS data.

     2.1 --- a/doc-src/pdfsetup.sty	Thu Sep 29 17:02:57 2005 +0200
     2.2 +++ b/doc-src/pdfsetup.sty	Thu Sep 29 17:08:52 2005 +0200
     2.3 @@ -3,9 +3,20 @@
     2.4  %% smart url or hyperref setup -- special version for Isabelle documentation
     2.5  %%
     2.6  
     2.7 -\message{pdfsetup.sty v0.2 28/9/2005}
     2.8 -\RequirePackage{ifpdf}
     2.9 -\ifpdf
    2.10 +\message{pdfsetup.sty v0.3 29/9/2005}
    2.11 +
    2.12 +\newif\ifpdfoutput
    2.13 +\ifx\pdfoutput\undefined
    2.14 +\else
    2.15 +  \ifx\pdfoutput\relax
    2.16 +  \else
    2.17 +    \ifcase\pdfoutput
    2.18 +    \else\pdfoutputtrue\fi
    2.19 +  \fi
    2.20 +\fi
    2.21 +
    2.22 +\ifpdfoutput
    2.23 +  \message{PDF output}
    2.24    \usepackage{color}\definecolor{darkblue}{rgb}{0,0,0.5}
    2.25    \usepackage[pdftex,colorlinks=true,linkcolor=darkblue,citecolor=darkblue,filecolor=darkblue,pagecolor=darkblue,urlcolor=darkblue]{hyperref}
    2.26                %no a4paper because overall style sets this (not for Springer!)
    2.27 @@ -13,6 +24,7 @@
    2.28    \gdef\fnote#1{\hyperpage{#1}n}
    2.29    \gdef\bold#1{\textbf{\hyperpage{#1}}}
    2.30  \else
    2.31 +  \message{No PDF output}
    2.32    \usepackage{../url}
    2.33    \newcommand{\hfootref}[2]{#2\footnote{\url{#1}}}
    2.34  \fi

     3.1 --- a/lib/texinputs/pdfsetup.sty	Thu Sep 29 17:02:57 2005 +0200
     3.2 +++ b/lib/texinputs/pdfsetup.sty	Thu Sep 29 17:08:52 2005 +0200
     3.3 @@ -4,11 +4,22 @@
     3.4  %% smart url or hyperref setup
     3.5  %%
     3.6  
     3.7 -\RequirePackage{ifpdf}
     3.8 -\ifpdf
     3.9 +\newif\ifpdfoutput
    3.10 +\ifx\pdfoutput\undefined
    3.11 +\else
    3.12 +  \ifx\pdfoutput\relax
    3.13 +  \else
    3.14 +    \ifcase\pdfoutput
    3.15 +    \else\pdfoutputtrue\fi
    3.16 +  \fi
    3.17 +\fi
    3.18 +
    3.19 +\ifpdfoutput
    3.20 +  \message{PDF output}
    3.21    \usepackage{color}\definecolor{darkblue}{rgb}{0,0,0.5}
    3.22    \usepackage[pdftex,a4paper,colorlinks=true,linkcolor=darkblue,citecolor=darkblue,filecolor=darkblue,pagecolor=darkblue,urlcolor=darkblue]{hyperref}
    3.23    \IfFileExists{thumbpdf.sty}{\usepackage{thumbpdf}}{}
    3.24  \else
    3.25 +  \message{No PDF output}
    3.26    \usepackage{url}
    3.27  \fi