texinfo/doc texinfo.tex,1.14,1.15 texinfo.txi,1.11,1.12

[karl]

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

Modified Files:
        texinfo.tex texinfo.txi 
Log Message:
new command @comma{}

Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** texinfo.tex 2003/12/19 19:08:03     1.14
--- texinfo.tex 2003/12/21 20:50:02     1.15
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2003-12-19.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{2003-12-21.10}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 569,572 ****
--- 569,575 ----
    address@hidden
  !endgroup
+ 
+ % @comma{} to avoid , parsing problems.
+ \let\comma = ,
  
  % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent

Index: texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** texinfo.txi 2003/12/19 19:08:03     1.11
--- texinfo.txi 2003/12/21 20:50:02     1.12
***************
*** 390,394 ****
  * itemx::                       How to put more entries in the first column.
  
! Multi-column Tables
  
  * Multitable Column Widths::    Defining multitable column widths.
--- 390,394 ----
  * itemx::                       How to put more entries in the first column.
  
! @code{@@multitable}: Multi-column Tables
  
  * Multitable Column Widths::    Defining multitable column widths.
***************
*** 413,417 ****
  Special Insertions
  
! * Braces Atsigns::              How to insert braces, @samp{@@}.
  * Inserting Space::             How to insert the right amount of space
                                   within a sentence.
--- 413,417 ----
  Special Insertions
  
! * Atsign Braces Comma::         Inserting @@ and @address@hidden and ,.
  * Inserting Space::             How to insert the right amount of space
                                   within a sentence.
***************
*** 428,435 ****
  * Images::                      How to include graphics.
  
! Inserting @@ and Braces
  
! * Inserting An Atsign::         How to insert @samp{@@}.
! * Inserting Braces::            How to insert @address@hidden and 
@address@hidden
  
  Inserting Space
--- 428,436 ----
  * Images::                      How to include graphics.
  
! Inserting @@ and @address@hidden and @comma{}
  
! * Inserting an Atsign::
! * Inserting Braces::
! * Inserting a Comma::
  
  Inserting Space
***************
*** 511,517 ****
  * Abstract Objects::            Commands for object-oriented programming.
  
! Abstract Objects
! * Object-Oriented Variables::
! * Object-Oriented Methods::
  
  Conditionally Visible Text
--- 512,519 ----
  * Abstract Objects::            Commands for object-oriented programming.
  
! Object-Oriented Programming
! 
! * Variables: Object-Oriented Variables:
! * Methods: Object-Oriented Methods:
  
  Conditionally Visible Text
***************
*** 538,542 ****
  * Defining Macros::             Defining and undefining new commands.
  * Invoking Macros::             Using a macro, once you've defined it.
! * Macro Details::               Beyond basic macro usage.
  * alias::                       Command aliases.
  * definfoenclose::              Customized highlighting.
--- 540,544 ----
  * Defining Macros::             Defining and undefining new commands.
  * Invoking Macros::             Using a macro, once you've defined it.
! * Macro Details::               Limitations of Texinfo macros.
  * alias::                       Command aliases.
  * definfoenclose::              Customized highlighting.
***************
*** 7288,7292 ****
  
  @node acronym
