texinfo ChangeLog doc/texinfo.tex doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       09/01/19 01:35:22

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex texinfo.txi 

Log message:
        try to give an error earlier with an erroneous @item command

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.974&r2=1.975
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.293&r2=1.294
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.237&r2=1.238

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -b -r1.974 -r1.975
--- ChangeLog   19 Jan 2009 01:03:36 -0000      1.974
+++ ChangeLog   19 Jan 2009 01:35:21 -0000      1.975
@@ -1,5 +1,12 @@
 2009-01-18  Karl Berry  <address@hidden>
 
+       * doc/texinfo.tex (\doitemize): try typesetting the item mark,
+       in case the user erroneously said @itemize @samp, to give an error
+       earlier.  Report from Bruce Korb, help-texinfo 02 Nov 2008 10:38:30.
+       * doc/texinfo.txi (itemize): document that @w{} (with the braces)
+       must be used to get an empty item mark.  (Clearly no one had
+       actually done this.)
+
        * doc/texinfo.txi (Indexing Commands): document that index
        commands should precede the indexed material.
 

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -b -r1.293 -r1.294
--- doc/texinfo.tex     6 Jan 2009 05:50:57 -0000       1.293
+++ doc/texinfo.tex     19 Jan 2009 01:35:21 -0000      1.294
@@ -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{2009-01-05.21}
+\def\texinfoversion{2009-01-18.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1578,7 +1578,8 @@
       address@hidden@}%
       \let\/=\empty
       \makevalueexpandable
-      % \indexnofonts -- is that what we want?
+      % do we want to go so far as to use \indexnofonts instead of just
+      % special-casing \var here?
       \def\var##1{##1}%
       %
       \leavevmode\setcolor{\urlcolor}%
@@ -3418,9 +3419,18 @@
   \parindent=0pt
   \parskip=\smallskipamount
   \ifdim\parskip=0pt \parskip=2pt \fi
+  %
+  % Try typesetting the item mark that if the document erroneously says
+  % something like @itemize @samp (intending @table), there's an error
+  % right away at the @itemize.  It's not the best error message in the
+  % world, but it's better than leaving it to the @item.  This means if
+  % the user wants an empty mark, they have to say @w{} not just @w.
   \def\itemcontents{#1}%
+  \setbox0 = \hbox{\itemcontents}%
+  %
   % @itemize with no arg is equivalent to @itemize @bullet.
   \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
+  %
   \let\item=\itemizeitem
 }
 
@@ -3441,6 +3451,7 @@
    \ifnum\lastpenalty<10000 \parskip=0in \fi
    \noindent
    \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
+   %
    \vadjust{\penalty 1200}}% not good to break after first line of item.
   \flushcr
 }

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- doc/texinfo.txi     19 Jan 2009 01:03:37 -0000      1.237
+++ doc/texinfo.txi     19 Jan 2009 01:35:21 -0000      1.238
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.237 2009/01/19 01:03:37 karl Exp $
address@hidden $Id: texinfo.txi,v 1.238 2009/01/19 01:35:21 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -8637,11 +8637,11 @@
 Texinfo command that generates a mark.  Usually, you will write
 @code{@@bullet} after @code{@@itemize}, but you can use
 @code{@@minus}, or any command or character that results in a single
-character in the Info file.  If you don't want any mark at all, use
address@hidden@@w}.  (When you write the mark command such as
+character in the Info file.  (When you write the mark command such as
 @code{@@bullet} after an @code{@@itemize} command, you may omit the
 @address@hidden@}}.)  If you don't specify a mark command, the default is
address@hidden@@bullet}.
address@hidden@@bullet}.  If you don't want any mark at all, use
address@hidden@@address@hidden@}} (in this case the braces are required).
 
 Write the text of the indented paragraphs themselves after the
 @code{@@itemize}, up to another line that says @code{@@end
@@ -19257,7 +19257,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.237 2009/01/19 01:03:37 karl Exp $
+$Id: texinfo.txi,v 1.238 2009/01/19 01:35:21 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -19333,7 +19333,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.237 2009/01/19 01:03:37 karl Exp $
address@hidden $Id: texinfo.txi,v 1.238 2009/01/19 01:35:21 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi