[6369] doc tweaks

[karl]

Revision: 6369
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6369
Author:   karl
Date:     2015-07-01 14:25:28 +0000 (Wed, 01 Jul 2015)
Log Message:
-----------
doc tweaks

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/README-hacking
    trunk/build-aux/texinfo.tex
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-06-30 12:08:13 UTC (rev 6368)
+++ trunk/ChangeLog     2015-07-01 14:25:28 UTC (rev 6369)
@@ -1,3 +1,9 @@
+2015-07-01  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex: doc tweaks.
+
+       * README-hacking: more doc updates for 6.0 release.
+
 2015-06-30  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Convert/Line.pm, tp/Texinfo/Convert/Paragraph.pm,

Modified: trunk/README-hacking
===================================================================
--- trunk/README-hacking        2015-06-30 12:08:13 UTC (rev 6368)
+++ trunk/README-hacking        2015-07-01 14:25:28 UTC (rev 6369)
@@ -146,7 +146,7 @@
 
 - To do the actual upload:
 pkg=texinfo
-ver=5.2
+ver=6.0
 
 then do one of:
 gnupload --to alpha.gnu.org:$pkg $pkg-$ver.tar.xz                #pretest
@@ -178,7 +178,7 @@
 configure.ac if it was needed, but check again.  See comments in
 configure.ac, and run (at the top level) make dtd-check.
 
-# ... set up dtd directory on web pages:
+#  ... set up dtd directory on web pages:
 cd $HOME/gnu/www/texinfo/dtd # or wherever webpages checkout is
 mkdir $ver && cvs add $ver
 cp $tutil/texinfo.dtd $ver
@@ -188,18 +188,18 @@
 # If -kb is forgotten, CVS will do its own $Id expansion.
 # Recover by editing and committing a new version of texinfo.dtd in svn,
 # copying it again to the cvs dir, then:
-# cvs admin -kb texinfo.dtd; cvs update -A.
+#   cvs admin -kb texinfo.dtd; cvs update -A
 # (See the "How to store binary files" node in the CVS manual.)
 
 #  ... tag source tree (use your own username before @):
-svn copy -r 5382 -m'texinfo_5_2 tag based on r5382' \
+svn copy -r 6363 -m'texinfo_6_0 tag based on r6363' \
   svn+ssh://address@hidden/texinfo/trunk \
-  svn+ssh://address@hidden/texinfo/tags/texinfo_5_2
+  svn+ssh://address@hidden/texinfo/tags/texinfo_6_0
 [for karl: /srv/svn/texinfo]  
 
   ... update texinfo at tug.org (contact address@hidden); from last time:
-prev=5.1
-ver=5.2
+prev=5.2
+ver=6.0
 cd ~ftp/tex
 rm -rf texinfo-$prev*
 cp ~/texinfo-$ver.tar.{gz,xz} .
@@ -214,8 +214,8 @@
 news item at savannah.
 
   ... make diffs at official release:
-prev=5.1
-ver=5.2
+prev=5.2
+ver=6.0
 cd $misc/archive/$pkg/prod
 tar xf $txi/texinfo-$ver.tar.gz
 tar xf texinfo-$prev.tar.gz
@@ -227,4 +227,4 @@
   
   ... [personal for karl] move mail:
 mv ~/mail/txi.done $ver.mail
-gzip $ver.mail
+bzip2 $ver.mail

Modified: trunk/build-aux/texinfo.tex
===================================================================
--- trunk/build-aux/texinfo.tex 2015-06-30 12:08:13 UTC (rev 6368)
+++ trunk/build-aux/texinfo.tex 2015-07-01 14:25:28 UTC (rev 6369)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2015-06-14.15}
+\def\texinfoversion{2015-07-01.07}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -277,6 +277,7 @@
 % described on page 260 of The TeXbook.  It involves outputting two
 % marks for the sectioning macros, one before the section break, and
 % one after.  I won't pretend I can describe this better than DEK...
+%
 \def\domark{%
   \toks0=\expandafter{\lastchapterdefs}%
   \toks2=\expandafter{\lastsectiondefs}%
@@ -6881,7 +6882,7 @@
 % typesetting commands (@smallbook, font changes, etc.) have to be done
 % beforehand -- and a) we want @copying to be done first in the source
 % file; b) letting users define the frontmatter in as flexible order as
