texinfo NEWS ChangeLog doc/texinfo.tex doc/texi...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/08 23:08:44

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

Log message:
        @indentedblock and @smallindentedblock

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/NEWS?cvsroot=texinfo&r1=1.216&r2=1.217
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1431&r2=1.1432
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.375&r2=1.376
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.487&r2=1.488

Patches:
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- NEWS        14 Sep 2012 18:18:06 -0000      1.216
+++ NEWS        8 Nov 2012 23:08:43 -0000       1.217
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.216 2012/09/14 18:18:06 karl Exp $
+$Id: NEWS,v 1.217 2012/11/08 23:08:43 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -30,7 +30,8 @@
   . new conditionals @ifcommanddefined and @ifcommandnotdefined to test
     if a Texinfo command is available.
   . new command @part for a group of chapters.
-  . new environments @raggedright and @smallquotation.
+  . new environments @raggedright, @smallquotation,
+      @indentedblock, and @smallindentedblock.
   . new commands @codequoteundirected and @codequotebacktick,
       for a better interface than the @set variables; now respected by @kbd.
   . new command @xrefautomaticsectiontitle to allow using section titles

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1431
retrieving revision 1.1432
diff -u -b -r1.1431 -r1.1432
--- ChangeLog   27 Oct 2012 18:36:49 -0000      1.1431
+++ ChangeLog   8 Nov 2012 23:08:43 -0000       1.1432
@@ -1,3 +1,14 @@
+2012-11-08  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (@indentedblock): new node for new command.
+       (Quotations and Examples, small): mention @smallindentedblock.
+       (Command List): include these two new commands.
+       * doc/refcard/txirefcard.tex: likewise.
+       * NEWS: likewise.
+       * doc/texinfo.tex (\indentedblockstart, \Eindentedblock,
+       \Esmallindentedblock): new macros to implement them.
+       (\quotationstart): can call \indentedblockstart now.
+
 2012-10-27  Karl Berry  <address@hidden>
 
        * util/gendocs.sh: remove PostScript generation, redundant with 

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -b -r1.375 -r1.376
--- doc/texinfo.tex     12 Sep 2012 23:35:58 -0000      1.375
+++ doc/texinfo.tex     8 Nov 2012 23:08:43 -0000       1.376
@@ -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-09-12.16}
+\def\texinfoversion{2012-11-08.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6559,16 +6559,9 @@
 \makedispenvdef{quotation}{\quotationstart}
 %
 \def\quotationstart{%
-  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-  \parindent=0pt
-  %
-  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \indentedblockstart % same as \indentedblock, but increase right margin too.
   \ifx\nonarrowing\relax
-    \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
-    \exdentamount = \lispnarrowing
-  \else
-    \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
 }
@@ -6594,6 +6587,32 @@
   \fi
 }
 
+% @indentedblock is like @quotation, but indents only on the left and
+% has no optional argument.
+% 
+\makedispenvdef{indentedblock}{\indentedblockstart}
+%
+\def\indentedblockstart{%
+  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+  \parindent=0pt
+  %
+  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \ifx\nonarrowing\relax
+    \advance\leftskip by \lispnarrowing
+    \exdentamount = \lispnarrowing
+  \else
+    \let\nonarrowing = \relax
+  \fi
+}
+
+% Keep a nonzero parskip for the environment, since we're doing normal filling.
+%
+\def\Eindentedblock{%
+  \par
+  {\parskip=0pt \afterenvbreak}%
+}
+\def\Esmallindentedblock{\Eindentedblock}
+
 
 % LaTeX-like @address@hidden verbatim and @verb{<char>...<char>}
 % If we want to allow any <char> as delimiter,

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -b -r1.487 -r1.488
--- doc/texinfo.txi     23 Sep 2012 18:09:47 -0000      1.487
+++ doc/texinfo.txi     8 Nov 2012 23:08:44 -0000       1.488
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.487 2012/09/23 18:09:47 karl Exp $
address@hidden $Id: texinfo.txi,v 1.488 2012/11/08 23:08:44 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.
 
@@ -367,6 +367,7 @@
 
 * Block Enclosing Commands::    Different constructs for different purposes.
 * quotation::                   Writing a quotation.
+* @code{@@indentedblock}::               Block of text indented on left.
 * example::                     Writing an example in a fixed-width font.
 * verbatim::                    Writing a verbatim example.
 * verbatiminclude::             Including a file verbatim.
@@ -8001,6 +8002,7 @@
 @menu
 * Block Enclosing Commands::    Different constructs for different purposes.
 * quotation::                   Writing a quotation.
+* @code{@@indentedblock}::               Block of text indented on left.
 * example::                     Writing an example in a fixed-width font.
 * verbatim::                    Writing a verbatim example.
 * verbatiminclude::             Including a file verbatim.
@@ -8029,6 +8031,9 @@
 Indicate text that is quoted. The text is filled, indented (from both
 margins), and printed in a roman font by default.
 
address@hidden @@indentedblock
+Like @code{@@quotation}, but the text is indented only on the left.
+
 @item @@example
 Illustrate code, commands, and the like. The text is printed
 in a fixed-width font, and indented but not filled.
@@ -8053,6 +8058,7 @@
 selected), but the text is not indented.
 
 @item @@smallquotation
address@hidden @@smallindentedblock
 @itemx @@smallexample
 @itemx @@smalllisp
 @itemx @@smalldisplay
@@ -8093,8 +8099,8 @@
 
 @itemize @bullet
 @item
