texinfo update (Mon Mar 21 20:52:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.478
retrieving revision 1.479
diff -c -r1.478 -r1.479
*** ChangeLog   16 Mar 2005 13:08:36 -0000      1.478
--- ChangeLog   22 Mar 2005 01:29:05 -0000      1.479
***************
*** 1,3 ****
--- 1,12 ----
+ 2005-03-21  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.txi (allowcodebreaks): new node.
+       * makeinfo/cmds.c: define @allowcodebreaks (as a no-op).
+       * doc/texinfo.tex (\allowcodebreaks): new macro.
+       (\code): use it.
+       (\realunder, \keywordtrue, \keywordfalse, \ifallowcodebreaks):
+       helpers.
+ 
  2005-03-15  gettextize  <address@hidden>
  
        * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.14.3.
Index: NEWS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/NEWS,v
retrieving revision 1.109
retrieving revision 1.110
diff -c -r1.109 -r1.110
*** NEWS        21 Mar 2005 12:50:31 -0000      1.109
--- NEWS        22 Mar 2005 01:29:05 -0000      1.110
***************
*** 1,4 ****
! $Id: NEWS,v 1.109 2005/03/21 12:50:31 karl Exp $
  This NEWS file records noteworthy changes, very tersely.
  See the manual for detailed information.
  
--- 1,4 ----
! $Id: NEWS,v 1.110 2005/03/22 01:29:05 karl Exp $
  This NEWS file records noteworthy changes, very tersely.
  See the manual for detailed information.
  
***************
*** 23,28 ****
--- 23,29 ----
  
  
-------------------------------------------------------------------------------
  * Language:
+   . new command @allowcodebreaks to control breaks at _ and - within @code.
    . new command @frenchspacing to control spacing after sentences.
  * texinfo.tex:
    . section names with \ characters work properly in pdf outlines.
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.185
retrieving revision 1.186
diff -c -r1.185 -r1.186
*** doc/texinfo.tex     20 Feb 2005 00:00:43 -0000      1.185
--- doc/texinfo.tex     22 Mar 2005 01:29:05 -0000      1.186
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-02-19.15}
  %
  % 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-03-21.17}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 1886,1893 ****
    \catcode`\_=\active
    %
    \global\def\code{\begingroup
!     \catcode`\-=\active \let-\codedash
!     \catcode`\_=\active \let_\codeunder
      \codex
    }
  }
--- 1886,1899 ----
    \catcode`\_=\active
    %
    \global\def\code{\begingroup
!     \catcode`\-=\active  \catcode`\_=\active
!     \ifallowcodebreaks
!      \let-\codedash
!      \let_\codeunder
!     \else
!      \let-\realdash
!      \let_\realunder
!     \fi
      \codex
    }
  }
***************
*** 1907,1912 ****
--- 1913,1940 ----
  }
  \def\codex #1{\tclose{#1}\endgroup}
  
+ % An additional complication: the above will allow breaks after, e.g.,
+ % each of the four underscores in __typeof__.  This is undesirable in
+ % some manuals, especially if they don't have long identifiers in
+ % general.  @allowcodebreaks provides a way to control this.
+ % 
+ \newif\ifallowcodebreaks  \allowcodebreakstrue
+ 
+ \def\keywordtrue{true}
+ \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
+ }
+ 
  % @kbd is like @code, except that if the argument is just one @key command,
  % then @kbd has no effect.
  