-% possible is very desirable.
+% possible is desirable.
 %
 \def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
 address@hidden copying{\endgroup\def\copyingtext{#1}}
@@ -7449,6 +7450,12 @@
 %
 % \anythingelse will almost certainly be an error of some kind.
 
+\def\macrolineargctxt{% used for whole-line arguments without braces
+  \scanctxt
+  \catcode`\{=\other
+  \catcode`\}=\other
+}
+
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
 % where N is the macro parameter number.
@@ -7522,12 +7529,14 @@
 % This makes use of the obscure feature that if the last token of a
 % <parameter list> is #, then the preceding argument is delimited by
 % an opening brace, and that opening brace is not consumed.
+% 
 \def\getargs#1{\getargsxxx#1{}}
 \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
 \def\getmacname#1 #2\relax{\macname={#1}}
 \def\getmacargs#1{\def\argl{#1}}
 
-% For macro processing make @ a letter so that we can make Texinfo private 
macro names.
+% For macro processing make @ a letter so that we can make
+% private-to-Texinfo macro names.
 address@hidden
 \catcode address@hidden
 
@@ -7558,6 +7567,7 @@
 %
 % If you compile with TeX (not eTeX), and you have macros with 10 or more
 % arguments, no macro can have more than 256 arguments (else error).
+% 
 \def\parsemargdef#1;{%
   \paramno=0\def\paramlist{}%
   \let\hash\relax
@@ -7601,7 +7611,6 @@
 % These two commands read recursive and nonrecursive macro bodies.
 % (They're different since rec and nonrec macros end differently.)
 %
-
 \catcode address@hidden
 address@hidden macro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
@@ -7637,7 +7646,8 @@
   \fi
 }
 
-% 
+% Internal for address@hidden
+%  
 \def\getargvals@@{%
   \ifx\paramlist\nilm@
       % Some sanity check needed here that \argvaluelist is also empty.
@@ -7681,7 +7691,8 @@
 }
 
 % Replace arguments by their values in the macro body, and place the result
-% in macro address@hidden
+% in macro address@hidden
+% 
 address@hidden
   %  To do this we use the property that token registers that are \the'ed
   % within an \edef  expand only once. So we are going to place all argument
@@ -7705,8 +7716,9 @@
   address@hidden@tempc}%
   }
 
+% Define the named-macro outside of this group and then close this group. 
+% 
 address@hidden 
-  %% Define the named-macro outside of this group and then close this group. 
   \expandafter
   \endgroup
   \macargdeflist@
@@ -7743,14 +7755,17 @@
   \next
 }
 
-% Save the token stack pointer into macro #1
+% Save the token stack pointer into macro #1:
 address@hidden
-% Restore the token stack pointer from number in macro #1
address@hidden
-% newtoks that can be used non \outer .
+%
+% Restore the token stack pointer from number in macro #1:
+\def\texirestoretoksstackpoint#1{\expandafter\mathchardef
+  address@hidden
+% Variant \newtoks that can be used non-\outer:
 \def\texinonouternewtoks{\alloc@ 5\toks \toksdef address@hidden
 
-% Tailing missing arguments are set to empty
+% Tailing missing arguments are set to empty.
+% 
 address@hidden
   \ifx\paramlist\nilm@
     \let\next\macargexpandinbody@
@@ -7795,7 +7810,7 @@
         \noexpand\scanmacro{\temp}}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
+         \bgroup
          \noexpand\braceorline
          \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
@@ -7828,7 +7843,7 @@
         \noexpand\scanmacro{\temp}\egroup}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
+         \bgroup
          \noexpand\braceorline
          \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
@@ -7860,19 +7875,20 @@
     \fi
   \fi}
 
-\catcode address@hidden
+\catcode address@hidden % end private-to-Texinfo catcodes
 
 \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
 
-% \braceorline decides whether the next nonwhitespace character is a
-% {.  If so it reads up to the closing }, if not, it reads the whole
-% line.  Whatever was read is then fed to the next control sequence
-% as an argument (by \parsebrace or \parsearg).
+% \braceorline MAC is used for a one-argument macro MAC.  It checks
+% whether the next non-whitespace character is a {.  It sets the context
+% for reading the argument (slightly different in the two cases).  Then,
+% to read the argument, in the whole-line case, it then calls the
+% regular \parsearg MAC; in the lbrace case, it just calls MAC itself.
 % 
 \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
-  \ifx\nchar\bgroup\else
-    \expandafter\parsearg
+  \ifx\nchar\bgroup\macroargctxt
+  \else\macrolineargctxt\expandafter\parsearg
   \fi \macnamexxx}
 
 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-06-30 12:08:13 UTC (rev 6368)
