texinfo update (Sun Dec 25 19:52:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.551
retrieving revision 1.552
diff -c -r1.551 -r1.552
*** ChangeLog   25 Dec 2005 19:13:56 -0000      1.551
--- ChangeLog   26 Dec 2005 00:23:11 -0000      1.552
***************
*** 1,5 ****
--- 1,8 ----
  2005-12-25  Karl Berry  <address@hidden>
  
+       * doc/texinfo.tex (\pdfurl): make @/ a no-op.
+       Report from Kurt Hornik, 23 Dec 2005 13:17:56 +0100.
+ 
        * util/texi2dvi (no_file_line_error): new control,
        with option --no-line-error to set it.  Wybo Dekker's mk program
        wants to parse TeX's original error messages.
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.204
retrieving revision 1.205
diff -c -r1.204 -r1.205
*** doc/texinfo.tex     11 Oct 2005 01:19:42 -0000      1.204
--- doc/texinfo.tex     26 Dec 2005 00:23:11 -0000      1.205
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-10-10.17}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
--- 3,9 ----
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-12-25.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 1385,1393 ****
    \else
      \let \startlink \pdfstartlink
    \fi
    \def\pdfurl#1{%
      \begingroup
!       address@hidden@}%
        \makevalueexpandable
        \leavevmode\Red
        \startlink attr{/Border [0 0 0]}%
--- 1385,1401 ----
    \else
      \let \startlink \pdfstartlink
    \fi
+   % make a live url in pdf output.
    \def\pdfurl#1{%
      \begingroup
!       % it seems we really need yet another set of dummies; have not
!       % tried to figure out what each command should do in the context
!       % of @url.  for now, just make @/ a no-op, that's the only one
!       % people have actually reported a problem with.
!       % 
!       \normalturnoffactive
!       address@hidden@}%
!       \let\/=\empty
        \makevalueexpandable
        \leavevmode\Red
        \startlink attr{/Border [0 0 0]}%
***************
*** 2963,2970 ****
      % #1 contains the command name as a string, e.g., `ifinfo'.
      %
      % Define a command to find the next address@hidden #1', which must be on 
a line
!     % by itself.
!     address@hidden address@hidden
      % And this command to find another #1 command, at the beginning of a
      % line.  (Otherwise, we would consider a line address@hidden @ifset', for
      % example, to count as an @ifset for nesting.)
--- 2971,2981 ----
      % #1 contains the command name as a string, e.g., `ifinfo'.
      %
      % Define a command to find the next address@hidden #1', which must be on 
a line
!     % by itself.  Ignore anything after the `#1'; this matters in
!     % verbatim environments, where otherwise the newline after an
!     % ignored conditional would result in a blank line in the output.
!     address@hidden #1##2^^M{%
!       address@hidden
      % And this command to find another #1 command, at the beginning of a
      % line.  (Otherwise, we would consider a line address@hidden @ifset', for
      % example, to count as an @ifset for nesting.)
***************
*** 7102,7108 ****
  % \otherifyactive is called near the end of this file.
  \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
  
! % Same as @turnoffactive below, but backslash retains it's normal definition.
  % (Before 2005-08-15, this macro explicitly assigned @address@hidden,
  % but it doesn't seem to be necessary. --kasal)
  \def\normalturnoffactive{%
--- 7113,7119 ----
  % \otherifyactive is called near the end of this file.
  \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
  
! % Same as @turnoffactive below, but backslash retains its normal definition.
  % (Before 2005-08-15, this macro explicitly assigned @address@hidden,
  % but it doesn't seem to be necessary. --kasal)
  \def\normalturnoffactive{%
P ChangeLog
P doc/texinfo.tex