# HG changeset patch # User wenzelm # Date 1128006532 -7200 # Node ID d3f55965bdbfdbf2471739010d6fa50b2b8d416c # Parent e969fc0a492566aa11cea905f1c3775116a3a3fb pdfsetup.sty: better not rely on ifpdf.sty; diff -r e969fc0a4925 -r d3f55965bdbf NEWS --- a/NEWS Thu Sep 29 17:02:57 2005 +0200 +++ b/NEWS Thu Sep 29 17:08:52 2005 +0200 @@ -125,9 +125,6 @@ * Delimiters of outer tokens (string etc.) now produce separate LaTeX macros (\isachardoublequoteopen, isachardoublequoteclose etc.). -* Isabelle's pdfsetup.sty now requires ifpdf.sty (which is part of -common LaTeX distributions) for robust checking of PDF output mode. - * isatool usedir: new option -C (default true) controls whether option -D should include a copy of the original document directory; -C false prevents unwanted effects such as copying of administrative CVS data. diff -r e969fc0a4925 -r d3f55965bdbf doc-src/pdfsetup.sty --- a/doc-src/pdfsetup.sty Thu Sep 29 17:02:57 2005 +0200 +++ b/doc-src/pdfsetup.sty Thu Sep 29 17:08:52 2005 +0200 @@ -3,9 +3,20 @@ %% smart url or hyperref setup -- special version for Isabelle documentation %% -\message{pdfsetup.sty v0.2 28/9/2005} -\RequirePackage{ifpdf} -\ifpdf +\message{pdfsetup.sty v0.3 29/9/2005} + +\newif\ifpdfoutput +\ifx\pdfoutput\undefined +\else + \ifx\pdfoutput\relax + \else + \ifcase\pdfoutput + \else\pdfoutputtrue\fi + \fi +\fi + +\ifpdfoutput + \message{PDF output} \usepackage{color}\definecolor{darkblue}{rgb}{0,0,0.5} \usepackage[pdftex,colorlinks=true,linkcolor=darkblue,citecolor=darkblue,filecolor=darkblue,pagecolor=darkblue,urlcolor=darkblue]{hyperref} %no a4paper because overall style sets this (not for Springer!) @@ -13,6 +24,7 @@ \gdef\fnote#1{\hyperpage{#1}n} \gdef\bold#1{\textbf{\hyperpage{#1}}} \else + \message{No PDF output} \usepackage{../url} \newcommand{\hfootref}[2]{#2\footnote{\url{#1}}} \fi diff -r e969fc0a4925 -r d3f55965bdbf lib/texinputs/pdfsetup.sty --- a/lib/texinputs/pdfsetup.sty Thu Sep 29 17:02:57 2005 +0200 +++ b/lib/texinputs/pdfsetup.sty Thu Sep 29 17:08:52 2005 +0200 @@ -4,11 +4,22 @@ %% smart url or hyperref setup %% -\RequirePackage{ifpdf} -\ifpdf +\newif\ifpdfoutput +\ifx\pdfoutput\undefined +\else + \ifx\pdfoutput\relax + \else + \ifcase\pdfoutput + \else\pdfoutputtrue\fi + \fi +\fi + +\ifpdfoutput + \message{PDF output} \usepackage{color}\definecolor{darkblue}{rgb}{0,0,0.5} \usepackage[pdftex,a4paper,colorlinks=true,linkcolor=darkblue,citecolor=darkblue,filecolor=darkblue,pagecolor=darkblue,urlcolor=darkblue]{hyperref} \IfFileExists{thumbpdf.sty}{\usepackage{thumbpdf}}{} \else + \message{No PDF output} \usepackage{url} \fi