+++ trunk/doc/texinfo.tex       2015-07-01 14:25:28 UTC (rev 6369)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2015-06-24.23}
+\def\texinfoversion{2015-07-01.07}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -277,6 +277,7 @@
 % described on page 260 of The TeXbook.  It involves outputting two
 % marks for the sectioning macros, one before the section break, and
 % one after.  I won't pretend I can describe this better than DEK...
+%
 \def\domark{%
   \toks0=\expandafter{\lastchapterdefs}%
   \toks2=\expandafter{\lastsectiondefs}%
@@ -6881,7 +6882,7 @@
 % typesetting commands (@smallbook, font changes, etc.) have to be done
 % beforehand -- and a) we want @copying to be done first in the source
 % file; b) letting users define the frontmatter in as flexible order as
-% possible is very desirable.
+% possible is desirable.
 %
 \def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
 address@hidden copying{\endgroup\def\copyingtext{#1}}
@@ -7528,12 +7529,14 @@
 % This makes use of the obscure feature that if the last token of a
 % <parameter list> is #, then the preceding argument is delimited by
 % an opening brace, and that opening brace is not consumed.
+% 
 \def\getargs#1{\getargsxxx#1{}}
 \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
 \def\getmacname#1 #2\relax{\macname={#1}}
 \def\getmacargs#1{\def\argl{#1}}
 
-% For macro processing make @ a letter so that we can make Texinfo private 
macro names.
+% For macro processing make @ a letter so that we can make
+% private-to-Texinfo macro names.
 address@hidden
 \catcode address@hidden
 
@@ -7564,6 +7567,7 @@
 %
 % If you compile with TeX (not eTeX), and you have macros with 10 or more
 % arguments, no macro can have more than 256 arguments (else error).
+% 
 \def\parsemargdef#1;{%
   \paramno=0\def\paramlist{}%
   \let\hash\relax
@@ -7607,7 +7611,6 @@
 % These two commands read recursive and nonrecursive macro bodies.
 % (They're different since rec and nonrec macros end differently.)
 %
-
 \catcode address@hidden
 address@hidden macro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
@@ -7643,7 +7646,8 @@
   \fi
 }
 
-% 
+% Internal for address@hidden
+%  
 \def\getargvals@@{%
   \ifx\paramlist\nilm@
       % Some sanity check needed here that \argvaluelist is also empty.
@@ -7687,7 +7691,8 @@
 }
 
 % Replace arguments by their values in the macro body, and place the result
-% in macro address@hidden
+% in macro address@hidden
+% 
 address@hidden
   %  To do this we use the property that token registers that are \the'ed
   % within an \edef  expand only once. So we are going to place all argument
@@ -7711,8 +7716,9 @@
   address@hidden@tempc}%
   }
 
+% Define the named-macro outside of this group and then close this group. 
+% 
 address@hidden 
-  %% Define the named-macro outside of this group and then close this group. 
   \expandafter
   \endgroup
   \macargdeflist@
@@ -7749,14 +7755,17 @@
   \next
 }
 
-% Save the token stack pointer into macro #1
+% Save the token stack pointer into macro #1:
 address@hidden
-% Restore the token stack pointer from number in macro #1
address@hidden
-% newtoks that can be used non \outer .
+%
+% Restore the token stack pointer from number in macro #1:
+\def\texirestoretoksstackpoint#1{\expandafter\mathchardef
+  address@hidden
+% Variant \newtoks that can be used non-\outer:
 \def\texinonouternewtoks{\alloc@ 5\toks \toksdef address@hidden
 
-% Tailing missing arguments are set to empty
+% Tailing missing arguments are set to empty.
+% 
 address@hidden
   \ifx\paramlist\nilm@
     \let\next\macargexpandinbody@
@@ -7866,19 +7875,20 @@
     \fi
   \fi}
 
-\catcode address@hidden
+\catcode address@hidden % end private-to-Texinfo catcodes
 
 \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
 
-% \braceorline decides whether the next nonwhitespace character is a
-% {.  If so it reads up to the closing }, if not, it reads the whole
-% line.  Whatever was read is then fed to the next control sequence
-% as an argument (by \parsebrace or \parsearg).
+% \braceorline MAC is used for a one-argument macro MAC.  It checks
+% whether the next non-whitespace character is a {.  It sets the context
+% for reading the argument (slightly different in the two cases).  Then,
+% to read the argument, in the whole-line case, it then calls the
+% regular \parsearg MAC; in the lbrace case, it just calls MAC itself.
 % 
 \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
-  \ifx\nchar\bgroup\macroargctxt\else
-    \macrolineargctxt\expandafter\parsearg
+  \ifx\nchar\bgroup\macroargctxt
+  \else\macrolineargctxt\expandafter\parsearg
   \fi \macnamexxx}