-the margins are closer to the center of the page, so the whole of the
-quotation is indented;
+both the left and right margins are closer to the center of the page,
+so the whole of the quotation is indented;
 
 @item
 the first lines of paragraphs are indented no more than other lines; and
@@ -8176,7 +8182,40 @@
 
 @findex smallquotation
 Texinfo also provides a command @code{@@smallquotation}, which is just
-like @code{@@quotation} but uses a smaller font size.  @xref{small}.
+like @code{@@quotation} but uses a smaller font size where possible.
address@hidden
+
+
address@hidden @code{@@indentedblock}
address@hidden @code{@@indentedblock}: Indented text blocks
address@hidden Indented text block
address@hidden indentedblock
+
+The @code{@@indentedblock} environment is similar to
address@hidden@@quotation}, except that text is only indented on the left (and
+there is no optional argument for an author).  Thus, the text font
+remains unchanged, and text is gathered and filled as usual, but the
+left margin is increased.  For example:
+
address@hidden
+This is an example of text written between an @code{@@indentedblock}
+command and an @code{@@end indentedblock} command.  The
address@hidden@@indentedblock} environment can contain any text or other
+commands desired.
address@hidden indentedblock
+
+This is written in the Texinfo source as:
+
address@hidden
+@@indentedblock
+This is an example ...
+@@end indentedblock
address@hidden example
+
address@hidden smallindentedblock
+Texinfo also provides a command @code{@@smallindentedblock}, which is
+just like @code{@@indentedblock} but uses a smaller font size where
+possible.  @xref{small}.
 
 
 @node example
@@ -8390,16 +8429,20 @@
 
 In addition to the regular @code{@@example} and similar commands,
 Texinfo has ``small'' example-style commands.  These are
address@hidden@@smallquotation}, @code{@@smalldisplay}, @code{@@smallexample},
address@hidden@@smallformat}, and @code{@@smalllisp}.
address@hidden@@smallquotation}, @code{@@smallindentedblock},
address@hidden@@smalldisplay}, @code{@@smallexample}, @code{@@smallformat},
+and @code{@@smalllisp}.
 
 In Info output, the @code{@@address@hidden commands are equivalent to
 their non-small companion commands.
 
 In @TeX{}, however, the @code{@@address@hidden commands typeset text in
-a smaller font than the non-small example commands.  Consequently,
-many examples containing long lines fit on a page without needing to
-be shortened.  A smaller font size is also requested in HTML output.
+a smaller font than the non-small example commands.  Thus, for
+instance, code examples can contain longer lines and still fit on a
+page without needing to be rewritten.
+
+A smaller font size is also requested in HTML output, and (as usual)
+retained in the Texinfo XML transliteration.
 
 Mark the end of an @code{@@address@hidden block with a corresponding
 @code{@@end address@hidden  For example, pair @code{@@smallexample} with
@@ -8451,7 +8494,8 @@
 The @code{@@table} command (@pxref{table}) is not supported inside
 @code{@@display}.  Since @code{@@display} is line-oriented, it doesn't
 make sense to use them together.  If you want to indent a table, try
address@hidden@@quotation} (@pxref{quotation,,@code{@@quotation}}).
address@hidden@@quotation} (@pxref{quotation,,@code{@@quotation}})
+or @code{@@indentedblock} (@address@hidden@@indentedblock}}).
 
 
 @node format
@@ -20338,6 +20382,10 @@
 @item @@indent
 Insert paragraph indentation.  @xref{indent,, @code{indent}}.
 
address@hidden @@indentedblock
+Indent a block of arbitary text on the left.  Pair with @code{@@end
+indentedblock}.  @address@hidden@@indentedblock}}.
+
 @item @@address@hidden@address@hidden
 Indicate text that is a uniform resource locator for the World Wide
 Web.  @xref{indicateurl, , @code{@@indicateurl}}.
@@ -20540,8 +20588,9 @@
 
 @item @@quotation
 Narrow the margins to indicate text that is quoted from another work.
-Takes optional argument of prefix text.  Pair with @code{@@end
-quotation}.  @xref{quotation, , @code{@@quotation}}.
+Takes optional argument specifying prefix text, e.g., an author name.
+Pair with @code{@@end quotation}.  @xref{quotation, ,
address@hidden@@quotation}}.
 
 @item @@address@hidden@}
 @itemx @@address@hidden@}
@@ -20674,14 +20723,17 @@
 size where possible.  Pair with @code{@@end smallformat}.
 @xref{small}.
 
address@hidden @@smallindentedblock
+Like @code{@@indentedblock}, but use a smaller font size where
+possible.  Pair with @code{@@end smallindentedblock}.  @xref{small}.
+
 @item @@smalllisp
 Begin an example of Lisp code.  Same as @code{@@smallexample}.  Pair
 with @code{@@end smalllisp}.  @xref{small}.
 
 @item @@smallquotation
-Begin a kind of example.  Like @code{@@quotation}, but use a smaller
-font size where possible.  Pair with @code{@@end smallquotation}.
address@hidden
+Like @code{@@quotation}, but use a smaller font size where possible.
+Pair with @code{@@end smallquotation}.  @xref{small}.
 
 @item @@sp @var{n}
 Skip @var{n} blank lines.  @xref{sp, , @code{@@sp}}.
@@ -21597,7 +21649,7 @@
 or other version control systems, which expand it into a string such
 as:
 @example
-$Id: texinfo.txi,v 1.487 2012/09/23 18:09:47 karl Exp $
+$Id: texinfo.txi,v 1.488 2012/11/08 23:08:44 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}