texinfo update (Fri May 20 10:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.502
retrieving revision 1.503
diff -c -r1.502 -r1.503
*** ChangeLog   19 May 2005 06:51:00 -0000      1.502
--- ChangeLog   20 May 2005 13:59:55 -0000      1.503
***************
*** 1,3 ****
--- 1,10 ----
+ 2005-05-20  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.texi (\allowcodebreaks, \kbdinputstyle): use \txiarg
+       instead of \arg; \arg already has a meaning in plain TeX (the
+       complex math function "arg").
+       Report from: Brian Gough, 19 May 2005 19:48:57 +0100.
+ 
  2005-05-19  Stepan Kasal  <address@hidden>
  
        * configure.ac (AM_GNU_GETTEXT): The comment should not recommend
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.188
retrieving revision 1.189
diff -c -r1.188 -r1.189
*** doc/texinfo.tex     15 May 2005 00:00:06 -0000      1.188
--- doc/texinfo.tex     20 May 2005 13:59:55 -0000      1.189
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-04-17.16}
  %
  % 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-05-20.06}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 1924,1937 ****
  \def\keywordfalse{false}
  
  \parseargdef\allowcodebreaks{%
!   \def\arg{#1}%
!   \ifx\arg\keywordtrue
      \allowcodebreakstrue
!   \else\ifx\arg\keywordfalse
      \allowcodebreaksfalse
    \else
      \errhelp = \EMsimple
!     \errmessage{Unknown @allowcodebreaks option `\arg'}%
    \fi\fi
  }
  
--- 1924,1937 ----
  \def\keywordfalse{false}
  
  \parseargdef\allowcodebreaks{%
!   \def\txiarg{#1}%
!   \ifx\txiarg\keywordtrue
      \allowcodebreakstrue
!   \else\ifx\txiarg\keywordfalse
      \allowcodebreaksfalse
    \else
      \errhelp = \EMsimple
!     \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
    \fi\fi
  }
  
***************
*** 1942,1957 ****
  %   `example' (@kbd uses ttsl only inside of @example and friends),
  %   or `code' (@kbd uses normal tty font always).
  \parseargdef\kbdinputstyle{%
!   \def\arg{#1}%
!   \ifx\arg\worddistinct
      \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
!   \else\ifx\arg\wordexample
      \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
!   \else\ifx\arg\wordcode
      \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
    \else
      \errhelp = \EMsimple
!     \errmessage{Unknown @kbdinputstyle option `\arg'}%
    \fi\fi\fi
  }
  \def\worddistinct{distinct}
--- 1942,1957 ----
  %   `example' (@kbd uses ttsl only inside of @example and friends),
  %   or `code' (@kbd uses normal tty font always).
  \parseargdef\kbdinputstyle{%
!   \def\txiarg{#1}%
!   \ifx\txiarg\worddistinct
      \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
!   \else\ifx\txiarg\wordexample
      \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
!   \else\ifx\txiarg\wordcode
      \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
    \else
      \errhelp = \EMsimple
!     \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
    \fi\fi\fi
  }
  \def\worddistinct{distinct}
P ChangeLog
P doc/texinfo.tex