***************
*** 7073,7078 ****
--- 7101,7107 ----
  
  \catcode`\_=\active
  \def_{\ifusingtt\normalunderscore\_}
+ \let\realunder=_
  % Subroutine for the previous macro.
  \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
  
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.136
retrieving revision 1.137
diff -c -r1.136 -r1.137
*** doc/texinfo.txi     5 Mar 2005 22:15:02 -0000       1.136
--- doc/texinfo.txi     22 Mar 2005 01:29:05 -0000      1.137
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.136 2005/03/05 22:15:02 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.
  
--- 1,5 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.137 2005/03/22 01:29:05 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.
  
***************
*** 498,503 ****
--- 498,504 ----
  * Break Commands::              Summary of break-related commands.
  * Line Breaks::                 Forcing line breaks.
  * - and hyphenation::           Helping @TeX{} with hyphenation points.
+ * allowcodebreaks::             Controlling line breaks within @@code text.
  * w::                           Preventing unwanted line breaks in text.
  * tie::                         Inserting an unbreakable but varying space.
  * sp::                          Inserting blank lines.
***************
*** 6806,6812 ****
  @end example
  @end iftex
  
! Here are some cases for which it is preferable not to use @code{@@code}:
  
  @itemize @bullet
  @item
--- 6807,6813 ----
  @end example
  @end iftex
  
! Here are some cases for which it is preferable @emph{not} to use 
@code{@@code}:
  
  @itemize @bullet
  @item
***************
*** 6850,6855 ****
--- 6851,6861 ----
  there is no real harm in using the older commands, and of course the
  long-standing manuals do so.
  
+ Ordinarily, @TeX{} will consider breaking lines at @samp{-} and
+ @samp{_} characters within @code{@@code} and related commands.  This
+ can be controlled with @code{@@allowcodebreaks}
+ (@pxref{allowcodebreaks,,@code{@@allowcodebreaks}}).
+ 
  
  @node kbd
  @subsection @code{@@address@hidden@address@hidden
***************
*** 11112,11117 ****
--- 11118,11124 ----
  * Break Commands::              Summary of break-related commands.
  * Line Breaks::                 Forcing line breaks.
  * - and hyphenation::           Helping @TeX{} with hyphenation points.
+ * allowcodebreaks::             Controlling line breaks within @@code text.
  * w::                           Preventing unwanted line breaks in text.
  * tie::                         Inserting an unbreakable but varying space.
  * sp::                          Inserting blank lines.
***************
*** 11244,11253 ****
  @@address@hidden address@hidden
  @end example
  @noindent @TeX{} only uses the specified hyphenation points when the
! words match exactly, so give all necessary variants.
  @end table
  
! Info output is not hyphenated, so these commands have no effect there.
  
  
  @node w
--- 11251,11301 ----
  @@address@hidden address@hidden
  @end example
  @noindent @TeX{} only uses the specified hyphenation points when the
! words match exactly, so give all necessary variants, such as plurals.
  @end table
  
! Info, HTML, and other address@hidden output is not hyphenated, so none of
! these commands have any effect there.
! 
! 
! @node allowcodebreaks
! @section @code{@@allowcodebreaks}: Control line breaks in @code{@@code}
! 
! @findex allowcodebreaks
! @cindex Breaks, within @code{@@code}
! @cindex -, breakpoint within @code{@@code}
! @cindex Hyphen, breakpoint within @code{@@code}
! @cindex Dash, breakpoint within @code{@@code}
! @cindex _, breakpoint within @code{@@code}
! @cindex Underscore, breakpoint within @code{@@code}
! 
! Ordinarily, @TeX{} will consider breaking lines at @samp{-} and
! @samp{_} characters within @code{@@code} and related commands
! (@pxref{code,,@code{@@code}}), more or less as if they were ``empty''
! hyphenation points.
! 
! This is necessary as many manuals, especially for Lisp-family
! languages, must document very long identifiers.  On the other hand,
! other manuals don't have this problems, and you may not wish to allow
! a line break at the underscore in, for example, @code{SIZE_MAX}, or
! even worse, after any of the four underscores in @code{__typeof__}.
! 
! So Texinfo provides this command:
! 
! @example
! @@allowcodebreaks false
! @end example
! 
! @noindent to prevent @TeX{} from breaking at @samp{-} or @samp{_} within
! @code{@@code}.  You can go back to allowing such breaks with
! @code{@@allowcodebreaks true}.  Write these commands on lines by
! themselves.
! 
! These commands can be given anywhere in the document.  For example,
! you may have just one problematic paragraph where you need to turn off
! the breaks, but want them in general, or vice versa.
! 
! This command has no effect in Info, HTML, and other address@hidden output.
  
  
  @node w
***************
*** 18534,18540 ****
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.136 2005/03/05 22:15:02 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}
--- 18582,18588 ----
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.137 2005/03/22 01:29:05 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}
***************
*** 18600,18606 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.136 2005/03/05 22:15:02 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18648,18654 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.137 2005/03/22 01:29:05 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -c -r1.57 -r1.58
*** makeinfo/cmds.c     14 Feb 2005 00:20:27 -0000      1.57
--- makeinfo/cmds.c     22 Mar 2005 01:29:05 -0000      1.58
***************
*** 1,5 ****
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.57 2005/02/14 00:20:27 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
--- 1,5 ----
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.58 2005/03/22 01:29:05 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
***************
*** 91,96 ****
--- 91,97 ----
    { "afourpaper", cm_ignore_line, NO_BRACE_ARGS },
    { "afourwide", cm_ignore_line, NO_BRACE_ARGS },
    { "alias", cm_alias, NO_BRACE_ARGS },
+   { "allowcodebreaks", cm_ignore_line, NO_BRACE_ARGS },
    { "anchor", cm_anchor, BRACE_ARGS },
    { "appendix", cm_appendix, NO_BRACE_ARGS },
    { "appendixsection", cm_appendixsec, NO_BRACE_ARGS },
P ChangeLog
P NEWS
P doc/texinfo.tex
P doc/texinfo.txi
P makeinfo/cmds.c