From 1a92f66717e28a396f333babd3161d88d36fc321 Mon Sep 17 00:00:00 2001 From: PTPi Date: Tue, 22 Feb 2011 19:42:29 +0000 Subject: Added support for sub-subheads from patch supplied by Petr Man. Updated docs. --- contrib/mom/BUGS | 11 +- contrib/mom/ChangeLog | 4 + contrib/mom/NEWS | 6 +- contrib/mom/momdoc/appendices.html | 2 +- contrib/mom/momdoc/color.html | 2 +- contrib/mom/momdoc/cover.html | 2 +- contrib/mom/momdoc/definitions.html | 2 +- contrib/mom/momdoc/docelement.html | 275 ++++++++++++++++++++++++++--- contrib/mom/momdoc/docprocessing.html | 2 +- contrib/mom/momdoc/goodies.html | 2 +- contrib/mom/momdoc/graphical.html | 2 +- contrib/mom/momdoc/headfootpage.html | 2 +- contrib/mom/momdoc/images.html | 2 +- contrib/mom/momdoc/inlines.html | 2 +- contrib/mom/momdoc/intro.html | 2 +- contrib/mom/momdoc/letters.html | 2 +- contrib/mom/momdoc/macrolist.html | 2 +- contrib/mom/momdoc/rectoverso.html | 2 +- contrib/mom/momdoc/refer.html | 2 +- contrib/mom/momdoc/reserved.html | 60 ++++--- contrib/mom/momdoc/tables-of-contents.html | 39 ++-- contrib/mom/momdoc/toc.html | 31 ++-- contrib/mom/momdoc/typesetting.html | 2 +- contrib/mom/momdoc/using.html | 2 +- 24 files changed, 359 insertions(+), 101 deletions(-) diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS index 736a759f..3bddc48a 100644 --- a/contrib/mom/BUGS +++ b/contrib/mom/BUGS @@ -1,4 +1,4 @@ - Copyright 2004, 2005, 2006, 2007, 2008, 2009 + Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -24,6 +24,15 @@ Also, please--no html email. That, too, gets nuked. Version 6 ========= +ENDNOTE_STRING_CAPS not disabling caps when arg given. +---Fixed--- + +Superfluous blank line before paragraphs with paraheads. +---Fixed--- + +Paraheads causing line numbering to overprint two line numbers. +---Fixed--- + Endless loop when DOC_LEAD_ADJUST is disabled. ---Fixed--- diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog index 812e552b..52f95539 100644 --- a/contrib/mom/ChangeLog +++ b/contrib/mom/ChangeLog @@ -1,3 +1,7 @@ +* Sun Feb 20 2011 + +o Added support for sub-subheads from patch supplied by Petr Man. + * Fri Feb 11 2011 o Moved register #UNADJUSTED_DOC_LEAD to top of TRAPS macro. diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS index dbbb6458..a7edb064 100644 --- a/contrib/mom/NEWS +++ b/contrib/mom/NEWS @@ -1,10 +1,14 @@ - Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. +Release 1.6-a +------------- +Support for sub-subheads added. + Release 1.6 ----------- Complete overhaul of refer handling. If you've been using mom and diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html index 7aa92408..a4ce21ad 100644 --- a/contrib/mom/momdoc/appendices.html +++ b/contrib/mom/momdoc/appendices.html @@ -2,7 +2,7 @@ +

Subsubheads

+ + + +

+Subsubheads should be used any place you want titles to introduce +sections of a document below subheads. If you wish, mom can +number subsubheads for you. Subsubhead numbers can also be included +hierarchically in numbered +paraheads. +

+ +

+By default, subsubheads are flush left. In +PRINTSTYLE TYPESET, +they are set in italic, slightly larger than paragraph text. In +PRINTSTYLE TYPEWRITE, +they are set roman at the same size as the prevailing type. A +single linespace precedes them in both printstyles, and a tiny space +adjustment raises them slightly above text that comes afterwards for +greater clarity in document structuring. +

