texinfo ChangeLog NEWS doc/texinfo.txi doc/texi...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/09/05 00:49:41

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

Log message:
        allow multiple-line titles

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1402&r2=1.1403
http://cvs.savannah.gnu.org/viewcvs/texinfo/NEWS?cvsroot=texinfo&r1=1.214&r2=1.215
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.467&r2=1.468
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.371&r2=1.372

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1402
retrieving revision 1.1403
diff -u -b -r1.1402 -r1.1403
--- ChangeLog   4 Sep 2012 17:28:26 -0000       1.1402
+++ ChangeLog   5 Sep 2012 00:49:41 -0000       1.1403
@@ -1,4 +1,13 @@
-2012-09-03  Patrice Dumas  <address@hidden>
+2012-09-04  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\raggedtitlesettings): new macro.
+       (\title): call it, and typeset the title inside a \vbox,
+       so a long title can be broken with @*
+       (\*): \unskip to remove preceding glue, since we're going
+       to break the line anyway.  Can make a difference especially inside
+       \title.
+
+2012-09-04  Patrice Dumas  <address@hidden>
         and Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Quotations and Examples): general updates.

Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- NEWS        6 Jul 2012 18:34:57 -0000       1.214
+++ NEWS        5 Sep 2012 00:49:41 -0000       1.215
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.214 2012/07/06 18:34:57 karl Exp $
+$Id: NEWS,v 1.215 2012/09/05 00:49:41 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -25,24 +25,24 @@
 
 * Language:
   . Texinfo commands are supported in node names.
+  . #line directives are recognized.
   . new commands @inlinefmt and @inlineraw for brace-delimited conditionals.
   . new command @part for a group of chapters.
   . new environments @raggedright and @smallquotation.
   . new commands @codequoteundirected and @codequotebacktick,
       for a better interface than the @set variables.
+  . new command @xrefautomaticsectiontitle to allow using section titles
+      in cross references by default, instead of node names.
+  . new commands for Texinfo special characters:
+    @atchar{} @lbracechar{} @rbracechar{} @backslashchar{} @hashchar{}.
   . new commands @deftypefnnewline to print return types on their own lines.
   . new command @headitemfont for the sake of template rows.
   . new command @urefbreakstyle to control breaking of @url/@uref in TeX.
-  . new command @xrefautomaticsectiontitle to allow using section titles
-      in cross references by default, instead of node names.
   . new diacritic command @ogonek.
   . new commands for Icelandic letters eth and thorn: @DH{} @dh{} @TH{} @th{}.
-  . new commands for Texinfo special characters:
-    @atchar{} @lbracechar{} @rbracechar{} @backslashchar{} @hashchar{}.
   . new command @errormsg to report an error.
   . five-argument xrefs can refer to a whole manual, by omitting the
       section name and either omitting the node name or using "Top".
-  . #line directives are recognized.
   . DEL (0x7f = 0177 = 127) is a true comment character (catcode 14 in TeX).
 
 * texi2any is the new generic converter for Texinfo that can produce all
@@ -70,6 +70,7 @@
   . support some per-language hyphenation, when the underlying TeX
     engine does (for instance, etex/pdfetex from TeX Live 2008 or
     later).  Words with accented letters are still not handled properly.
+  . @title, text will be broken if needed, and @* can be used to override.
   . new Icelandic translation: txi-is.tex.
   . new Hungarian translation: txi-hu.tex.
   . official updates between full package releases available at
@@ -99,6 +100,9 @@
     are now possible.
 
 * Distribution:
+  . new file htmlxref.cnf is installed to support cross-manual
+    references; official updates between full package releases available at
+    http://ftpmirror.gnu.org/texinfo/htmlxref.cnf.
   . language support for no removed/renamed to nb, per Norwegian translators.
   . new translations: id it.
   . documentation license now GFDLv1.3 or later.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -b -r1.467 -r1.468
--- doc/texinfo.txi     4 Sep 2012 17:28:27 -0000       1.467
+++ doc/texinfo.txi     5 Sep 2012 00:49:41 -0000       1.468
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.467 2012/09/04 17:28:27 karl Exp $
address@hidden $Id: texinfo.txi,v 1.468 2012/09/05 00:49:41 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.
 
