texinfo/doc texinfo.tex,1.38,1.39

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv22268

Modified Files:
        texinfo.tex 
Log Message:
(\pdfoutput): check also for \relax and 0, not
just \undefined, in case pdftex is being run in
dvi mode.  Reported by Thomas Esser.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** texinfo.tex 8 Mar 2004 22:42:19 -0000       1.38
--- texinfo.tex 11 Mar 2004 23:59:51 -0000      1.39
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-03-06.11}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-03-11.15}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 1163,1176 ****
  \newif\ifpdfmakepagedest
  
  \ifx\pdfoutput\undefined
-   \pdffalse
-   \let\pdfmkdest = \gobble
-   \let\pdfurl = \gobble
-   \let\endlink = \relax
-   \let\linkcolor = \relax
-   \let\pdfmakeoutlines = \relax
  \else
!   \pdftrue
!   \pdfoutput = 1
    \input pdfcolor
    \pdfcatalog{/PageMode /UseOutlines}%
--- 1163,1181 ----
  \newif\ifpdfmakepagedest
  
+ % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
+ % can be set).  So we test for \relax and 0 as well as \undefined,
+ % borrowed from ifpdf.sty.
  \ifx\pdfoutput\undefined
  \else
!   \ifx\pdfoutput\relax
!   \else
!     \ifcase\pdfoutput
!     \else
!       \pdftrue
!     \fi
!   \fi
! \fi
! %
! \ifpdf
    \input pdfcolor
    \pdfcatalog{/PageMode /UseOutlines}%
***************
*** 1375,1379 ****
      \linkcolor #1\endlink}
    \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
! \fi % \ifx\pdfoutput
  
  
--- 1380,1390 ----
      \linkcolor #1\endlink}
    \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
! \else
!   \let\pdfmkdest = \gobble
!   \let\pdfurl = \gobble
!   \let\endlink = \relax
!   \let\linkcolor = \relax
!   \let\pdfmakeoutlines = \relax
! \fi  % \ifx\pdfoutput