[Groff-commit] groff ChangeLog doc/groff.texinfo

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     12/07/26 06:12:41

Modified files:
        .              : ChangeLog 
        doc            : groff.texinfo 

Log message:
        Fix appearance of groff.texinfo's HTML output.
        
        Cartouches within an `example' environment don't work.
        
        * doc/groff.texinfo (CartoucheExample, endCartoucheExample): New
        macros.  Use them where appropriate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1340&r2=1.1341
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.310&r2=1.311

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -b -r1.1340 -r1.1341
--- ChangeLog   18 Jul 2012 08:50:52 -0000      1.1340
+++ ChangeLog   26 Jul 2012 06:12:40 -0000      1.1341
@@ -1,3 +1,12 @@
+2012-07-24  Werner LEMBERG  <address@hidden>
+
+       Fix appearance of groff.texinfo's HTML output.
+
+       Cartouches within an `example' environment don't work.
+
+       * doc/groff.texinfo (CartoucheExample, endCartoucheExample): New
+       macros.  Use them where appropriate.
+
 2012-07-17  Ingo Schwarze  <address@hidden>
 
        [mdoc] Make `Fl' correctly restore fonts.

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -b -r1.310 -r1.311
--- doc/groff.texinfo   20 May 2012 13:58:10 -0000      1.310
+++ doc/groff.texinfo   26 Jul 2012 06:12:41 -0000      1.311
@@ -311,7 +311,7 @@
 @end macro
 
 
address@hidden our example macro
address@hidden our example macros
 
 @macro Example
 @example
@@ -323,6 +323,16 @@
 @end example
 @end macro
 
address@hidden CartoucheExample
address@hidden
address@hidden
address@hidden macro
+
address@hidden endCartoucheExample
address@hidden example
address@hidden cartouche
address@hidden macro
+
 
 @c <text>
 
@@ -3217,8 +3227,7 @@
 @cindex title page, example markup
 @cindex example markup, title page
 
address@hidden
address@hidden
address@hidden
 .RP
 .TL
 The Inevitability of Code Bloat
@@ -3246,8 +3255,7 @@
 .AE
 
 ... the rest of the paper follows ...
address@hidden cartouche
address@hidden
address@hidden
 
 @c ---------------------------------------------------------------------
 
@@ -3297,8 +3305,7 @@
 
 The following markup uses all four paragraph macros.
 
address@hidden
address@hidden
address@hidden
 .NH 2
 Cases used in the study
 .LP
@@ -3328,8 +3335,7 @@
 A definitive work that answers all questions
 and criticisms about the quality and usability of
 free software.
address@hidden cartouche
address@hidden
address@hidden
 
 The @code{PORPHANS} register (@pxref{ms Document Control Registers})
 operates in conjunction with each of these macros, to inhibit the
@@ -3617,8 +3623,7 @@
 The first workaround uses the @code{br} request to force a break after
 printing the term or label.
 
address@hidden
address@hidden
address@hidden
 A glossary-style list:
 .IP lawyers 0.4i
 Two or more attorneys.
@@ -3627,16 +3632,14 @@
 Firearms, preferably large-caliber.
 .IP money
 Gotta pay for those lawyers and guns!
address@hidden cartouche
address@hidden
address@hidden
 
 The second workaround uses the @code{\p} escape to force the break.
 Note the space following the escape; this is important.  If you omit the
 space, @code{groff} prints the first word on the same line as the term
 or label (if it fits) @strong{then} breaks the line.
 
address@hidden
address@hidden
address@hidden
 A glossary-style list:
 .IP lawyers 0.4i
 Two or more attorneys.
@@ -3644,8 +3647,7 @@
 \p Firearms, preferably large-caliber.
 .IP money
 Gotta pay for those lawyers and guns!
address@hidden cartouche
address@hidden
address@hidden
 
 To set nested lists, use the @code{RS} and @code{RE} macros.
 @xref{Indentation values in ms}, for more information.
@@ -3654,8 +3656,7 @@
 
 For example:
 
address@hidden
address@hidden
address@hidden
 .IP \[bu] 2
 Lawyers:
 .RS
@@ -3668,8 +3669,7 @@
 .RE
 .IP \[bu]
 Guns
address@hidden cartouche
address@hidden
address@hidden
 
 Produces:
 
@@ -3897,8 +3897,7 @@
 The following is an example of how to set up a table that may print
 across two or more pages.
 
address@hidden
address@hidden
address@hidden
 .TS H
 allbox expand;
 cb | cb .
@@ -3910,8 +3909,7 @@
 ... the rest of the table follows...
 .CW
 .TE
address@hidden cartouche
address@hidden
address@hidden
 
 @c ---------------------------------------------------------------------
 
@@ -4084,8 +4082,7 @@
 work around this is to add tabs to the table of contents string.  The
 following is an example:
 
address@hidden
address@hidden
address@hidden
 .NH 1
 Introduction
 .XS
@@ -4101,8 +4098,7 @@
 .XE
 .LP
 ...
address@hidden cartouche
address@hidden
address@hidden
 
 You can manually create a table of contents by beginning with the
 @code{XS} macro for the first entry, specifying the page number for that
@@ -4110,8 +4106,7 @@
 @code{XA} macro, specifying the page number for that entry as the
 argument to @code{XA}.  The following is an example:
 
address@hidden
address@hidden
address@hidden
 .XS 1
 Introduction
 .XA 2
@@ -4120,8 +4115,7 @@
 Details of Galactic Formation
 ...
 .XE
address@hidden cartouche
address@hidden
address@hidden
 @endDefmac
 
 @Defmac {TC, address@hidden, ms}