@@ -3441,21 +3441,19 @@
 
 The @code{@@title} command produces a line in which the title is set
 flush to the left-hand side of the page in a larger than normal font.
-The title is underlined with a black rule.  Only a single line is
-allowed; the @code{@@*} command may not be used to break the title into
-two lines.  To handle very long titles, you may find it profitable to
-use both @code{@@title} and @code{@@titlefont}; see the final example in
-this section.
+The title is underlined with a black rule.  The title must be given on
+a single line in the source file; it will be broken into multiple
+lines of output is needed.  The @code{@@*} command may be used to
+specify the line breaks in long titles if the automatic breaks do not
+suit.
 
 The @code{@@subtitle} command sets subtitles in a normal-sized font
 flush to the right-hand side of the page.
 
 The @code{@@author} command sets the names of the author or authors in
 a middle-sized font flush to the left-hand side of the page on a line
-near the bottom of the title page.  The names are underlined with a
-black rule that is thinner than the rule that underlines the title.
-(The black rule only occurs if the @code{@@author} command line is
-followed by an @code{@@page} command line.)
+near the bottom of the title page.  The names are followed by a black
+rule that is thinner than the rule that underlines the title.
 
 There are two ways to use the @code{@@author} command: you can write
 the name or names on the remaining part of the line that starts with
@@ -3466,7 +3464,7 @@
 @end example
 
 @noindent
-or you can write the names one above each other by using two (or more)
+or you can write the names one above each other by using multiple
 @code{@@author} commands:
 
 @example
@@ -3476,9 +3474,6 @@
 @end group
 @end example
 
address@hidden
-(Only the bottom name is underlined with a black rule.)
-
 @need 950
 A template for this method looks like this:
 
@@ -3495,25 +3490,6 @@
 @end group
 @end example
 
-You may also combine the @code{@@titlefont} method described in the
-previous section and @code{@@title} method described in this one.  This
-may be useful if you have a very long title.  Here is a real-life example:
-
address@hidden
address@hidden
-@@titlepage
-@@address@hidden address@hidden
-@@sp 1
-@@title for MS-Windows and MS-DOS
-@@subtitle Edition @@address@hidden@} for Release @@address@hidden@}
-@@author by Daniel Hagerty, Melissa Weisshaus
-@@author and Eli Zaretskii
address@hidden group
address@hidden example
-
address@hidden
-(The use of @code{@@value} here is explained in @ref{value Example}.
-
 
 @node Copyright
 @subsection Copyright Page
@@ -21874,7 +21850,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.467 2012/09/04 17:28:27 karl Exp $
+$Id: texinfo.txi,v 1.468 2012/09/05 00:49:41 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}

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -b -r1.371 -r1.372
--- doc/texinfo.tex     13 Aug 2012 22:47:06 -0000      1.371
+++ doc/texinfo.tex     5 Sep 2012 00:49:41 -0000       1.372
@@ -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{2012-07-29.17}
+\def\texinfoversion{2012-09-04.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -594,7 +594,7 @@
 \def\:{\spacefactor=1000 }
 
 % @* forces a line break.
-\def\*{\hfil\break\hbox{}\ignorespaces}
+\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
 
 % @/ allows a line break.
 \let\/=\allowbreak
@@ -3269,6 +3269,19 @@
   \finishedtitlepagetrue
 }
 
+% Settings used for typesetting titles: no hyphenation, no indentation,
+% don't worry much about spacing, ragged right.  This should be used
+% inside a \vbox, and fonts need to be set appropriately first.  Because
+% it is always used for titles, nothing else, we call \rmisbold.
+% 
+\def\raggedtitlesettings{%
+  \rmisbold
+  \hyphenpenalty=10000
+  \parindent=0pt
+  \tolerance=5000
+  \ptexraggedright
+}
+
 % Macros to be used within @titlepage:
 
 \let\subtitlerm=\tenrm
@@ -3276,7 +3289,7 @@
 
 \parseargdef\title{%
   \checkenv\titlepage
-  \leftline{\titlefonts\rmisbold #1}
+  \vbox{\titlefonts \raggedtitlesettings #1}
   % print a rule at the page bottom also.
   \finishedtitlepagefalse
   \vskip4pt \hrule height 4pt width \hsize \vskip4pt