+ +

+If these defaults don’t suit you, you can change them with the +subsubhead control macros. +

+ + + +
+

SUBSUBHEAD

+
+ +
+Macro: SUBSUBHEAD "<text of subsubhead>" [ "<2nd line>" [ "<3rd line>" ... ] ] +
+ +

+The argument to SUBSUBHEAD is the text of the subsubhead, surrounded by +double-quotes. If you need additional lines for a subsubhead, simply +surround each line with double-quotes. +

+ +
+

+Note: +If a subsubhead falls near the bottom of an output page and mom +is unable to fit the subsubhead plus at least one line of text +underneath it, she will set the subsubhead at the top of the next +page. +

+
+ +
+

SUBSUBHEAD control macros and defaults

+ +

+In addition to the usual family/font/size/quad control macros, there +are macros to manage subsubhead numbering. +

+ +
    +
  1. Family/font/size/colour/quad
    2. +
  2. Numbering
    3. +
  3. Reset subsubhead numbering
    4. +
  4. Baseline adjustment
    5. +
  5. Vertical inline escapes inside subsubheads
    6. +
+
+ +

1. Family/font/size/quad

+ +
+

+See +Arguments to the control macros. +

+ +.SUBSUBHEAD_FAMILY default = prevailing document family +.SUBSUBHEAD_FONT default = italic (TYPESET); roman (TYPEWRITE) +.SUBSUBHEAD_SIZE default = +.5 (TYPESET); 0 (TYPEWRITE) +.SUBSUBHEAD_COLOR default = black +.SUBSUBHEAD_QUAD default = LEFT + +
+ +

2. Number subsubheads

+ +

+If you’d like your subsubheads numbered, simply invoke +.NUMBER_SUBSUBHEADS with no argument. Mom will number +all subsequent subsubheads automatically (in ascending order, +naturally). +

+ +

+If, in addition to numbering subsubheads, you also request that +heads +be numbered, the head number will be included in the subsubhead +number (separated by a period [dot]). +

+ +

+Should you wish to stop subsubhead numbering, invoke +.NUMBER_SUBSUBHEADS with any argument (OFF, QUIT, END, +X...). Subsubhead numbering will cease, and the subsubhead number +will not be included in the numbering of paraheads. +

+ +

+See also +Prefixing chapter numbers +if you’d like chapter numbers prepended to the subsubhead numbers. +

+ +

3. Reset subsubhead numbering

+ +

+Should you wish to reset the subsubhead number to “1”, +invoke + + .RESET_SUBSUBHEAD_NUMBER + +with no argument. If, for some reason, you want mom to use a +subsubhead number that is not the next in ascending order (i.e. the +last subsubhead number + 1), invoke .RESET_SUBSUBHEAD_NUMBER +with the number you want, e.g. +
+ + .RESET_SUBSUBHEAD_NUMBER 4 + + +Your next subsubhead will be numbered “4” and subsequent +subsubheads will be numbered in ascending order from “4”. +

+ +

4. Baseline adjustment

+ +

+For aesthetic reasons and to clarify document structure, mom raises +subsubheads slightly above the +baseline +on which they would otherwise fall. In +PRINTSTYLE TYPESET, +the amount is 1/8 of the prevailing +leading. In +PRINTSTYLE TYPEWRITE, +it’s 1/5 of the prevailing leading. +

+ +

+If you would prefer mom not exhibit this behaviour, or if you would +like to change the amount by which she raises the subsubhead, use the +macro .SUBSUBHEAD_BASELINE_ADJUST. With an argument of 0 (zero), +subsubhead baseline adjustment will be disabled. Any other numeric +argument, with a +unit of measure +appended directly onto the argument, will cause mom to raise your +subsubheads by the amount you specify. +

+ +

5. Vertical inline escapes inside sububheads

+ +

+See +Vertical inline escapes inside heads. +The information there applies equally to subsubheads. +

+ +
+ + +

Paragraph heads