! @subsection @code{@@address@hidden@address@hidden
  @findex acronym
  
--- 7290,7294 ----
  
  @node acronym
! @subsection @code{@@address@hidden@var{acronym}[, @address@hidden
  @findex acronym
  
***************
*** 9253,9257 ****
  
  @itemize @bullet
! @item Braces and @samp{@@}.
  @item Whitespace within and around a sentence.
  @item Accents.
--- 9255,9259 ----
  
  @itemize @bullet
! @item @samp{@@} and braces and commas.
  @item Whitespace within and around a sentence.
  @item Accents.
***************
*** 9268,9272 ****
  
  @menu
! * Braces Atsigns::              How to insert braces, @samp{@@}.
  * Inserting Space::             How to insert the right amount of space
                                   within a sentence.
--- 9270,9274 ----
  
  @menu
! * Atsign Braces Comma::         Inserting @@ and @address@hidden and ,.
  * Inserting Space::             How to insert the right amount of space
                                   within a sentence.
***************
*** 9285,9293 ****
  
  
! @node Braces Atsigns
! @section Inserting @@ and Braces
! @cindex Inserting @@, braces
! @cindex Braces, inserting
! @cindex Special characters, commands to insert
  @cindex Commands to insert special characters
  
--- 9287,9293 ----
  
  
! @node Atsign Braces Comma
! @section Inserting @@ and @address@hidden and @comma{}
! @cindex Special characters, inserting
  @cindex Commands to insert special characters
  
***************
*** 9297,9311 ****
  them.
  
! Do not put braces after any of these commands; they are not
! necessary.
  
  @menu
! * Inserting An Atsign::         How to insert @samp{@@}.
! * Inserting Braces::            How to insert @address@hidden and 
@address@hidden
  @end menu
  
! @node Inserting An Atsign
! @subsection Inserting @samp{@@} with @@@@
  @findex @@ @r{(literal @samp{@@})}
  
  @code{@@@@} stands for a single @samp{@@} in either printed or Info
--- 9297,9314 ----
  them.
  
! The comma `,' is a special character only in one uncommon context:
! it separates arguments to commands that take multiple arguments.
  
  @menu
! * Inserting an Atsign::
! * Inserting Braces::
! * Inserting a Comma::
  @end menu
  
! 
! @node Inserting an Atsign
! @subsection Inserting `@@' with @code{@@@@}
  @findex @@ @r{(literal @samp{@@})}
+ @cindex Inserting @@ @r{(literal @samp{@@})}
  
  @code{@@@@} stands for a single @samp{@@} in either printed or Info
***************
*** 9316,9320 ****
  
  @node Inserting Braces
! @subsection Inserting @address@hidden and @address@hidden @@@{ and @@@}
  @findex @{ @r{(literal @address@hidden)}
  @findex @} @r{(literal @address@hidden)}
--- 9319,9324 ----
  
  @node Inserting Braces
! @subsection Inserting address@hidden' and address@hidden' with @code{@@@{} 
and @code{@@@}}
! @cindex Braces, inserting
  @findex @{ @r{(literal @address@hidden)}
  @findex @} @r{(literal @address@hidden)}
***************
*** 9327,9333 ****
  
  Do not put braces after either an @code{@@@{} or an @code{@@@}}
! command.
  
  
  @node Inserting Space
  @section Inserting Space
--- 9331,9365 ----
  
  Do not put braces after either an @code{@@@{} or an @code{@@@}}
! command.ppp
! 
! 
! @node Inserting a Comma
! @subsection Inserting `,' with @code{@@address@hidden@}}
! @cindex Commas, inserting
! @findex comma
! 
! Ordinarily, a comma `,' is a normal character that can be simply typed
! in your input where you need it.  
! 
! However, Texinfo uses the comma as a special character in one uncommon
! context: some commands, such as @code{@@acronym} (@pxref{acronym}) and
! @code{@@xref} (@pxref{Cross References}), as well as user-defined
! macros (@pxref{Defining Macros}), can take more than one argument.  In
! these cases, the comma character is used to separate arguments.
  
+ Since a comma chacter would confuse Texinfo's parsing for these
+ commands, you must use the command @address@hidden instead if you want
+ to have an actual comma in the output.  Here are some examples:
+ 
+ @example
+ @@address@hidden, A Bizarre @@address@hidden@address@hidden
+ @@address@hidden,, The @@address@hidden@} address@hidden
+ @@address@hidden argument@@address@hidden@} containing a address@hidden
+ @end example
+ 
+ Although @comma{} can be used anywhere, there is no need for it
+ anywhere except in this unusual case.
  
+ 
  @node Inserting Space
  @section Inserting Space
***************
*** 15739,15743 ****
  @item @@@@
  Stands for an at sign, @samp{@@}.
! @xref{Braces Atsigns, , Inserting @@ and braces}.
  
  @item @@\
--- 15771,15775 ----
  @item @@@@
  Stands for an at sign, @samp{@@}.
! @xref{Atsign Braces Comma, , Inserting @@ and @address@hidden and @comma{}}.
  
  @item @@\
***************
*** 15753,15761 ****
  @item @@@{
  Stands for a left brace, @address@hidden
! @xref{Braces Atsigns, , Inserting @@ and braces}.
  
  @item @@@}
  Stands for a right-hand brace, @address@hidden@*
! @xref{Braces Atsigns, , Inserting @@ and braces}.
  
  @item @@~
--- 15785,15793 ----
  @item @@@{
  Stands for a left brace, @address@hidden
! @xref{Atsign Braces Comma, , Inserting @@ and @address@hidden and @comma{}}.
  
  @item @@@}
  Stands for a right-hand brace, @address@hidden@*
! @xref{Atsign Braces Comma, , Inserting @@ and @address@hidden and @comma{}}.
  
  @item @@~
***************
*** 15894,15897 ****
--- 15926,15933 ----
  Highlight text that is an expression, a syntactically complete token
  of a program, or a program name.  @xref{code, , @code{@@address@hidden
+ 
+ @item @@address@hidden@}
+ Insert a comma `,' character; only needed when a literal comma would
+ be taken as an argument separator.  @xref{Inserting a Comma}.
  
  @item @@address@hidden@address@hidden