[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: [mom]: xhtml cleanup of momdoc files, update BUGS
|
From: |
Peter Schaffter |
|
Subject: |
[groff] 01/01: [mom]: xhtml cleanup of momdoc files, update BUGS |
|
Date: |
Mon, 1 Aug 2022 13:56:01 -0400 (EDT) |
PTPi pushed a commit to branch master
in repository groff.
commit 258ecf70cf0faa74d2fb771a1dd0e79731e55c78
Author: Peter Schaffter <peter@schaffter.ca>
AuthorDate: Mon Aug 1 13:53:26 2022 -0400
[mom]: xhtml cleanup of momdoc files, update BUGS
---
contrib/mom/BUGS | 1 +
contrib/mom/momdoc/appendices.html | 23 +++---
contrib/mom/momdoc/color.html | 37 +++++----
contrib/mom/momdoc/cover.html | 22 +++---
contrib/mom/momdoc/definitions.html | 1 -
contrib/mom/momdoc/docelement.html | 62 ++++++++-------
contrib/mom/momdoc/docprocessing.html | 52 +++++++------
contrib/mom/momdoc/goodies.html | 69 ++++++++++-------
contrib/mom/momdoc/graphical.html | 2 +-
contrib/mom/momdoc/headfootpage.html | 38 +++++-----
contrib/mom/momdoc/images.html | 116 +++++++++++++++--------------
contrib/mom/momdoc/inlines.html | 104 +++++++++++++-------------
contrib/mom/momdoc/letters.html | 6 +-
contrib/mom/momdoc/macrolist.html | 20 ++---
contrib/mom/momdoc/refer.html | 16 ++--
contrib/mom/momdoc/stylesheet.css | 5 ++
contrib/mom/momdoc/tables-of-contents.html | 16 ++--
contrib/mom/momdoc/toc.html | 22 +++---
contrib/mom/momdoc/typesetting.html | 89 +++++++++++-----------
contrib/mom/momdoc/using.html | 3 +
contrib/mom/momdoc/version-2.html | 6 +-
21 files changed, 375 insertions(+), 335 deletions(-)
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 5757a07ab..5e32febbd 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,6 +23,7 @@ the Subject line or you risk my spam filters nuking your
message.
Version 2.5_b
=============
+
DROPCAP not calculating distance to FOOTER trap correctly.
---Fixed---
diff --git a/contrib/mom/momdoc/appendices.html
b/contrib/mom/momdoc/appendices.html
index 4b34e713a..d063e5d99 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -74,6 +74,7 @@ to the directory in which groff is installed, typically
/usr/local/share/groff/
</span>
(if you’ve built groff from source).
+</p>
<p class="tip-bottom">
<kbd><version></kbd> refers to the groff version number, which
can be found, if necessary, by typing
@@ -125,7 +126,7 @@ then to associate them with groff’s predefined <b>R,
I, B</b> and <b>BI</b> font styles. An example of this
can be seen in the groff PostScript font library itself, which is
found in
-</br>
+<br/>
<span class="pre-in-pp">
<prefix>/<version>/font/devps/
</span>
@@ -165,7 +166,7 @@ Condensed Italic, the established groff approach would
require two
“partial” families, <b>HL</b> (for Helvetica Light)
and <b>HLCD</b> (for Helvetica Light Condensed), with <b>R</b> and
<b>I</b> fonts for both:
-</br>
+<br/>
<span class="pre-in-pp">
HLR
HLI
@@ -424,9 +425,8 @@ your type would come out in Courier Roman!
<li><a href="#add">Add the font to the download file</a></li>
<li><a href="#gropdf-download">Updating the gropdf download file</a></li>
</ul></li>
- <li><a href="#groff-font-names">Naming groff fonts</a>
- <li><a href="#install-font">Automate the whole process – the
install-font script</a>
- </ul></li>
+ <li><a href="#groff-font-names">Naming groff fonts</a></li>
+ <li><a href="#install-font">Automate the whole process – the
install-font script</a></li>
</ul>
</div>
@@ -549,6 +549,7 @@ directory, make links to the files 'generate-t42.pe' and
<span class="pre-in-pp">
ln -s $HOME/generate-t42.pe .
ln -s $HOME/generate-pfa.pe .
+</span>
</p>
<h3 id="step-3" class="docs appendices">Step 3: Convert the font and put it in
the right place</h3>
@@ -558,7 +559,7 @@ TrueType fonts (.ttf) need to be converted to .t42. Type 1
fonts
(.pfb) need to be converted to .pfa.
</p>
-<h4 id="ttf" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • TTF Fonts</h4>
+<h4 id="ttf" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • TTF Fonts</h4>
<p class="top" style="margin-top: .5em;">
For .ttf fonts, run
@@ -589,7 +590,7 @@ the native pdf device (gropdf), move the .pfa file to
may safely remove it. You may also safely remove the .afm file.
</p>
-<h4 id="type1" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Type1 Fonts</h4>
+<h4 id="type1" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Type1 Fonts</h4>
<p class="top" style="margin-top: .5em;">
For .pfb fonts, run
@@ -614,7 +615,7 @@ for advice on naming groff fonts.)
If you’re running a recent version of groff that includes the
native pdf device (gropdf), link the .pfa and groff font files,
now in <kbd><prefix>/<site-font>/devps/</kbd>,
-to the devpdf directory</kbd>. Start by changing into the
+to the <kbd>devpdf</kbd> directory. Start by changing into the
<kbd><prefix>/<version>/font/devpdf/</kbd> directory,
then:
<br/>
@@ -627,7 +628,7 @@ You may safely remove the .afm file.
<h3 id="step-4" class="docs appendices">Step 4: Update the download file</h3>
-<h4 id="internal" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Get the internal font name</h4>
+<h4 id="internal" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Get the internal font name</h4>
<p class="top" style="margin-top: .5em;">
Inspect your new groff font file. Near the top, you will see a line
@@ -644,7 +645,7 @@ Usually, the internal name is helpfully descriptive, e.g.
Make a note of the internal name.
</p>
-<h4 id="add" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Add the font to the download file</h4>
+<h4 id="add" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Add the font to the download file</h4>
<p class="top" style="margin-top: .5em;">
Open the file <kbd><prefix>/<version>/font/devps/download</kbd>.
@@ -686,7 +687,7 @@ contain
</span>
</p>
-<h4 id="gropdf-download" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Updating the gropdf download file</h4>
+<h4 id="gropdf-download" class="docs" style="font-size: 90%; text-transform:
uppercase;"> • Updating the gropdf download file</h4>
<p class="top" style="margin-top: .5em;">
If you’re running a recent version of groff that includes the
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index 8d1fb11f3..9d2c3bd47 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -57,8 +57,8 @@ or
Afterwards, any time you want text to be coloured, you either colour
it with an
<a href="definitions.html#inlines">inline escape</a>
-that contains the colour name (e.g. <kbd><nobr>\*[red]</nobr></kbd>
-or <kbd><nobr>\*[blue]</nobr></kbd>) or invoke the macro
+that contains the colour name (e.g. <kbd><span
class="nobr">\*[red]</span></kbd>
+or <kbd><span class="nobr">\*[blue]</span></kbd>) or invoke the macro
<a href="#color">COLOR</a>
with the name of the colour you want.
</p>
@@ -177,7 +177,7 @@ mom doesn’t have a clue what you mean when you
reference a
colour (with
<a href="#color">COLOR</a>
or
-<a href="#color-inline"><kbd><nobr>\*[<colour name>]</nobr></kbd></a>).
+<a href="#color-inline"><kbd><span class="nobr">\*[<colour
name>]</span></kbd></a>).
</p>
<p>
@@ -226,7 +226,7 @@ could enter one of the following:
After you’ve told mom about a colour, you can then get her to
set text in that colour either with the
<a href="definitions.html#inlines">inline escape</a>,
-<a href="#color-inline"><kbd><nobr>\*[<colourname>]</nobr></kbd></a>,
+<a href="#color-inline"><kbd><span
class="nobr">\*[<colourname>]</span></kbd></a>,
or the macro
<a href="#color">COLOR</a>.
(See the
@@ -241,7 +241,7 @@ The colourname you give to NEWCOLOR may be used with
groff’s
<kbd>\m[<colourname>]</kbd> inline escape (the <kbd>\m</kbd>
escape is used to set text and rule colours). Thus, assuming
a colourname “blueblack” set with NEWCOLOR,
-<kbd><nobr>\*[blueblack]</nobr></kbd> and <kbd>\m[blueblack]</kbd>
+<kbd><span class="nobr">\*[blueblack]</span></kbd> and <kbd>\m[blueblack]</kbd>
are equivalent. Furthermore, the colourname can be given as an
argument to <b>groff</b>’s
<a href="definitions.html#primitives">primitive</a>
@@ -325,7 +325,7 @@ will colourise subsequent text coral until you instruct mom
to
return to black, or some other pre-defined, initialized colour.
(The
<a href="definitions.html#inlines">inline escape</a>
-<kbd><nobr>\*[coral]</nobr></kbd> will equally colourise text coral
+<kbd><span class="nobr">\*[coral]</span></kbd> will equally colourise text
coral
after you’ve initialized the colour with XCOLOR.)
</p>
@@ -364,10 +364,9 @@ or
.XCOLOR mediumspringgreen MYGREEN
</span>
so that whenever you want text mediumspringgreen-ed, you can use
-either <kbd>.COLOR mygreen</nobr></kbd> (or <kbd><nobr>.COLOR
-MYGREEN</nobr></kbd>) or the inline escape
-<kbd><nobr>\*[mygreen]</nobr></kbd> (or
-<kbd><nobr>\*[MYGREEN]</nobr></kbd>.)
+either <kbd>.COLOR mygreen</kbd> (or <kbd>.COLOR MYGREEN</kbd>)
+or the inline escape
+<kbd>\*[mygreen]</kbd> (or <kbd>\*[MYGREEN]</kbd>.)
</p>
<h3 id="xcolor-names" class="docs">Finding X colour names</h3>
@@ -404,15 +403,15 @@ inline escape (the <kbd>\m</kbd> escape is used to set
text and rule colours). Thus, assuming an X-colourname
“mediumspringgreen” set with
XCOLOR, and an alias, “mygreen”,
-<kbd><nobr>\*[mediumspringgreen]</nobr></kbd>,
-<kbd><nobr>\m[mediumspringgreen]</nobr></kbd>,
-<kbd><nobr>\*[mygreen]</nobr></kbd> and
-<kbd><nobr>\m[mygreen]</nobr></kbd> are all equivalent.
+<kbd><span class="nobr">\*[mediumspringgreen]</span></kbd>,
+<kbd><span class="nobr">\m[mediumspringgreen]</span></kbd>,
+<kbd><span class="nobr">\*[mygreen]</span></kbd> and
+<kbd><span class="nobr">\m[mygreen]</span></kbd> are all equivalent.
Furthermore, both the colourname and the alias can be given as an
argument to groff’s
<a href="definitions.html#primitives">primitive</a>
request, <kbd>.gcolor</kbd> (which does the same thing as
-<kbd><nobr>\m[<colourname>]</nobr></kbd>).
+<kbd><span class="nobr">\m[<colourname>]</span></kbd>).
</p>
<p class="tip-bottom">
@@ -447,7 +446,7 @@ or
<a href="#xcolor">XCOLOR</a>,
you use either the macro COLOR or the
<a href="definitions.html#inlines">inline escape</a>,
-<kbd><nobr>\*[<colourname>]</nobr></kbd>, to cause mom to set
+<kbd><span class="nobr">\*[<colourname>]</span></kbd>, to cause mom to
set
subsequent text in that colour. See the
<a href="#color-example2">example</a>,
above, which shows both in action.
@@ -456,20 +455,20 @@ above, which shows both in action.
<div class="box-tip">
<p class="tip-top">
<span class="note">Note:</span>
-You can use the <kbd><nobr>\*[<colourname>]</nobr></kbd>
+You can use the <kbd><span class="nobr">\*[<colourname>]</span></kbd>
inline escape in any
<a href="docprocessing.html#top">document processing</a>
macro that takes a
<a href="definitions.html#stringargument">string argument</a>.
However, you must remember to reset the colour at the end of the
-argument (typically with <kbd><nobr>\*[black]</nobr></kbd>) unless
+argument (typically with <kbd><span class="nobr">\*[black]</span></kbd>) unless
you want all subsequent invocations of that particular macro to be
colourised.
</p>
<p>
Furthermore, if you use
-<kbd><nobr>\*[<colourname>]</nobr></kbd> in the string
+<kbd><span class="nobr">\*[<colourname>]</span></kbd> in the string
argument passed to
<a href="docelement.html#heading">HEADING <n></a>
and you’ve requested that the heading level be numbered, the
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index 343fb0076..7efee1f8d 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -68,7 +68,7 @@ FDL in the main directory of the groff source package.
<li><a href="#placement">Placement</a></li>
</ul>
</li>
- <li><a href="#coverimage">DOC_COVER_IMAGE / COVER_IMAGE</a>
+ <li><a href="#coverimages">DOC_COVER_IMAGE / COVER_IMAGE</a>
<ul style="margin-left: -1.25em; list-style-type: circle;">
<li><a href="#positioning">Positioning of doc cover and cover
images</a></li>
</ul>
@@ -241,10 +241,10 @@ COPYRIGHT, etc.) does.
<li><a href="#cover-args">The arguments: saying what goes on doc cover and
cover pages</a></li>
</ul></li>
<li><a href="#covertext">DOC_COVERTEXT / COVERTEXT</a></li>
- <li><a href="#coverimage">DOC_COVER_IMAGE / COVER_IMAGE</a></li>
+ <li><a href="#doc-coverimage">DOC_COVER_IMAGE / COVER_IMAGE</a></li>
<li><a href="#on-off">Enabling/disabling automatic generation of cover
pages</a>
<ul style="margin-left: -.5em; list-style-type: disc;">
- <li><a href="#doc covers">DOC_COVERS</a></li>
+ <li><a href="#doc-covers">DOC_COVERS</a></li>
<li><a href="#covers">COVERS</a></li>
</ul></li>
<li><a href="#cover-control">Control macros for doc covers and
covers</a></li>
@@ -257,7 +257,7 @@ COPYRIGHT, etc.) does.
<h3 id="cover" class="macro-id">DOC_COVER and COVER</h3>
</div>
-<div id="doc cover" class="box-macro-args">
+<div id="doc-cover" class="box-macro-args">
Macro: <b>DOC_COVER</b> <kbd class="macro-args">(see argument list,
below)</kbd>
</div>
@@ -329,7 +329,7 @@ what you want on the cover page:
</dd>
<dt class="params">DOC_COVERTITLE / COVERTITLE</dt>
<dd class="cover-args">– the string(s) you gave to
- <a href="docprocessing.html#doc covertitle">DOC_COVERTITLE</a>
+ <a href="docprocessing.html#doc-covertitle">DOC_COVERTITLE</a>
or
<a href="docprocessing.html#covertitle">COVERTITLE</a>
</dd>
@@ -401,7 +401,7 @@ what you want on the cover page:
pages are invisible to mom’s pagination.
</span>
</dd>
-<dl/>
+</dl>
<p>
Please note that in all cases, if you have passed
@@ -598,10 +598,10 @@ medium-roman and justified, indented 6 picas from both
margins.
</p>
<div class="macro-id-overline">
-<h3 id="coverimage" class="macro-id">DOC_COVER_IMAGE and COVER_IMAGE</h3>
+<h3 id="coverimages" class="macro-id">DOC_COVER_IMAGE and COVER_IMAGE</h3>
</div>
-<div id="coverimage" class="box-macro-args">
+<div id="doc-coverimage" class="box-macro-args">
Macro: <b>DOC_COVER_IMAGE</b> <kbd class="macro-args"><image>
<width> <height> [ -L | -C | -R | -I <indent> <Y-pos> [
<X-pos> ] ]</kbd>
</div>
@@ -699,7 +699,7 @@ own specifications.
Macro: <b>COVERS</b> <kbd class="macro-args"><toggle></kbd>
</div>
-<div id="doc covers" class="box-macro-args" style="margin-top: 1em;">
+<div id="doc-covers" class="box-macro-args" style="margin-top: 1em;">
Macro: <b>DOC_COVERS</b> <kbd class="macro-args"><toggle></kbd>
</div>
@@ -707,7 +707,7 @@ Macro: <b>DOC_COVERS</b> <kbd
class="macro-args"><toggle></kbd>
By default, if you give mom a
<a href="#cover">COVER</a>
or
-<a href="#doc cover">DOC_COVER</a>
+<a href="#doc-cover">DOC_COVER</a>
directive, she will print the cover or doc cover. In a document
that contains sections, articles or chapters formerly treated as
”one-off’s” but now being
@@ -823,7 +823,7 @@ As with the docheader control macros, <kbd>DOC_COVER_</kbd>
and
<kbd>COVER_</kbd> part/parameter style changes may be
<a href="docprocessing.html#grouping">grouped</a>,
for example
-</br>
+<br/>
<span class="pre-in-pp">
.DOC_COVER_TITLE_STYLE \
FAMILY A \
diff --git a/contrib/mom/momdoc/definitions.html
b/contrib/mom/momdoc/definitions.html
index b669ea52f..b85a08914 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -259,7 +259,6 @@ or concept you’re not familiar with.
<a href="#just">justified</a>.
In groff, fixed width space is entered with
<kbd>\<space></kbd> (i.e. a backslash followed by a space)
- </span>
</dd>
<dt id="font">Font</dt>
diff --git a/contrib/mom/momdoc/docelement.html
b/contrib/mom/momdoc/docelement.html
index 161650f71..ff1ba5164 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -434,7 +434,7 @@ pair require the backslash when this style is used.
Not all the control macros for a particular tag may be available
with an <kbd><element>_STYLE</kbd> macro. Generally speaking,
though, if a tag has control macros for
-<br/>
+</p>
<table style="font-family: monospace; font-weight: bold; margin-left: 5em;
margin-top: -1em">
<tr>
<td style="padding-right: 1em">FAMILY</td>
@@ -453,7 +453,8 @@ though, if a tag has control macros for
<td style="padding-right: 1em">QUAD</td>
<td style="padding-right: 1em">CAPS</td>
</tr>
-<table>
+</table>
+<p style="margin-top: .5em">
those parameters may be used within an
<kbd><element>_STYLE</kbd> macro.
</p>
@@ -814,7 +815,7 @@ wish a colourised paragraph, you must use the macro
<a href="color.html#color">COLOR</a>
or the
<a href="definitions.html#inline">inline escape</a>,
-<a
href="color.html#color-inline"><kbd><nobr>\*[<colourname>]</nobr></kbd></a>,
+<a href="color.html#color-inline"><kbd><span
class="nobr">\*[<colourname>]</span></kbd></a>,
<i>after</i> <kbd>.PP</kbd>. The colour must be one pre-defined (or
“initialized”) with
<a href="color.html#newcolor">NEWCOLOR</a>
@@ -1104,10 +1105,11 @@ expect the blank line to appear.
<p>
Heads, subheads, and deeper levels of section headings are
-handled by a single macro, HEADING, to which you pass an
-argument stating the desired level. <kbd><nobr>.HEADING 1
-"<text>"</nobr></kbd>, for example, would be a main
-head; <kbd><nobr>.HEADING 2 "<text>"</nobr></kbd>
+handled by a single macro, HEADING, to which you pass an argument
+stating the desired level.
+<kbd><span class="nobr">.HEADING 1 "<text>"</span></kbd>,
+for example, would be a main head;
+<kbd><span class="nobr">.HEADING 2 "<text>"</span></kbd>
would be a subhead; etc.
</p>
@@ -1163,7 +1165,7 @@ a particular heading level just because its style appeals
to you.
<div class="box-macro-args">
Macro: <b>HEADING</b> <kbd class="macro-args"><level> [
-PARAHEAD ] [ NAMED <pdf-id> ] "<heading text>"
+PARAHEAD ] [ NAMED <pdf-id> ] "<heading text>"</kbd>
</div>
<p>
@@ -1390,6 +1392,10 @@ sufficient room for both the heading and the reserved
space, mom
will break to a new page for the heading. A
<a href="definitions.html#unitofmeasure">unit of measure</a>
should not be appended to the argument.
+<span class="note"><i>Note:</i></span> If you have
+<a href="goodies.html#dropcap">DROPCAP</a>s
+after headings, you must increase the value of <kbd>NEEDS</kbd>
+to match the number of dropcap lines.
</p>
<p class="defaults" style="margin-bottom: 1em">
@@ -1484,7 +1490,7 @@ representing the chapter number.
After you invoke <kbd>.PREFIX_CHAPTER_NUMBER</kbd>, mom will prepend
the chapter number to all headings you have requested be numbered
with
-<a href="#heading-style"><kbd>.HEADING_STYLE <n> NUMBER</a>.
+<a href="#heading-style"><kbd>.HEADING_STYLE <n> NUMBER</kbd></a>.
Thus, assuming chapter number twelve (12):
<br/>
<span class="pre-in-pp">
@@ -2074,7 +2080,7 @@ The text of quotes and blockquotes is output immediately,
and may therefore
start on one page and finish on the next. If you wish to keep the
text together as a block, deferred to the following page if the
block doesn’t all fit on one page, wrap
-<kbd><nobr>(BLOCK)QUOTE...(BLOCK)QUOTE OFF</nobr></kbd>
+<kbd><span class="nobr">(BLOCK)QUOTE...(BLOCK)QUOTE OFF</span></kbd>
inside a
<a href="images.html#floats-intro">float</a>.
If you further wish to force a page break before the floated quote
@@ -2294,7 +2300,7 @@ ITALIC_MEANS_ITALIC is enabled (see
<h2 id="blockquote-intro" class="macro-group">Blockquotes (cited material)</h2>
<ul style="margin-left: -.5em;">
- <li><a href="#blockquote-description">Introduction</a>
+ <li><a href="#blockquote-description">Introduction</a></li>
<li><a href="#blockquote">Tag: BLOCKQUOTE</a></li>
<li><a href="#blockquote-control">BLOCKQUOTE control macros</a></li>
</ul>
@@ -2526,7 +2532,7 @@ Inline escape: <b><kbd>\*[CODE]</kbd></b>
<p>
When you invoke the macro CODE or insert
-<kbd><nobr>\*[CODE]</nobr></kbd> into running text, mom switches to
+<kbd><span class="nobr">\*[CODE]</span></kbd> into running text, mom switches
to
a
<a href="definitions.html#fixedwidthfont">fixed-width font</a>
(Courier, by default) and turns
@@ -2624,7 +2630,7 @@ family, font, and smartquotes back to their former state.
<h4 class="docs" style="font-size: 102%">Using <kbd>\*[CODE]</kbd> inline</h4>
<p>
-<kbd><nobr>\*[CODE]</nobr></kbd> invokes <kbd>.CODE</kbd>, allowing you to
+<kbd><span class="nobr">\*[CODE]</span></kbd> invokes <kbd>.CODE</kbd>,
allowing you to
bracket code snippets inline. It does not accept the <kbd>BR</kbd>,
<kbd>BREAK</kbd>, or <kbd>SPREAD</kbd> arguments. It is most useful
for short snippets, as in the following example.
@@ -2635,13 +2641,13 @@ for short snippets, as in the following example.
</p>
<p>
-<kbd><nobr>\*[CODE]</nobr></kbd> does not permit changing the escape
+<kbd><span class="nobr">\*[CODE]</span></kbd> does not permit changing the
escape
character, so <kbd>\e</kbd> or a doubled backslash must be used.
Furthermore, if your code starts with a period, you must enter it as
-“<kbd>\&.</kbd>”.
+“<kbd>\&.</kbd>”.
<br/>
<span class="pre-in-pp">
- Registers are created with the \*[CODE]\&.nr\*[CODE X] request.
+ Registers are created with the \*[CODE]\&.nr\*[CODE X] request.
</span>
</p>
@@ -2663,15 +2669,15 @@ it with
.CODE
echo "Hello, world" | sed -e 's/Hello,/Goodbye, cruel/'\c
.CODE OFF
- \&. As this demonstrates...
+ \&. As this demonstrates...
</span>
-Use of <kbd><nobr>\*[CODE]</nobr></kbd> inline does not require
+Use of <kbd><span class="nobr">\*[CODE]</span></kbd> inline does not require
the <kbd>\c</kbd>, however periods and apostrophes after
-<kbd><nobr>\*[CODE X]</nobr></kbd> still need to be introduced
-with <kbd>\&</kbd>, as in this example:
+<kbd><span class="nobr">\*[CODE X]</span></kbd> still need to be
introduced
+with <kbd>\&</kbd>, as in this example:
<br/>
<span class="pre-in-pp">
- ...append the unit of measure \*[CODE]p\*[CODE OFF]\&. New sentence...
+ ...append the unit of measure \*[CODE]p\*[CODE OFF]\&. New
sentence...
</span>
</p>
@@ -2728,7 +2734,7 @@ technically the same point size. CODE_SIZE lets you
choose a
percentage of the prevailing point size for your fixed-width
CODE font so it doesn’t look gangly or minuscule in relation
to the type around it. All invocations of <kbd>.CODE</kbd> or
-<kbd><nobr>\*[CODE]</nobr></kbd> will use this size, so that if you
+<kbd><span class="nobr">\*[CODE]</span></kbd> will use this size, so that if
you
decide to change the prevailing point size of your document, the
CODE font will be scaled proportionally.
</p>
@@ -2971,7 +2977,7 @@ The size and vertical positioning of special characters
may be
adjusted with
<a href="definitions.html#inlines">inline escapes</a>
in the argument passed to USER. For example, to raise the position
-of <kbd><nobr>\[sq]</nobr></kbd> slightly, you might do
+of <kbd><span class="nobr">\[sq]</span></kbd> slightly, you might do
<span class="pre-in-pp">
.LIST USER "\*[UP .25p]\[sq]\*[DOWN .25p]"
or
@@ -3513,7 +3519,7 @@ Hence, in the above example, line number <kbd>1</kbd> will
<p>
If you want line number <kbd>1</kbd> to be numbered, you have
-to invoke <kbd><nobr>.NUMBER_LINES 1 1</nobr></kbd> before the
+to invoke <kbd><span class="nobr">.NUMBER_LINES 1 1</span></kbd> before the
first output line you want numbered, then study your <i>output</i>
copy and determine where best to insert the following in your
<i>input</i> text:
@@ -4434,7 +4440,7 @@ footnote has been terminated (e.g. with
If you want a range of line numbers (e.g. [5-11] ),
insert, directly into the first line of the range you want, the
<a href="definitions.html#inlines">inline escape</a>,
-<kbd><nobr>\*[FN_MARK]</nobr></kbd>. For the terminating line
+<kbd><span class="nobr">\*[FN_MARK]</span></kbd>. For the terminating line
number of the range, you need only invoke <kbd>.FOOTNOTE</kbd>
(again, without the terminating <kbd>\c</kbd>); mom is smart enough
to figure out that where <kbd>.FOOTNOTE</kbd> was invoked represents
@@ -4444,7 +4450,7 @@ the terminating line number.
<p>
Range-numbered footnotes are always output on the page
where <kbd>.FOOTNOTE</kbd> was invoked, not the page where
-<kbd><nobr>\*[FN_MARK]</nobr></kbd> appears (subject, of course, to
+<kbd><span class="nobr">\*[FN_MARK]</span></kbd> appears (subject, of course,
to
the rules for footnotes that fall too close to the bottom of a page,
as outlined
<a href="#footnote-rules">here</a>).
@@ -5817,7 +5823,7 @@ nothing to prevent you from doing so.)
If you want a range of line numbers (e.g. [5-11] ),
insert, directly into the first line of the range you want, the
<a href="definitions.html#inlines">inline escape</a>,
-<kbd><nobr>\*[EN-MARK]</nobr></kbd>. For the terminating line
+<kbd><span class="nobr">\*[EN-MARK]</span></kbd>. For the terminating line
number of the range, you need only invoke <kbd>.ENDNOTE</kbd>
(again, without the terminating <kbd>\c</kbd>). Mom is smart enough
to figure out that where <kbd>.ENDNOTE</kbd> is invoked represents
@@ -6595,7 +6601,7 @@ pre-defined (or “initialized”) colour changes
the colour
of both the FINIS string and the em-dashes that surround it. If you
use the
<a href="definitions.html#inline">inline escape</a>,
-<a
href="color.html#color-inline"><kbd><nobr>\*[<colourname>]</nobr></kbd></a>,
+<a href="color.html#color-inline"><kbd><span
class="nobr">\*[<colourname>]</span></kbd></a>,
in the argument passed to FINIS, only the text will be in the
new colour; the em-dashes will be in the default document colour
(usually black).
diff --git a/contrib/mom/momdoc/docprocessing.html
b/contrib/mom/momdoc/docprocessing.html
index 3d10a43ea..349c18bc0 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -65,21 +65,21 @@ FDL in the main directory of the groff source package.
<li><a href="#covertitle">COVERTITLE</a></li>
<li><a href="#doc-covertitle">DOC_COVERTITLE</a></li>
<li><a href="#pdftitle">PDF_TITLE</a></li>
- <li><a href="#toc-heading">TOC_HEADING</li>
+ <li><a href="#toc-heading">TOC_HEADING</a></li>
</ul></li>
<li><a href="#docstyle-macros"><b>The docstyle macros (templates)</b></a>
<ul class="toc-docproc">
<li><a href="#doctype">DOCTYPE (default, chapter, letter, named,
slides)</a></li>
- <li><a href="#slides">DOCTYPE SLIDES</a></li>
+ <li><a href="#slides">DOCTYPE SLIDES</a>
<ul class="toc-docproc">
<li><a href="#newslide">NEWSLIDE</a></li>
<li><a href="#pause">PAUSE</a></li>
<li><a href="#transition">TRANSITION</a></li>
- </ul>
+ </ul></li>
<li><a href="#printstyle">PRINTSTYLE</a></li>
<li><a href="#copystyle">COPYSTYLE</a></li>
</ul></li>
- <li><a href="cover.html"><b>Cover pages</b></a>
+ <li><a href="cover.html"><b>Cover pages</b></a></li>
<li><a href="#docheader"><b>Managing the document header</b></a>
<ul class="toc-docproc">
<li><a href="#docheader">DOCHEADER</a></li>
@@ -259,8 +259,8 @@ blockquotes so that they adhere to it. (Prior to invoking
the document leading is set with the
<a href="typesetting.html#macros-typesetting">typesetting macro</a>
<a href="typesetting.html#leading">LS</a>,
-afterwards with the document
-<a href="definitions.html#controlmacro">control macro</a>
+afterwards with the
+<a href="definitions.html#controlmacro">document control macro</a>
<a href="#doc-lead">DOC_LEAD</a>.)
</p>
@@ -286,8 +286,8 @@ and
<a href="definitions.html#preprocessor">pre-processor material</a>.
In addition, the
<a href="#shim">SHIM</a>
-macro can be inserted into a document to make sure that the
-text following falls on the baseline grid.
+macro can be inserted into a document at any point to make sure
+the text following falls on the baseline grid.
</p>
<p>
@@ -405,7 +405,7 @@ The solution is simply to add <kbd>.SPACE -1v</kbd> or
</div>
<div class="box-macro-args">
-Macro: <b>NO_SHIM</b> <kbd class="macro-args"><none> | <anything>
+Macro: <b>NO_SHIM</b> <kbd class="macro-args"><none> |
<anything></kbd>
</div>
<p>
@@ -900,7 +900,7 @@ processing macros.
</div>
<div class="box-macro-args">
-Macro: <b>TITLE</b> <kbd class=marco-args>[COVER | DOC_COVER] "<title
string>" ["<2nd line>" ["<3rd line>"
... ] ]</kbd>
+Macro: <b>TITLE</b> <kbd class="macro-args">[COVER | DOC_COVER]
"<title string>" ["<2nd line>" ["<3rd
line>" ... ] ]</kbd>
</div>
<p class="requires">
• Arguments must be enclosed in double-quotes
@@ -1246,7 +1246,7 @@ what it is with the CHAPTER_STRING macro, like this:
<p>
If you would like a blank chapter string, i.e., you’d like the
chapter number to appear without “Chapter” beforehand,
-enter <kbd>.CHAPTER_STRING "\&"</kbd>.
+enter <kbd>.CHAPTER_STRING "\&"</kbd>.
</p>
<!-- -CHAPTER_TITLE- -->
@@ -1779,7 +1779,7 @@ TOC_HEADING_STYLE accepts as many or as few arguments as
you need:
<a href="color.html#newcolor">NEWCOLOR</a>
or
<a href="color.html#xcolor">XCOLOR</a>.
-</br>
+<br/>
** <kbd>SPACE_ABOVE</kbd> and <kbd>SPACE_BENEATH</kbd> require a
<a href="definitions.html#unitofmeasure">unit of measure</a>
to be appended to their numeric argument.
@@ -1822,7 +1822,7 @@ and revision information in the headers) or a final copy.
<div class="macro-list-container">
<h3 id="index-docstyle" class="macro-list">Docstyle macros</h3>
<ul class="macro-list">
- <li><a href="#doctype">DOCTYPE</a>
+ <li><a href="#doctype">DOCTYPE</a></li>
<li><a href="#printstyle">PRINTSTYLE</a> – non-optional macro required
for document processing
<ul style="margin-left: -.5em; list-style-type: disc;">
<li><a href="#typeset-defaults">Defaults for PRINTSTYLE TYPESET</a></li>
@@ -1921,8 +1921,8 @@ for how mom outputs each part of the page header.)
<br/>
<kbd>DOCTYPE NAMED "string"</kbd> no longer accepts a colour
argument after <kbd>"string"</kbd>. Setting the colour
-of the string is now done with <kbd><nobr>DOCTYPE_COLOR
-<color></nobr></kbd>. Default underscoring of
+of the string is now done with <kbd><span class="nobr">DOCTYPE_COLOR
+<color></span></kbd>. Default underscoring of
<kbd>"string"</kbd> in the docheader and on covers
has been removed. Use <kbd>DOCTYPE_UNDERSCORE</kbd>,
<kbd>DOC_COVER_DOCTYPE_UNDERSCORE</kbd> and/or
@@ -2021,7 +2021,7 @@ numbered, the slide number must be given to one of the
header/footer
parts with the
<a href="definitions.html#inlines">inline escape</a>
<br/>
-<kbd><nobr>\*[SLIDE#]</nobr></kbd>. For example:
+<kbd><span class="nobr">\*[SLIDE#]</span></kbd>. For example:
<span class="pre-in-pp">
HEADER "" "My slide presentation" "" \
FOOTER "" "" "\*[SLIDE#]"
@@ -2063,12 +2063,11 @@ black and two points larger, this is how you’d do
it:
<p class="tip">
<span class="note">Note:</span>
Do not use mom’s
-<a
href="inlines.html#inline-size-mom"><kbd><nobr>\*[SIZE ±n]</nobr></kbd></a>
+<a href="inlines.html#inline-size-mom"><kbd><span
class="nobr">\*[SIZE ±n]</span></kbd></a>
inline escape to change point size in the strings
passed to HEADER or FOOTER. Prefer either mom’s
-<kbd><nobr>\*S[±n]</nobr></kbd> or groff’s
-<kbd><nobr>\s[±n]</nobr></kbd>.
-</span>
+<kbd><span class="nobr">\*S[±n]</span></kbd> or groff’s
+<kbd><span class="nobr">\s[±n]</span></kbd>.
</p>
</div>
@@ -2123,7 +2122,6 @@ Not all PDF viewers support all modes. Any that are not
supported
are replaced by the “R” mode, which simply replaces one
slide with the next unless the PDF viewer has a different default
transition mode.
-</span>
</p>
</div>
@@ -2291,7 +2289,7 @@ are (mostly) ignored. An important exception is
point size of headers/footers should they become too crowded. Most
of mom’s inlines affecting the appearance of type are also
ignored
-(<a
href="inlines.html#inline-size-mom"><kbd><nobr>\*S[<size>]</nobr></kbd></a>
+(<a href="inlines.html#inline-size-mom"><kbd><span
class="nobr">\*S[<size>]</span></kbd></a>
is an exception; there may be a few others).
</p>
@@ -2394,7 +2392,7 @@ for double-spaced, and 12-point for single-spaced.
<p>
In PRINTSTYLE <kbd>TYPEWRITE</kbd>, mom, by default, underlines
anything that looks like italics. This includes the
-<a href="typesetting.html#slant-inline"><kbd><nobr>\*[SLANT]</nobr></kbd></a>
+<a href="typesetting.html#slant-inline"><kbd><span
class="nobr">\*[SLANT]</span></kbd></a>
<a href="definitions.html#inlines">inline escape</a>
for pseudo-italics. (See
<a href="goodies.html#underline">UNDERLINE</a>
@@ -2453,7 +2451,7 @@ particularly useful for reducing the point size of
headers/footers should they become crowded (quite likely to
happen if the title of your document is long and your
<a href="#copystyle">COPYSTYLE</a>
-is <kbd>DRAFT</kbd).
+is <kbd>DRAFT</kbd>).
</p>
<p class="tip-bottom">
@@ -2889,7 +2887,7 @@ The macro
<a href="color.html#color">COLOR</a>
and the
<a href="definitions.html#inlines">inline escape</a>,
-<a
href="color.html#color-inline"><kbd><nobr>\*[<colorname>]</nobr></kbd></a>
+<a href="color.html#color-inline"><kbd><span
class="nobr">\*[<colorname>]</span></kbd></a>
can be used at any time during document processing for occasional
colour effects. However, consistent and reliable colourising of
various document elements (the docheader, heads, linebreaks,
@@ -2914,7 +2912,7 @@ If you plan to have mom generate a
<a href="docelement.html#toc">table of contents</a>,
do not embed colour
<a href="definitions.html#inlines">inline escapes</a>
-(<a
href="color.html#color-inline"><kbd><nobr>\*[<colourname>]</nobr></kbd></a>)
+(<a href="color.html#color-inline"><kbd><span
class="nobr">\*[<colourname>]</span></kbd></a>)
in the
<a href="definitions.html#stringargument">string arguments</a>
given to any of the
@@ -4390,7 +4388,7 @@ text, not any macros following.
<div class="box-tip">
<p class="tip">
<span class="note">Note:</span>
-<a href="inlines.html#b"><kbd><nobr>\*[B]</nobr></kbd></a>
+<a href="inlines.html#b"><kbd><span class="nobr">\*[B]</span></kbd></a>
cannot be used as a replacement for <kbd>.EL</kbd> when terminating
a document.
</p>
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index b80dd8e16..00e2db037 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -455,8 +455,8 @@ single quotes:
Whether or not you have SMARTQUOTES turned on, get into the habit of
entering the foot-and inch-marks, when you need them, with the
<a href="definitions.html#inlines">inline escapes</a>
-<kbd><nobr>\*[FOOT]</nobr></kbd> and
-<kbd><nobr>\*[INCH]</nobr></kbd>, instead of
+<kbd><span class="nobr">\*[FOOT]</span></kbd> and
+<kbd><span class="nobr">\*[INCH]</span></kbd>, instead of
<kbd>'</kbd> and <kbd>"</kbd>.
</p>
</div>
@@ -492,7 +492,7 @@ produces, on output
</span>
If you wish to capitalise a section of type inline, use the
<a href="definitions.html#inlines">inline escapes</a>,
-<a href="inlines.html#uc-lc"><kbd><nobr>\*[UC]...\*[LC]</nobr></kbd></a>
+<a href="inlines.html#uc-lc"><kbd><span
class="nobr">\*[UC]...\*[LC]</span></kbd></a>
like this:
<br/>
<span class="pre-in-pp">
@@ -526,7 +526,7 @@ Conversely, an initial period must come <em>before</em>
</span>
or
<span class="pre-in-pp">
- \*[UC]\&.start\*[LC] is used to begin document processing.
+ \*[UC]\&.start\*[LC] is used to begin document processing.
</span>
Upon output, either will produce
<br/>
@@ -564,7 +564,7 @@ this:
</span>
Once a string is defined, you can call it any time with the
<a href="definitions.html#inlines">inline escape</a>
-<kbd><nobr>\*[<name>]</nobr></kbd>. Using the example
+<kbd><span class="nobr">\*[<name>]</span></kbd>. Using the example
string above
<br/>
<span class="pre-in-pp">
@@ -667,10 +667,10 @@ or
depth of type at the current point size, invoke <kbd
class="bold">.SIZESPECS</kbd>, which takes no argument.
The dimensions are stored in the string registers
-<b><nobr>\*[$CAP_HEIGHT]</nobr></b>,
-<b><nobr>\*[$X_HEIGHT]</nobr></b>,
+<b><span class="nobr">\*[$CAP_HEIGHT]</span></b>,
+<b><span class="nobr">\*[$X_HEIGHT]</span></b>,
and
-<b><nobr>\*[$DESCENDER]</nobr></b>, respectively, in
+<b><span class="nobr">\*[$DESCENDER]</span></b>, respectively, in
<a href="definitions.html#units">machine units</a>
to which the
<a href="definitions.html#unitofmeasure">unit of measure</a>,
@@ -908,6 +908,7 @@ There’s a special macro,
<a href="#underline-specs">UNDERLINE_SPECS</a>,
to control the weight and distance from the baseline of the
underline.
+</p>
<p>
Lastly, files that use UNDERLINE must be processed with
@@ -917,6 +918,8 @@ Lastly, files that use UNDERLINE must be processed with
</span>
since groff’s pdf driver does not recognize UNDERLINE.
</p>
+
+<p>
Note that
<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>
uses UNDERLINE to underline italics
@@ -940,13 +943,13 @@ to turn it off.
Underlining may also be turned on and off
<a href="definitions.html#inlines">inline</a>
with the escapes
-<a href="#ul"><kbd><nobr>\*[UL]...\*[ULX]</nobr></kbd></a>.
+<a href="#ul"><kbd><span class="nobr">\*[UL]...\*[ULX]</span></kbd></a>.
</p>
<p class="tip-bottom">
<span class="additional-note">Additional note:</span>
In document processing, neither <kbd>.UNDERLINE</kbd> nor
-<kbd><nobr>\*[UL]</nobr></kbd> persist past the current document element tag.
+<kbd><span class="nobr">\*[UL]</span></kbd> persist past the current document
element tag.
For example, if you turn underlining on in a paragraph
(<kbd><a href="docelement.html#pp">.PP</a></kbd>),
your next paragraph will not be underlined.
@@ -977,7 +980,7 @@ mom’s default is 1-1/4 points (1.25p).
The macro pair,
<kbd><a href="#underline">.UNDERLINE</a></kbd> /
<kbd>.UNDERLINE OFF</kbd>, and the inline escapes,
-<nobr><kbd>\*[UL]</kbd> / <kbd>\*[ULX]</kbd></nobr>, are
+<span class="nobr"><kbd>\*[UL]</kbd> / <kbd>\*[ULX]</kbd></span>, are
functionally identical, hence, in
<a href="definitions.html#filled">fill</a>
modes
@@ -1076,7 +1079,7 @@ The following uses the Date/Signature example, above, but
adds
rules into the whitespace through the use of string tabs and
mom’s
<a href="definitions.html#inlines">inline escape</a>
-<a href="inlines.html#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
+<a href="inlines.html#inline-rule-mom"><kbd><span
class="nobr">\*[RULE]</span></kbd></a>.
<br/>
<span class="pre-in-pp">
.LL 30P
@@ -1193,7 +1196,7 @@ Whenever you want to fill a line or tab with
<a href="definitions.html#leader">leaders</a>,
use the
<a href="definitions.html#inlines">inline escape</a>
-<kbd><nobr>\*[LEADER]</nobr></kbd>. The remainder of the line or
+<kbd><span class="nobr">\*[LEADER]</span></kbd>. The remainder of the line or
tab will be filled with the leader character. Mom’s default
leader character is a period (dot), but you can change it to any
character you like with
@@ -1253,7 +1256,7 @@ LEADER_CHARACTER takes one argument: a single character
you would
like to be used for
<a href="definitions.html#leader">leaders</a>.
(See
-<a href="#leader"><kbd><nobr>\*[LEADER]</nobr></kbd></a>
+<a href="#leader"><kbd><span class="nobr">\*[LEADER]</span></kbd></a>
for an explanation of how to fill lines with leaders.)
</p>
@@ -1351,15 +1354,29 @@ DROPCAP only works
<ul style="margin-top: -1em; margin-bottom: -.5em;">
<li>with initial paragraphs (i.e. at the start of the document,
or after
- <a href="docelement.html#head">HEAD</a>),</li>
+ <a href="docelement.html#heading">HEADING</a>),</li>
<li>when <kbd>.DROPCAP</kbd> comes immediately after <kbd>.PP</kbd>,</li>
<li>the
<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
is TYPESET.</li>
</ul>
-<p class="tip-bottom">
+<p>
If these conditions aren’t met, DROPCAP is silently ignored.
</p>
+
+<p class="tip-bottom" style="margin-top: -1em;">
+<span class="additional-note">Additional note:</span>
+If you have dropcaps after
+<a href="docelement.html#heading">HEADING</a>s,
+you must increase the <kbd>NEEDS</kbd> argument to
+<a href="docelement.html#heading-style">HEADING_STYLE</a>
+to match the number of dropcap lines. For example, assuming
+dropcaps that are three lines tall:
+<br/>
+<span class="pre-in-pp">
+ .HEADING_STYLE 1 NEEDS 3
+</span>
+</p>
</div>
<div class="box-important">
@@ -1485,8 +1502,8 @@ Superscripts are accomplished
<a href="definitions.html#inlines">inline</a>.
Whenever you need one, typically for numerals, all you need
to do is surround the superscript with the inlines above.
-<kbd><nobr>\*[SUP]</nobr></kbd> begins superscripting;
-<kbd><nobr>\*[SUPX]</nobr></kbd> turns it off.
+<kbd><span class="nobr">\*[SUP]</span></kbd> begins superscripting;
+<kbd><span class="nobr">\*[SUPX]</span></kbd> turns it off.
</p>
<p id="cond-or-ext-sup">
@@ -1497,8 +1514,8 @@ or
and you want your superscripts to be equivalently pseudo-condensed
or -extended, use
<br/>
-<kbd><nobr>\*[CONDSUP]...\*[CONDSUPX]</nobr></kbd> or
-<kbd><nobr>\*[EXTSUP]...\*[EXTSUPX]</nobr></kbd>.
+<kbd><span class="nobr">\*[CONDSUP]...\*[CONDSUPX]</span></kbd> or
+<kbd><span class="nobr">\*[EXTSUP]...\*[EXTSUPX]</span></kbd>.
</p>
<p>
@@ -1588,6 +1605,8 @@ Inline: <b>\*[HANG <kbd
class="macro-args"><character></kbd>]</b>
Hung characters, frequently punctuation, fall outside the left or
right margin. Their purpose is usually to fine-tune justification.
Consider the following:
+</p>
+
<table style="margin-left: 3%; margin-right: 6%; text-align: justify">
<tr>
<td style="padding-right: 1em">
@@ -1611,10 +1630,8 @@ Play the man, Master Ridley; we
shall this day light such a candle,
by God's grace, in England, as I
trust shall never be put out.”</td>
-</td>
</tr>
</table>
-</p>
<p>
In the right hand example, the opening double-quote hangs outside
@@ -1641,7 +1658,7 @@ double-quote (<kbd>"</kbd>) entered as the input text so
as not to
confuse
<a href="goodies.html#smartquotes">SMARTQUOTES</a>
The following example demonstrates:
-<br>
+<br/>
<span class="pre-in-pp">
.LEFT_HANG \[lq] 1p
"\*[FWD 1p]This line will have its opening double-quote
@@ -1679,7 +1696,7 @@ the right margin of justified or quad right copy. The
argument may
be a single character, or a single character preceded by a
horizontal motion, effectively establishing a gutter between the
right margin and the hung character:
-<br>
+<br/>
<span class="pre-in-pp" style="margin-bottom: .25em">
This line will have its closing period hung outside
the right margin with a one point gutter\*[HANG \*[FWD 1p].]
@@ -1690,7 +1707,7 @@ character surrounded by double-quotes). The
double-quotes are
required for all special characters of the form
<kbd style="whitespace: nowrap">\[name]</kbd>.
Horizontal motion, if any, must fall inside the double-quotes:
-<br>
+<br/>
<span class="pre-in-pp">
...and they all lived happily ever after.\*[HANG "\*[FWD 1p]\[rq]"]
</span>
@@ -1698,7 +1715,7 @@ Horizontal motion, if any, must fall inside the
double-quotes:
<p>
If the hung character is a hyphen,
-<kbd style="whitespace: nowrap"><nobr>\*[HANG -]</nobr></kbd>
+<kbd style="whitespace: nowrap"><span class="nobr">\*[HANG -]</span></kbd>
must come at the end of an
<a href="definitions.html#inputline">input line</a>.
This restriction does not apply to other characters, which may come
diff --git a/contrib/mom/momdoc/graphical.html
b/contrib/mom/momdoc/graphical.html
index 08458f827..0f373b74e 100644
--- a/contrib/mom/momdoc/graphical.html
+++ b/contrib/mom/momdoc/graphical.html
@@ -249,7 +249,7 @@ macro
<a href="inlines.html#rule-weight">RULE_WEIGHT</a>.
DRH, used this way, is exactly equivalent to entering the
<a href="definitions.html#inlines">inline escape</a>
-<a href="inlines.html#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
+<a href="inlines.html#inline-rule-mom"><kbd><span
class="nobr">\*[RULE]</span></kbd></a>.
</p>
</div>
diff --git a/contrib/mom/momdoc/headfootpage.html
b/contrib/mom/momdoc/headfootpage.html
index 7d4647279..488bf0418 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -312,11 +312,11 @@ the bottom margin.)
<p>
Confused? Mom apologizes. It’s really quite simple. By
-default, mom sets headers <nobr>4-1/2</nobr>
+default, mom sets headers <span class="nobr">4-1/2</span>
<a href="definitions.html#picaspoints">picas</a>
down from the top of the page and begins the running text 3 picas
(the HEADER_GAP) beneath that, which means the effective top margin
-of the running text is <nobr>7-1/2</nobr> picas (visually approx. 1
+of the running text is <span class="nobr">7-1/2</span> picas (visually approx.
1
inch). However, if you give mom a literal top margin (with
<a href="typesetting.html#t-margin">T_MARGIN</a>),
she ignores the HEADER_GAP and starts the running text at whatever
@@ -752,7 +752,7 @@ Then, you’d prepare mom for the next document:
.AUTHOR "Josephine Blough"
</span>
Then, you’d redefine the header-centre string using the
-reserved string <kbd><nobr>\*[$TITLE]</nobr></kbd>, like this:
+reserved string <kbd><span class="nobr">\*[$TITLE]</span></kbd>, like this:
<br/>
<span class="pre-in-pp">
.HEADER_CENTER "\E*[$TITLE]"
@@ -817,7 +817,7 @@ string you pass to HEADER_LEFT, _CENTER, or _RIGHT, (as
opposed to replacing the string with the page number), use the
special
<a href="definitions.html#inlines">inline escape</a>
-<kbd><nobr>\*[PAGE#]</nobr></kbd> in the string argument.
+<kbd><span class="nobr">\*[PAGE#]</span></kbd> in the string argument.
</p>
<p>
@@ -1114,7 +1114,7 @@ or
and you want various elements within the header to be colourized,
embed the colours in the string passed to HEADER_RECTO or
HEADER_VERSO with the
-<a
href="color.html#color-inline"><kbd><nobr>\*[<colorname>]</nobr></kbd></a>
+<a href="color.html#color-inline"><kbd><span
class="nobr">\*[<colorname>]</span></kbd></a>
<a href="definitions.html#inlines">inline escape</a>.
</p>
@@ -1636,7 +1636,7 @@ or flush right, and both take a single
with which, by combining text and
<a href="definitions.html#inlines">inline escapes</a>,
you can make the headers come out just about any way you want. Use
-of the <kbd><nobr>\*[PAGE#]</nobr></kbd> escape is permitted in the
+of the <kbd><span class="nobr">\*[PAGE#]</span></kbd> escape is permitted in
the
string argument (see
<a href="#page-number-incl">Including the page number in header-left, -centre
or -right</a>),
and, as an added bonus, mom provides a special mechanism whereby
@@ -1701,7 +1701,7 @@ want the header
<p>
The second argument (optional) tells mom to capitalize the text of
the header. <b>Please note:</b> Do not use
-<a href="inlines.html#uc-lc"><kbd><nobr>\*[UC]...\*[LC]</nobr></kbd></a>
+<a href="inlines.html#uc-lc"><kbd><span
class="nobr">\*[UC]...\*[LC]</span></kbd></a>
inside the string passed to HEADER_RECTO.
</p>
@@ -1712,7 +1712,7 @@ mom’s normal 3-part headers, therefore anything you
want in
the headers must be entered by hand in the string, including colours
(via the
<a href="definitions.html#inlines">inline escape</a>
-<a
href="color.html#color-inline"><kbd><nobr>\*[<colorname>]</nobr></kbd></a>).
+<a href="color.html#color-inline"><kbd><span
class="nobr">\*[<colorname>]</span></kbd></a>).
</p>
<p>
@@ -1724,11 +1724,11 @@ and
may be used to change the default family and size. Changes to the
font(s) within the string must be accomplished with the
<a href="definitions.html#inlines">inline escapes</a>
-<kbd><nobr>\*[ROM]</nobr></kbd>,
-<kbd><nobr>\*[IT]</nobr></kbd>,
-<kbd><nobr>\*[BD]</nobr></kbd>,
-<kbd><nobr>\*[BDI]</nobr></kbd>,
-and <kbd><nobr>\*[PREV]</nobr></kbd> (see
+<kbd><span class="nobr">\*[ROM]</span></kbd>,
+<kbd><span class="nobr">\*[IT]</span></kbd>,
+<kbd><span class="nobr">\*[BD]</span></kbd>,
+<kbd><span class="nobr">\*[BDI]</span></kbd>,
+and <kbd><span class="nobr">\*[PREV]</span></kbd> (see
<a href="inlines.html#inline-fonts-mom">Changing fonts</a>).
Additional refinements to the style of the header-recto string,
including horizontal spacing and/or positioning, can also be made
@@ -1737,7 +1737,7 @@ with inline escapes.
<p>
To include the current page number in the string, use the
-<kbd><nobr>\*[PAGE#]</nobr></kbd>
+<kbd><span class="nobr">\*[PAGE#]</span></kbd>
<a href="definitions.html#inlines">inline escape</a>.
</p>
@@ -1789,7 +1789,7 @@ Notice that the quad argument, <kbd>LEFT</kbd>, is used
in both
cases. When padding a header, it doesn’t matter which
quad argument you use, although you must be sure to supply
one. Also note that mom does not interpret the <kbd>#</kbd> in
-<kbd><nobr>\*[PAGE#]</nobr></kbd> as a padding marker (i.e. as a
+<kbd><span class="nobr">\*[PAGE#]</span></kbd> as a padding marker (i.e. as a
place to insert whitespace).
</p>
@@ -1942,13 +1942,13 @@ L "^\E*[$AUTHOR]#\*[PAGE#]^" |
|
</span>
<p>
-<kbd><nobr>\E*[$TITLE]</nobr></kbd> and
-<kbd><nobr>\E*[$AUTHOR]</nobr></kbd> will print the strings you pass
+<kbd><span class="nobr">\E*[$TITLE]</span></kbd> and
+<kbd><span class="nobr">\E*[$AUTHOR]</span></kbd> will print the strings you
pass
to
<a href="docprocessing.html#title">TITLE</a>
and
<a href="docprocessing.html#author">AUTHOR</a>;
-<kbd><nobr>\*[PAGE#]</nobr></kbd> is how you include the page number
+<kbd><span class="nobr">\*[PAGE#]</span></kbd> is how you include the page
number
in a header or footer string. (For a list of special strings you
can use in headers and footers, see
<a href="#reserved-strings">here</a>.)
@@ -2175,7 +2175,7 @@ you’d enter
</span>
Notice that the page number is entered symbolically with the
<a href="definitions.html#inlines">inline escape</a>
-<span style="white-space:nowrap"><kbd><nobr>\*[PAGE#]</nobr></kbd>,</span>
+<span style="white-space:nowrap"><kbd><span
class="nobr">\*[PAGE#]</span></kbd>,</span>
while the total number of pages must be entered explicitly after the
document is complete and the total number of pages known.
</p>
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index 8e3818735..6921aaedb 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -54,7 +54,7 @@ FDL in the main directory of the groff source package.
<li><a href="#pdf-image-frame">PDF_IMAGE_FRAME</a>—set parameters
for image frames</li>
</ul></li>
<li><a href="#pspic">The PSPIC macro</a></li>
- </ul>
+ </ul></li>
<li><a href="#floats-intro">Floats</a>
<ul>
<li><a href="#float">The FLOAT macro</a></li>
@@ -79,11 +79,9 @@ FDL in the main directory of the groff source package.
<li><a href="#ps-pe">.PS / .PE macros and arguments</a></li>
<li><a href="#pic-text-style">PIC_TEXT_STYLE</a>—set parameters
for text in diagrams</li>
</ul></li>
- <li><a href="#grap">grap</a>
- <ul style="margin-left: -1em;">
- </ul></li>
+ <li><a href="#grap">grap</a></li>
<li><a href="#refer">refer</a></li>
- </ul>
+ </ul></li>
<li><a href="#captions-and-labels">Captions and labels</a>
<ul>
<li><a href="#autolabel">AUTOLABEL</a></li>
@@ -104,21 +102,22 @@ FDL in the main directory of the groff source package.
<li><a href="#box-intro">Shaded backgrounds and frames (boxes)</a>
<ul>
<li><a href="#box-intro">Introduction and description</a></li>
- <li><a href="#box-macro">The BOX macro</a></li>
- <li><a href="#box-notes">Additional notes on box usage and
behaviour</a></li>
+ <li><a href="#box">The BOX macro</a></li>
+ <li><a href="#box-notes">Additional notes on box usage and behaviour</a>
<ul>
<li><a href="#qbef">QUOTE, BLOCKQUOTE, EPIGRAPH, FLOAT</a></li>
- <li><a href="#code">CODE</li>
- <li><a href="#quotes">Description of boxed BLOCKQUOTEs and
EPIGRAPHs</a></li>
+ <li><a href="#code">CODE</a></li>
+ <li><a href="#quotes">Description of boxed BLOCKQUOTEs and
EPIGRAPHs</a>
<ul style="margin-left: -1em; list-style: disc;">
<li><a href="#leftover">Leftover box syndrome</a></li>
- </ul>
+ </ul></li>
<li><a href="#slides">Slides</a></li>
<li><a href="#footnotes">Footnotes</a></li>
- </ul>
+ </ul></li>
<li><a href="#page-color-intro">Page colour</a></li>
</ul>
</li>
+</ul>
</div>
<div class="rule-medium"><hr/></div>
@@ -137,7 +136,7 @@ containing PDF and EPS images must be processed, hence
documents may
not contain a mix.
</p>
-<h3 id=converting class="docs">Image conversion and file processing</h3>
+<h3 id="converting" class="docs">Image conversion and file processing</h3>
<p>
When your image files are not in PDF or EPS format—jpgs,
@@ -244,7 +243,7 @@ Unlike
which it resembles, PDF_IMAGE requires that the pdf image’s
dimensions (the bounding box,
<a href="#bounding-box">see below</a>)
-be supplied each time it’s called.</p>
+be supplied each time it’s called.
</p>
<p>
@@ -411,8 +410,8 @@ linked to from other places in the file (with PDF_LINK; see
</p>
<p>
-<b><i>Please note:</b> The following functionality is available
-only with groff 1.22.4 or later.</i>
+<b><i>Please note:</i></b> The following functionality is available
+only with groff 1.22.4 or later.
</p>
<p>
@@ -422,7 +421,7 @@ is enabled and the document is processed with
<a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
the target name can be used to generate the target’s label
number in running text if it is entered as a groff string, i.e. of the
-form <kbd><nobr>\*[name]</nobr></kbd>. For example, if you create
+form <kbd><span class="nobr">\*[name]</span></kbd>. For example, if you create
a target named “foo” for a pdf image whose autolabel
number would be 3, entering
<br/>
@@ -490,6 +489,8 @@ entered as two adjacent double-quotes. So, for example,
</span>
leaves the inset value and rule weight at their current value and
changes the frame colour to blue.
+</p>
+
<p>
Frames are drawn <span class="italic">outside</span> the image at
its requested dimensions inclusive of scaling. Colours must be
@@ -1040,7 +1041,7 @@ is 1/4 linespace.
</div>
<div class="box-macro-args">
-Macro: <b>LABEL</b></a>
+Macro: <b>LABEL</b>
<kbd class="macro-args">"<label>" [ CAPTION "<caption>" ] [
SHORT_CAPTION ] \
<br/>
[ TO_LIST FIGURES | TABLES | EQUATIONS ]</kbd>
@@ -1077,10 +1078,10 @@ before ending the float:
<p>
Mom reserves strings you may use when entering
label text after the <kbd>LABEL</kbd> argument.
-<kbd><nobr>\*[chapter]</nobr></kbd> holds the current chapter
-or major section number. <kbd><nobr>\*[fig-label]</nobr></kbd>,
-<kbd><nobr>\*[tbl-label]</nobr></kbd>, and
-<kbd><nobr>\*[eqn-label]</nobr></kbd> increment the label number of
+<kbd><span class="nobr">\*[chapter]</span></kbd> holds the current chapter
+or major section number. <kbd><span class="nobr">\*[fig-label]</span></kbd>,
+<kbd><span class="nobr">\*[tbl-label]</span></kbd>, and
+<kbd><span class="nobr">\*[eqn-label]</span></kbd> increment the label number
of
the appropriate label type by one, and are initially set to zero
after each invocation of
<a href="docprocessing.html#start">START</a>
@@ -1098,7 +1099,7 @@ produce <kbd>Fig. 2.3.</kbd>
<p>
If your <b>DOCTYPE</b> is <kbd>DEFAULT</kbd> or <kbd>NAMED</kbd>,
-you must reset <kbd><nobr>\*[<type>-label]</nobr></kbd> after
+you must reset <kbd><span class="nobr">\*[<type>-label]</span></kbd>
after
each
<a href="docprocessing.html#collate">COLLATE</a>
by entering
@@ -1176,12 +1177,13 @@ which may be one of <kbd>FIGURES</kbd>,
<kbd>TABLES</kbd>, or
<p>
If, for some reason, you want only the caption appended to the List,
-give <kbd>\&</kbd> as the first argument to LABEL, followed by
+give <kbd>\&</kbd> as the first argument to LABEL, followed by
<kbd>CAPTION “caption”</kbd>:
<br/>
<span class="pre-in-pp">
- .LABEL \& \
- CAPTION "caption"
+ .LABEL \& \
+ CAPTION "caption"
+</span>
</p>
<div class="box-tip">
@@ -1202,6 +1204,7 @@ List of Examples with
<br/>
<span class="pre-in-pp">
.TO_FIGURES EQUATIONS
+</span>
</p>
</div>
@@ -1210,7 +1213,7 @@ List of Examples with
</div>
<div class="box-macro-args">
-Macro: <b>CAPTION</b></a>
+Macro: <b>CAPTION</b>
<kbd class="macro-args">"<caption>" \
<br/>
[ "<additional line>" [ "<additional line>"... ] ] \
@@ -1452,7 +1455,7 @@ required)
<br/>
Macro: <a href="#th"><b>TH</b></a> <kbd class="macro-args">(optional, only if
.TS H)</kbd>
<br/>
-Macro: <a href="#te"><b>TE</b></a> <kbd class="macro-args">[ SOURCE "<text
of table source>" ]
+Macro: <a href="#te"><b>TE</b></a> <kbd class="macro-args">[ SOURCE "<text
of table source>" ]</kbd>
</div>
<p>
@@ -1707,8 +1710,8 @@ linked to from other places in the file (with PDF_LINK;
see
</p>
<p>
-<b><i>Please note:</b> The following functionality is available
-only with groff 1.22.4 or later.</i>
+<b><i>Please note:</i></b> The following functionality is available
+only with groff 1.22.4 or later.
</p>
<p>
@@ -1718,7 +1721,7 @@ is enabled and the document is processed with
<a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
the target name can be used to generate the target’s label
number in running text if it is entered as a groff string, i.e. of
-the form <kbd><nobr>\*[name]</nobr></kbd>. For example, if you
+the form <kbd><span class="nobr">\*[name]</span></kbd>. For example, if you
create a target called “foo” for a table whose autolabel
number would be 3, entering
<br/>
@@ -1752,7 +1755,7 @@ you don’t, in fact, want a running header (e.g. when
your table has a caption), you can suppress it by placing
<kbd>.TH</kbd> immediately underneath your <kbd>tbl</kbd> formatting
specifications, the last line of which always ends with a period
-(see <kbd>tbl(1)</kbd>).</p>
+(see <kbd>tbl(1)</kbd>).
</p>
<p>
@@ -1992,8 +1995,8 @@ linked to from other places in the file (with PDF_LINK;
see
</p>
<p>
-<b><i>Please note:</b> The following functionality is available
-only with groff 1.22.4 or later.</i>
+<b><i>Please note:</i></b> The following functionality is available
+only with groff 1.22.4 or later.
</p>
<p>
@@ -2003,7 +2006,7 @@ is enabled and the document is processed with
<a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
the target name can be used to generate the target’s label
number in running text if it is entered as a groff string, i.e. of
-the form <kbd><nobr>\*[name]</nobr></kbd>. For example, if you
+the form <kbd><span class="nobr">\*[name]</span></kbd>. For example, if you
create a target called “foo” for a diagram whose
autolabel number would be 3, entering
<br/>
@@ -2017,7 +2020,7 @@ labels, the same string in, say, chapter 5 would produce
the pdf
link “Figure 5.3”.
</p>
-<!---PIC_TEXT_STYLE--->
+<!-- PIC_TEXT_STYLE -->
<div class="macro-id-overline">
<h3 id="pic-text-style" class= "macro-id">PIC_TEXT_STYLE</h3>
@@ -2152,7 +2155,7 @@ required)
<br/>
[ TARGET "<name>" ]
<br/>
-Macro: <a href="#en"><b>EN</b></a> <kbd class="macro-args"> [ CONTINUED | CONT
| ... ]</kbd>
+ [ CONTINUED | CONT | ... ]</kbd>
</div>
<div class="box-tip">
@@ -2237,7 +2240,6 @@ the page. If there are no others, the final equation
should be
flex-spaced, i.e. not given the <kbd>NO_FLEX</kbd> argument.
</p>
-</p>
<h5 class="docs" style="margin-top: 1em; text-transform: none">CAPTION</h5>
<p>
@@ -2287,8 +2289,8 @@ be linked to from other places in the file (with
PDF_LINK; see
</p>
<p>
-<b><i>Please note:</b> The following functionality is available
-only with groff 1.22.4 or later.</i>
+<b><i>Please note:</i></b> The following functionality is available
+only with groff 1.22.4 or later.
</p>
<p>
@@ -2298,7 +2300,7 @@ is enabled and the document is processed with
<a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
the target name can be used to generate the target’s label
number in running text if it is entered as a groff string, i.e. of
-the form <kbd><nobr>\*[name]</nobr></kbd>. For example, if you
+the form <kbd><span class="nobr">\*[name]</span></kbd>. For example, if you
create a target called “foo” for an equation whose
autolabel number would be 3, entering
<br/>
@@ -2324,7 +2326,7 @@ A block of <b>eqn</b> code is terminated with
<kbd>.EN</kbd>.
<p>
If an equation needs to span multiple lines, possibly aligned
with <b>eqn</b>’s <kbd>'mark'</kbd> and <kbd>'lineup'</kbd>
-directives, separate invocations of <kbd><nobr>.EQ/.EN</nobr></kbd>
+directives, separate invocations of <kbd><span
class="nobr">.EQ/.EN</span></kbd>
are required for each line, and the optional argument,
<kbd>CONTINUED</kbd> (or <kbd>CONT</kbd>, or <kbd>...</kbd> [three
dots, an ellipsis]), must be passed to <kbd>.EN</kbd>.
@@ -2435,7 +2437,7 @@ Tables.
Autolabelling may be disabled on-the-fly by giving any argument
other than <kbd>PREFIX</kbd>, <kbd>SUFFIX</kbd>, or
<kbd>PREFIX_CHAPTER</kbd> to the appropriate macro. For example,
-</br>
+<br/>
<span class="pre-in-pp">
.AUTOLABEL_IMAGES NO
</span>
@@ -2515,6 +2517,7 @@ If you do not supply the <kbd>PREFIX_CHAPTER</kbd>
argument, the
label number is <i>not</i> reset automatically. To reset it, invoke
<kbd>.AUTOLABEL_<type></kbd> after each
<a href="docprocessing.html#collate">COLLATE</a>.
+</p>
</div>
<div id="set-autolabel" class="box-macro-args" style="margin-top: .5em">
@@ -2555,8 +2558,7 @@ means the next autolabelled Figure will be “Fig.
6.”
</div>
<div class="box-macro-args" style="margin-top: .5em">
-Macro: <b>CAPTION_AFTER_LABEL</b> <kbd class="macro-args">IMG | PIC | TBL |
ALL [ <anything></kbd> ]
-</kbd>
+Macro: <b>CAPTION_AFTER_LABEL</b> <kbd class="macro-args">IMG | PIC | TBL |
ALL [ <anything> ]</kbd>
</div>
<p>
@@ -2615,8 +2617,7 @@ Rather, you must do
</div>
<div class="box-macro-args" style="margin-top: .5em">
-Macro: <b>MLA</b> <kbd class="macro-args"> [ <anything></kbd> ]
-</kbd>
+Macro: <b>MLA</b> <kbd class="macro-args"> [ <anything> ]</kbd>
</div>
<p>
@@ -2728,7 +2729,7 @@ set quad right, and their captions centered.
Regardless of the quad direction, captions, labels and sources
are set on the width of the figure, table, or pdf image
unless you pass the optional <kbd>ON_LL</kbd> argument to
-<kbd><nobr>QUAD <direction></nobr></kbd>, in which case
+<kbd><span class="nobr">QUAD <direction></span></kbd>, in which case
the prevailing document line length is used instead.
</p>
@@ -2741,7 +2742,7 @@ equation positioning, which is, again by default,
centered. If the
equation is positioned left, the label will appear at the right
margin regardless of the direction you give to <kbd>QUAD</kbd>. If
the equation is indented with the
-<kbd><nobr>-I <indent></nobr></kbd> option, a quad
+<kbd><span class="nobr">-I <indent></span></kbd> option, a quad
direction of <kbd>LEFT</kbd> is observed, but may overprint the last
line of the equation.
</p>
@@ -2886,6 +2887,7 @@ Macro: <b>LIST_OF_TABLES</b>
<kbd class="macro-args">Arguments:
<br/>
[ TITLE_STRING "<string>" ] [ START_PAGENUM <page
number> ]
+</kbd>
</div>
<p>
@@ -3162,7 +3164,7 @@ is <kbd>TYPEWRITE</kbd> or when
</div>
<div class="macro-id-overline">
-<h3 id="pdf-image" class= "macro-id">BOX</h3>
+<h3 id="box" class= "macro-id">BOX</h3>
</div>
<div id="box-macro" class="box-macro-args" style="margin-top: .5em">
@@ -3182,7 +3184,7 @@ Arguments:
</kbd>
</div>
-</p>
+<p>
Without arguments, BOX begins a shaded grey background.
The material inside is inset by one
<a href="definitions.html#picaspoints">pica</a>.
@@ -3258,7 +3260,9 @@ require a colour, e.g.
.BOX SHADED blue OUTLINED black
</span>
The colour may be
-<ul style="margin-top: -1em;" display="inline">
+</p>
+
+<ul style="margin-top: -1em;">
<li>an xcolor name</li>
<li>a colour initialized with
<a href="color.html#newcolor">NEWCOLOR</a>
@@ -3267,6 +3271,8 @@ The colour may be
</li>
<li>an RGB hexadecimal string beginning with (e.g. #FF0000)</li>
</ul>
+
+<p>
Note that without <kbd>SHADED</kbd>, the above would simply draw a
black frame.
</p>
@@ -3359,7 +3365,7 @@ require that boxes be started <i>after</i> they are
invoked and stopped just before they are toggled off:
<span class="pre-in-pp">
.QUOTE
- .BOX <parameters>
+ .BOX <parameters>
Text of quote
.BOX OFF
.QUOTE OFF
@@ -3464,12 +3470,12 @@ in printed documents, it can be effective in
<h3 id="page-color" class= "macro-id">PAGE_COLOR</h3>
</div>
-<div id="box-macro" class="box-macro-args" style="margin-top: .5em">
-Macro: <b>PAGE_COLOR</b> <kbd class="macro-args"> <color> | OFF | off
+<div id="page-color-macro" class="box-macro-args" style="margin-top: .5em">
+Macro: <b>PAGE_COLOR</b> <kbd class="macro-args"> <color> | OFF |
off</kbd>
</div>
<p class="requires" style="font-style: normal">
<i>Aliased as</i> <kbd>PAGE_COLOUR</kbd>, <kbd>SLIDE_COLOR</kbd>,
-<i>and</i> <kbd>SLIDE_COLOUR</kbd.
+<i>and</i> <kbd>SLIDE_COLOUR</kbd>.
</p>
<p>
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index df082a514..8613161a1 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -96,7 +96,7 @@ brackets.
<p>
Mom recognizes that certain escapes get used more often than others.
For these, she has a consistent input style that takes the form
-<kbd><nobr></nobr>\*[...]</nobr></kbd>, which makes them stand out well
+<kbd><span class="nobr">\*[...]</span></kbd>, which makes them stand out well
from the text of your documents. These escapes are the ones listed
under
<a href="#inlines-mom">Mom’s personal inline escapes</a>.
@@ -176,11 +176,11 @@ Mom provides five escapes for changing fonts inline:
<div class="box-tip">
<p class="tip">
<span class="note">*Note:</span>
-<kbd><nobr>\*[PREV]</nobr></kbd> does not operate "stack
+<kbd><span class="nobr">\*[PREV]</span></kbd> does not operate "stack
style". It returns to the previous font once only, and
afterwards has no effect. In other words, in the case of
-<kbd><nobr>\*[PREV]\*[PREV]</nobr></kbd>, only the first
-<kbd><nobr>\*[PREV]</nobr></kbd> is respected; the second one is silently
+<kbd><span class="nobr">\*[PREV]\*[PREV]</span></kbd>, only the first
+<kbd><span class="nobr">\*[PREV]</span></kbd> is respected; the second one is
silently
ignored.
</p>
</div>
@@ -213,8 +213,8 @@ and/or
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
you must enter the inlines beginning with <kbd>\E*</kbd>
-rather than just <kbd><nobr>\*</nobr></kbd>, e.g.
-<kbd><nobr>\E*[BD]</nobr></kbd>. You may, in such cases, prefer to
+rather than just <kbd><span class="nobr">\*</span></kbd>, e.g.
+<kbd><span class="nobr">\E*[BD]</span></kbd>. You may, in such cases, prefer
to
use the simpler groff inline escape
<a href="#inline-fonts-groff"><kbd>\f</kbd></a>.
</p>
@@ -246,8 +246,8 @@ or
<span class="pre-in-pp">
\*S[12]
</span>
-Entering either <kbd><nobr>\*[SIZE]</nobr></kbd> or
-<kbd><nobr>\*S[]</nobr></kbd> with no argument reverts to the former
+Entering either <kbd><span class="nobr">\*[SIZE]</span></kbd> or
+<kbd><span class="nobr">\*S[]</span></kbd> with no argument reverts to the
former
point size.
</p>
@@ -267,8 +267,8 @@ allowed.
</p>
<p>
-The size given to <kbd><nobr>\*[SIZE <size>]</nobr></kbd>
-or <kbd><nobr>\*S[<size>]</nobr></kbd> may be expressed in
+The size given to <kbd><span
class="nobr">\*[SIZE <size>]</span></kbd>
+or <kbd><span class="nobr">\*S[<size>]</span></kbd> may be expressed in
plus or minus terms, which can be very useful. In the following
examples, the word “mom” will be output 2 points larger
than the point size of the rest of the line.
@@ -296,9 +296,9 @@ and/or
<a href="headfootpage.html#hdrftr-rectoverso">verso</a>
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
-you <i>must</i> use the form <kbd><nobr>\*S[<n>]</nobr></kbd>
+you <i>must</i> use the form <kbd><span
class="nobr">\*S[<n>]</span></kbd>
and enter the inline beginning with <kbd>\E*</kbd>, like this:
-<kbd><nobr>\E*S[<+|-><n>]</nobr></kbd>.
+<kbd><span class="nobr">\E*S[<+|-><n>]</span></kbd>.
</p>
<p class="tip-bottom">
@@ -316,8 +316,8 @@ doesn’t care.
<p>
If you need to capitalise a region of type inline,
bracket the region of type with the inline escapes,
-<kbd><nobr>\*[UC]</nobr></kbd> (Upper Case) and
-<kbd><nobr>\*[LC]</nobr></kbd> (Lower Case), like this:
+<kbd><span class="nobr">\*[UC]</span></kbd> (Upper Case) and
+<kbd><span class="nobr">\*[LC]</span></kbd> (Lower Case), like this:
<br/>
<span class="pre-in-pp">
All work \*[UC]and\*[LC] no play makes Jack a dull boy.
@@ -423,11 +423,11 @@ and/or
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
you <i>must</i> use the forms
-<kbd><nobr>\E*[BU<n>]</nobr></kbd> and
-<kbd><nobr>\E*[FU<n>]</nobr></kbd> (i.e. with no space),
-and enter the inline beginning with <kbd><nobr>\E*</nobr></kbd>
-rather than just <kbd><nobr>\*</kbd></nobr>, e.g.
-<kbd><nobr>\E*[BU4]</nobr></kbd>.
+<kbd><span class="nobr">\E*[BU<n>]</span></kbd> and
+<kbd><span class="nobr">\E*[FU<n>]</span></kbd> (i.e. with no space),
+and enter the inline beginning with <kbd><span class="nobr">\E*</span></kbd>
+rather than just <kbd><span class="nobr">\*</span></kbd>, e.g.
+<kbd><span class="nobr">\E*[BU4]</span></kbd>.
</p>
<p class="tip-bottom">
@@ -488,8 +488,8 @@ For backward compatibility, the forms
also exist (i.e. with no space before the digit and points being
the unit of measure, hence no unit of measure required). Both
accept quarter points, so it’s possible to do,
-for example, <kbd><nobr>\*[FP.5]</nobr></kbd> or
-<kbd><nobr>\*[BP1.25]</nobr></kbd> up to a limit of 12.75 points.
+for example, <kbd><span class="nobr">\*[FP.5]</span></kbd> or
+<kbd><span class="nobr">\*[BP1.25]</span></kbd> up to a limit of 12.75 points.
</p>
</div>
@@ -508,11 +508,11 @@ and/or
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
you <i>must</i> use the forms
-<kbd><nobr>\E*[BP<n>]</nobr></kbd> and
-<kbd><nobr>\E*[FP<n>]</nobr></kbd> (i.e. with no space),
-and enter the inline beginning with <kbd><nobr>\E*</nobr></kbd>
-rather than just <kbd><nobr>\*</nobr></kbd>, e.g.
-<kbd><nobr>\E*[BP.75]</nobr></kbd>. You may, in such cases, prefer
+<kbd><span class="nobr">\E*[BP<n>]</span></kbd> and
+<kbd><span class="nobr">\E*[FP<n>]</span></kbd> (i.e. with no space),
+and enter the inline beginning with <kbd><span class="nobr">\E*</span></kbd>
+rather than just <kbd><span class="nobr">\*</span></kbd>, e.g.
+<kbd><span class="nobr">\E*[BP.75]</span></kbd>. You may, in such cases,
prefer
to use the native groff inline escape
<a href="#inline-horizontal-groff"><kbd>\h</kbd></a>.
</p>
@@ -544,9 +544,10 @@ moves back down by the same amount.
<div class="box-tip">
<p class="tip">
<span class="note">Note:</span>
-<kbd><nobr>\*[UP]</nobr></kbd> and <kbd><nobr>\*[DOWN]</nobr></kbd>
+<kbd><span class="nobr">\*[UP]</span></kbd> and
+<kbd><span class="nobr">\*[DOWN]</span></kbd>
do not work in conjunction with the inline escape,
-<a href="#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
+<a href="#inline-rule-mom"><kbd><span class="nobr">\*[RULE]</span></kbd></a>.
</p>
<p>
@@ -560,8 +561,8 @@ For backward compatibility, the following are also
available:
</p>
<p class="tip-bottom">
-Both <kbd><nobr>\*[ALD]</nobr></kbd> and
-<kbd><nobr>\*[RLD]</nobr></kbd> work in points, hence you
+Both <kbd><span class="nobr">\*[ALD]</span></kbd> and
+<kbd><span class="nobr">\*[RLD]</span></kbd> work in points, hence you
mustn’t use a unit of measure.
</p>
</div>
@@ -581,10 +582,11 @@ and/or
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
you <i>must</i> use the forms
-<kbd><nobr>\E*[ALD<n>]</nobr></kbd> and
+<kbd><span class="nobr">\E*[ALD<n>]</span></kbd> and
<kbd>\E*[RLD<n>]</kbd> (i.e. with no space), and enter the
-inline beginning with <kbd><nobr>\E*</nobr></kbd> rather than just
-<kbd><nobr>\*</nobr></kbd>, e.g. <kbd><nobr>\E*[ALD.5]</nobr></kbd>.
+inline beginning with <kbd><span class="nobr">\E*</span></kbd> rather than just
+<kbd><span class="nobr">\*</span></kbd>,
+e.g. <kbd><span class="nobr">\E*[ALD.5]</span></kbd>.
You may, in such cases, prefer to use the native groff inline
escape
<a href="#inline-vertical-groff"><kbd>\v</kbd></a>.
@@ -599,10 +601,10 @@ escape
Sometimes, you want mom to break a line but not advance on the page.
This can be accomplished with the macro
<a href="typesetting.html#el">EL</a>
-or with the escape <kbd><nobr>\*[B]</nobr></kbd>. Simply attach
-<kbd><nobr>\*[B]</nobr></kbd> to the end of any input line. Using
+or with the escape <kbd><span class="nobr">\*[B]</span></kbd>. Simply attach
+<kbd><span class="nobr">\*[B]</span></kbd> to the end of any input line. Using
the example given in the document entry for EL, you’d use
-<kbd><nobr>\*[B]</nobr></kbd> like this:
+<kbd><span class="nobr">\*[B]</span></kbd> like this:
<br/>
<span class="pre-in-pp">
.LEFT
@@ -625,7 +627,7 @@ from TAB 1 to TAB 2, or TAB 8 to TAB 9) without mom
advancing on the
page. (See the NOTE
<a href="typesetting.html#note-tn">here</a>
if you’re not clear how mom manages tabs and linebreaks.) To
-do so, simply attach the escape <kbd><nobr>\*[TB+]</nobr></kbd> to
+do so, simply attach the escape <kbd><span class="nobr">\*[TB+]</span></kbd> to
the end of the input line in previous tab, like this:
<br/>
<span class="pre-in-pp">
@@ -634,7 +636,7 @@ the end of the input line in previous tab, like this:
Some more text \" In tab 2, same baseline.
</span>
-<kbd><nobr>\*[TB+]</nobr></kbd> works reliably regardless of the
+<kbd><span class="nobr">\*[TB+]</span></kbd> works reliably regardless of the
current
<a href="definitions.html#filled">fill mode</a>.
</p>
@@ -645,10 +647,10 @@ current
<p>
I find I often need rules drawn to the full measure of the
current line or tab length. The official way to do this is
-<kbd><nobr>\l'\n[.l]u'</nobr></kbd>, which is annoying to type,
+<kbd><span class="nobr">\l'\n[.l]u'</span></kbd>, which is annoying to type,
and doesn’t mean a whole heck of a lot if you’re new
-to groff. The inline, <kbd><nobr>\*[RULE]</nobr></kbd>, is a
-simple replacement for <kbd><nobr>\l'\n[.l]u'</nobr></kbd>. Use it
+to groff. The inline, <kbd><span class="nobr">\*[RULE]</span></kbd>, is a
+simple replacement for <kbd><span class="nobr">\l'\n[.l]u'</span></kbd>. Use
it
whenever you need a rule drawn to the full measure of the current
line or tab length, for example:
<br/>
@@ -671,7 +673,7 @@ immediately after a macro.
</p>
<p>
-The weight of the rule drawn with <kbd><nobr>\*[RULE]</nobr></kbd>
+The weight of the rule drawn with <kbd><span class="nobr">\*[RULE]</span></kbd>
is controlled with the macro
<a href="#rule-weight">RULE_WEIGHT</a>.
Mom’s default is 1/2 point.
@@ -680,7 +682,7 @@ Mom’s default is 1/2 point.
<div class="box-tip">
<p class="tip">
<span class="note">Note:</span>
-<kbd><nobr>\*[RULE]</nobr></kbd> draws the rule to the full measure,
+<kbd><span class="nobr">\*[RULE]</span></kbd> draws the rule to the full
measure,
hence it cannot be used to fill the remainder of a partial line with
a rule in this way:
<br/>
@@ -700,10 +702,10 @@ provided with PAD.)
<p>
Please also note that the inline escapes
-<a href="#up"><kbd><nobr>\*[UP]</nobr></kbd></a>
+<a href="#up"><kbd><span class="nobr">\*[UP]</span></kbd></a>
and
<a href="#down"><kbd>\*[DOWN]</kbd></a>
-cannot be used in conjunction with <kbd><nobr>\*[RULE]</nobr></kbd>.
+cannot be used in conjunction with <kbd><span
class="nobr">\*[RULE]</span></kbd>.
</p>
<p>
@@ -747,13 +749,13 @@ fractions are allowed.
RULE_WEIGHT allows you to tell mom how heavy (in other words, how
“thick”) you want the rules drawn with the inline
escape,
-<a href="#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
+<a href="#inline-rule-mom"><kbd><span class="nobr">\*[RULE]</span></kbd></a>.
It takes a single argument: the weight of the rule in
<a href="definitions.html#picaspoints">points</a>
<i>but without the</i>
<a href="definitions.html#unitofmeasure">unit of measure</a>
<kbd>p</kbd> <i>attached</i>. Thus, to set the weight of rules
-drawn with <kbd><nobr>\*[RULE]</nobr></kbd> to 1-1/4 points,
+drawn with <kbd><span class="nobr">\*[RULE]</span></kbd> to 1-1/4 points,
you’d do
<br/>
<span class="pre-in-pp">
@@ -840,7 +842,7 @@ position on the current
<p class="tip">
<span class="note">Note:</span>
<kbd>\h'<distance>'</kbd> is exactly equivalent to a
-<href="#fwd"><kbd><nobr>\*[FWD n<unit>]</nobr></kbd></a>.
+<a href="#fwd"><kbd><span
class="nobr">\*[FWD n<unit>]</span></kbd></a>.
</p>
</div>
@@ -856,7 +858,7 @@ To move backwards by the same amount, do
<p class="tip" style="margin-top: -1em;">
<span class="note">Note:</span>
<kbd>\h'-<distance>'</kbd> is exactly equivalent to
-<a href="#bck"><kbd><nobr>\*[BCK n<unit>]</nobr></kbd></a>.
+<a href="#bck"><kbd><span
class="nobr">\*[BCK n<unit>]</span></kbd></a>.
</p>
</div>
@@ -888,7 +890,7 @@ downward on the current
<p class="tip">
<span class="note">Note:</span>
<kbd>\v'<distance>'</kbd> is exactly equivalent to
-<a href="#down"><kbd><nobr>\*[DOWN n<unit>]</nobr></kbd></a>.
+<a href="#down"><kbd><span
class="nobr">\*[DOWN n<unit>]</span></kbd></a>.
</p>
</div>
@@ -904,7 +906,7 @@ To move upward an equivalent amount, do
<p class="tip">
<span class="note">Note:</span>
<kbd>\v'<-distance>'</kbd> is exactly equivalent to
-<a href="#up"><kbd><nobr>\*[UP n<unit>]</nobr></kbd></a>.
+<a href="#up"><kbd><span
class="nobr">\*[UP n<unit>]</span></kbd></a>.
</p>
</div>
diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html
index bb98ce954..3021eb2ab 100644
--- a/contrib/mom/momdoc/letters.html
+++ b/contrib/mom/momdoc/letters.html
@@ -42,10 +42,10 @@ FDL in the main directory of the groff source package.
<div style="width: 33%; margin: auto;">
<ul class="no-enumerator">
- <li><a href="#letters-intro">Introduction</a>
+ <li><a href="#letters-intro">Introduction</a></li>
<li><a href="#letters-tutorial">Tutorial</a></li>
- <li><a href="#letters-defaults">Mom’s default letter style</a>
- <li><a href="#index-letters-macros">The letter macros</a>
+ <li><a href="#letters-defaults">Mom’s default letter style</a></li>
+ <li><a href="#index-letters-macros">The letter macros</a></li>
</ul>
</div>
diff --git a/contrib/mom/momdoc/macrolist.html
b/contrib/mom/momdoc/macrolist.html
index aed89b9db..81ebd7cb6 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -47,7 +47,7 @@ major user-space macros. The links point to references found
elsewhere in the documentation.
</p>
-<div class="macro-list-container" style="padding-left: 9px; padding-right:
9px; padding-bottom: 1px;">
+<div class="macro-list-container" style="padding-left: 9px; padding-right:
9px; padding-bottom: 9px;">
<h2 class="docs" style="text-align: center; padding-top: 15px;">Index to the
quick reference guide</h2>
<div style="width: 50%; float: left; margin-right: 9px;">
<h3 class="docs" style="margin-top: 1.25em;">TYPESETTING MACROS</h3>
@@ -413,7 +413,7 @@ elsewhere in the documentation.
<td><a href="typesetting.html#inline-st">\*[ST<n>]...</a></td><td>--
string tabs (mark tab positions inline)</td>
</tr>
<tr>
-<td><a href="typesetting.html#inline-st">\*[ST<n>X]</a>
+<td><a href="typesetting.html#inline-st">\*[ST<n>X]</a></td>
</tr>
<tr>
<td><a href="typesetting.html#tn">TN</a></td><td>-- move to tab<n+1>
without advancing on the page</td>
@@ -807,8 +807,10 @@ elsewhere in the documentation.
<tr>
<td><a href="docelement.html#heading-control">Control macros</a></td><td>--
style heading levels</td>
</tr>
+<tr>
<td><a href="docelement.html#heading-style"> HEADING_STYLE</a></td><td>--
set style parameters for heading levels</td>
</tr>
+<tr>
<td><a
href="docelement.html#prefix-chapter-number"> PREFIX_CHAPTER_NUMBER</a></td><td>--
add chapter number to heading numbering</td>
</tr>
</table>
@@ -888,13 +890,13 @@ elsewhere in the documentation.
<a href="images.html#images-intro">+++ Images and graphics</a></th>
</tr>
<tr>
-<td style="vertical-align: top"><a
href="images.html#pdf">PDF_IMAGE</a></td><td>-- inserting pdf images
+<td style="vertical-align: top"><a
href="images.html#pdf">PDF_IMAGE</a></td><td>-- inserting pdf images</td>
</tr>
<tr>
-<td style="vertical-align: top"><a
href="images.html#pdf-image-frame"> PDF_IMAGE_FRAME</a></td><td>-- set
parameters for pdf image frames
+<td style="vertical-align: top"><a
href="images.html#pdf-image-frame"> PDF_IMAGE_FRAME</a></td><td>-- set
parameters for pdf image frames</td>
</tr>
<tr>
-<td style="vertical-align: top"><a
href="images.html#pspic">PSPIC</a></td><td>-- inserting PostScript images
+<td style="vertical-align: top"><a
href="images.html#pspic">PSPIC</a></td><td>-- inserting PostScript images</td>
</tr>
</table>
@@ -904,10 +906,10 @@ elsewhere in the documentation.
<a href="images.html#box-intro">+++ Shaded backgrounds, frames, page
colour</a></th>
</tr>
<tr>
-<td style="vertical-align: top"><a
href="images.html#box-macro">BOX</a> -- shaded backgrounds and frames
+<td style="vertical-align: top"><a
href="images.html#box-macro">BOX</a> -- shaded backgrounds and frames</td>
</tr>
<tr>
-<td style="vertical-align: top"><a
href="images.html#page-color">PAGE_COLOR</a></td><td>
+<td style="vertical-align: top"><a
href="images.html#page-color">PAGE_COLOR</a></td>
</tr>
</table>
@@ -1326,7 +1328,7 @@ elsewhere in the documentation.
<table class="quick-ref">
<tr>
<th id="qr-43" class="quick-ref" colspan="2">
-<a href="docprocessing.html#docheader">+++ Managing a document’s
first-page header<a></th>
+<a href="docprocessing.html#docheader">+++ Managing a document’s
first-page header</a></th>
</tr>
<tr>
<td><a href="docprocessing.html#docheader">DOCHEADER</a></td><td>-- document
first-page header on/off</td>
@@ -1348,7 +1350,7 @@ elsewhere in the documentation.
<td><a href="headfootpage.html#footers">FOOTERS</a></td><td>-- page footers
on/off</td>
</tr>
<tr>
-<td style="vertical-align: top;"><a
href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a></td><td>--
enable generation of both headers and</br>
+<td style="vertical-align: top;"><a
href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a></td><td>--
enable generation of both headers and<br/>
footers</td>
</tr>
<tr>
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
index 963f036e4..5f1181495 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -51,7 +51,7 @@ FDL in the main directory of the groff source package.
<li><a href="#accessing-ref">Accessing references in the database</a></li>
<li><a href="#fn-en-recipe">Entering footnote/endnote references</a></li>
<li><a href="#parenthetical">Parenthetical insertions</a></li>
- <li><a href="#bibliography-from-embedded">Generating a bibliography from
parenthetical insertions</h4></a></li>
+ <li><a href="#bibliography-from-embedded">Generating a bibliography from
parenthetical insertions</a></li>
<li><a href="#bibliography-recipe">Generating a comprehensive
bibliography</a></li>
<li><a href="#invoking-ref">Invoking groff with mom and
<kbd>refer</kbd></a></li>
</ul></li>
@@ -65,7 +65,7 @@ FDL in the main directory of the groff source package.
<li><a href="#database-intro">Introduction</a></li>
<li><a href="#database-rules">Rules</a></li>
<li><a href="#fields-quick">Quick guide to field identifiers (%A for
author, %T for title, etc)</a></li>
- <li><a href="#fields-specifics">Field identifiers: specifics, usage and
examples</a>
+ <li><a href="#fields-specifics">Field identifiers: specifics, usage and
examples</a></li>
</ul></li>
<li><a href="#index-ref">The bibliography and reference macros</a>
<ul style="margin-left: -.5em; list-style-type: disc;">
@@ -293,7 +293,7 @@ either prior to or immediately after invoking
<a href="#bibliography">BIBLIOGRAPHY</a>.
</p>
-<div id="refer-block2" class="examples" style="margin-top: -.5em;">
+<div id="refer-block3" class="examples" style="margin-top: -.5em;">
<div class="examples-container" style="padding-bottom: 1em;">
<span class="pre">
.R1
@@ -654,7 +654,7 @@ will produce “<span style="font-family: times;
font-size: 105%; font-weigh
</p>
<div class="examples-container" style="margin-top: 1.5em; margin-bottom:
1.5em;">
-<h3 id="tutorial-ref" class="docs">The <span style="text-transform:
none">‘label’<span style="text-transform: uppercase"> and <span
style="text-transform: none">‘bracket-label’<span
style="text-transform: uppercase"> commands</h3>
+<h3 class="docs">The <span style="text-transform:
none">‘label’</span><span style="text-transform: uppercase">
and</span> <span style="text-transform:
none">‘bracket-label’</span><span style="text-transform:
uppercase"> commands</span></h3>
<p>
The <kbd>label</kbd> and <kbd>bracket-label</kbd> commands in
@@ -744,9 +744,9 @@ are very few rules, and those there are make sense. In a
nutshell:
<kbd>\[oq]</kbd> and <kbd>\[cq]</kbd> (openquote, closequote) rather
than the
single-quote (or apostrophe) character on your keyboard</li>
<li>if part of a field needs to be forced into italics, use the
- escapes <kbd><nobr>\*[IT]</nobr></kbd> and
- <kbd><nobr>\*[PREV]</nobr></kbd>; if the italicized portion
- concludes the field, omit <kbd><nobr>\*[PREV]</nobr></kbd></li>
+ escapes <kbd><span class="nobr">\*[IT]</span></kbd> and
+ <kbd><span class="nobr">\*[PREV]</span></kbd>; if the italicized portion
+ concludes the field, omit <kbd><span
class="nobr">\*[PREV]</span></kbd></li>
<li>if you require characters with accents, ligatures or special
symbols, use groff’s “named” glyphs (e.g.
<kbd>\['e]</kbd> for <kbd>é</kbd>); a full list can be found in
@@ -1469,7 +1469,7 @@ and
</p>
<p>
-Mom’s default BIBLIOGRAPHY_TYPE is PLAIN.
+Mom’s default BIBLIOGRAPHY_TYPE is <kbd>PLAIN</kbd>.
</p>
<!-- -BIBLIO_CONTROL- -->
diff --git a/contrib/mom/momdoc/stylesheet.css
b/contrib/mom/momdoc/stylesheet.css
index 2a71832a1..6c8c2b3d1 100644
--- a/contrib/mom/momdoc/stylesheet.css
+++ b/contrib/mom/momdoc/stylesheet.css
@@ -39,6 +39,11 @@ a:link.quick { text-decoration: underline; }
font: 1em/1.5em arial,sans-serif ;
}
+.nobr /* Make <nobr> a class property */
+{
+ white-space: nowrap; hyphens: none;
+}
+
/* Heads */
h1.docs
diff --git a/contrib/mom/momdoc/tables-of-contents.html
b/contrib/mom/momdoc/tables-of-contents.html
index 52e6786c6..99d93806f 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -42,17 +42,17 @@ FDL in the main directory of the groff source package.
<div style="width: 68%; margin: auto;">
<ul class="no-enumerator">
- <li><a href="#toc-intro">Introduction to tables of contents</a>
+ <li><a href="#toc-intro">Introduction to tables of contents</a></li>
<li><a href="#toc-appearance">Tables of contents appearance and
behaviour</a></li>
<li><a href="#pdf-output">PDF output</a>
<ul style="margin-left: -.5em; list-style-type: disc;">
- <li><a href="#positioning">Positioning the table of contents</a>
+ <li><a href="#positioning">Positioning the table of contents</a></li>
<li><a href="#auto-relocate-toc">AUTO_RELOCATE_TOC</a></li>
<li><a href="#psselect"><kbd>psselect</kbd></a></li>
</ul></li>
- <li><a href="#toc">The TOC macro</a></li>
+ <li><a href="#toc">The TOC macro</a>
<ul style="margin-left: -.5em; list-style-type: disc;">
- <li><a href="#toc-heading">TOC_HEADING</a>
+ <li><a href="#toc-heading">TOC_HEADING</a></li>
</ul></li>
<li><a href="#toc-control-top">Control macros for tables of contents</a>
<ul style="margin-left: -.5em; list-style-type: disc;">
@@ -400,7 +400,6 @@ themselves (overall family, headers/footers, pagination,
etc).
<li><a href="#toc-header-string">Changing the header string</a></li>
<li><a href="#toc-header-v-pos">Header string vertical placement</a></li>
<li><a href="#toc-header-style">Header string control macros and
defaults</a></li>
- </li>
</ul></li>
<li><a href="#toc-style">Entries and reference page number style</a>
<ul style="margin-left: -.5em;">
@@ -643,7 +642,7 @@ example
<h5 id="toc-header-v-pos" class="docs" style="margin-top: 1em; text-transform:
none;">Header string vertical placement</h5>
-<div id="toc-header-v-pos" class="box-macro-args" style="margin-top: 1em">
+<div id="toc-header-v-pos1" class="box-macro-args" style="margin-top: 1em">
Macro: <b>TOC_HEADER_V_POS</b> <kbd class="macro-args"><distance from top
of page></kbd>
</div>
<p class="requires">
@@ -717,15 +716,14 @@ here.
<p class="defaults" style="padding-top: 6px;">
See
<a href="docelement.html#control-macro-args">Arguments to the control
macros</a>.
-</p>
<span class="pre defaults">
.TOC_PN_FAMILY default = prevailing doc family
.TOC_PN_FONT default = roman
.TOC_PN_SIZE default = 0
</span>
-</div>
</p>
+</div>
<!-- -TOC_TITLE_STYLE- -->
@@ -1099,7 +1097,7 @@ would identify chapter 6 in the table of contents simply
as
<!-- -SPACE_TOC_ITEMS- -->
<div id="space-toc-items" class="box-macro-args">
-Macro: <b>SPACE_TOC_ITEMS</b></kbd>
+Macro: <b>SPACE_TOC_ITEMS</b>
</div>
<p>
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 7cd6a427a..4c5e9aac8 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -270,11 +270,13 @@ FDL in the main directory of the groff source package.
<ul class="toc">
<li><a href="docprocessing.html#docprocessing-intro">5.1 Introduction to
document processing</a></li>
<li><a id="doc-defaults" href="docprocessing.html#defaults">5.2 Document
defaults</a> – papersize, margins, etc.
- <li><a id="vert-ws"
href="docprocessing.html#vertical-whitespace-management">5.3 Vertical
whitespace management</a>
- <ul>
- <li><a id="typemacdoc" href="docprocessing.html#shim">5.3.1
SHIM</a></li>
- <li><a href="docprocessing.html#flex">5.3.2 FLEX</a>
+ <ul>
+ <li><a id="vert-ws"
href="docprocessing.html#vertical-whitespace-management">5.2.1 Vertical
whitespace management</a>
+ <ul>
+ <li><a href="docprocessing.html#shim">5.2.1.1 SHIM</a></li>
+ <li><a href="docprocessing.html#flex">5.2.1.2 FLEX</a></li>
</ul></li>
+ </ul></li>
<li><a id="prelim" href="docprocessing.html#setup" class="highlight">5.3
PRELIMINARY DOCUMENT SETUP</a>
<ul>
<li><a href="docprocessing.html#docprocessing-tut">5.3.1 Tutorial</a>
– setting up a mom document</li>
@@ -308,7 +310,7 @@ FDL in the main directory of the groff source package.
<ul>
<li><a href="docprocessing.html#start">5.3.4.1 START</a> –
the required macro to initiate document processing</li>
</ul></li>
- <li><a href="docprocessing.html#docheader">5.3.5 Managing the
DOCHEADER</a> – title, author, etc. on first page</li>
+ <li><a href="docprocessing.html#docheader">5.3.5 Managing the
DOCHEADER</a> – title, author, etc. on first page
<ul>
<li><a href="docprocessing.html#docheader-control">5.3.5.1
DOCHEADER control</a></li>
</ul></li>
@@ -323,11 +325,11 @@ FDL in the main directory of the groff source package.
<li><a href="docprocessing.html#doc-lead-adjust">5.3.7.2
DOC_LEAD_ADJUST</a> – adjust document
<a href="definitions.html#leading">leading</a>
to fill pages</li>
- </ul>
- <li><a href="docprocessing.html#style-after-start">5.3.8 Changing basic
type and formatting parameters <span style="font-style: italic">after</span>
START</a>
- <ul>
+ </ul></li>
+ <li><a href="docprocessing.html#style-after-start">5.3.8 Changing basic
type and formatting parameters <span style="font-style: italic">after</span>
START</a></li>
+ <li><ul>
<li><a id="typemacdoc" href="docprocessing.html#behaviour">5.3.8.1
Behaviour of the typesetting macros during document processing</a></li>
- <li><a href="docprocessing.html#intro-doc-param">5.3.8.2 Post-START
global style-change macros</a>
+ <li><a href="docprocessing.html#intro-doc-param">5.3.8.2 Post-START
global style-change macros</a></li>
</ul></li>
</ul></li>
<li><a id="tags" class="highlight" href="docelement.html#top">5.4 THE
DOCUMENT ELEMENT TAGS</a>
@@ -368,7 +370,7 @@ FDL in the main directory of the groff source package.
<ul>
<li><a href="images.html#tbl">5.5.6.1 tbl support</a></li>
<li><a href="images.html#eqn">5.5.6.2 eqn support</a></li>
- <li><a href="images.html#pic">5.5.6.3 pic support</a>
+ <li><a href="images.html#pic">5.5.6.3 pic support</a></li>
<li><a href="images.html#grap">5.5.6.4 grap support</a>
<ul style="list-style-type: disc">
<li><a href="images.html#pic-text-style">5.5.6.3.1
PIC_TEXT_STYLE</a></li>
diff --git a/contrib/mom/momdoc/typesetting.html
b/contrib/mom/momdoc/typesetting.html
index 4e0acfe19..171c3649f 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -390,6 +390,8 @@ than to remember the correct dimensions and enter
</span>
If you’d like landscape orientation for your paper type,
pass PAPER the <kbd>LANDSCAPE</kbd> argument.
+</p>
+
<p>
Please read the
<a href="#page-setup-note">Important note on page dimensions and papersize</a>
@@ -1694,7 +1696,7 @@ with the
<i>bothersome, you may prefer to use the</i>
<a href="definitions.html#inlines">inline escape</a>
<i>alternative to</i> EL,
-<a href="inlines.html#b"><kbd><nobr>\*[B]</nobr></kbd></a>,
+<a href="inlines.html#b"><kbd><span class="nobr">\*[B]</span></kbd></a>,
<i>which works consistently regardless of the fill mode.
</i>EL <i>does not work after the</i>
<a href="goodies.html#pad">PAD</a>
@@ -2680,10 +2682,9 @@ Inline: <kbd class="macro-args">\*[SLANTX</kbd>]
</div>
<p>
-<kbd class="macro-args">\*[SLANT]</kbd> begins pseudo-italicizing
-<type. kbd class="macro-args"><nobr>\*[SLANTX]</nobr></kbd> turns
-<the feature off. Both are a href="definitions.html#inlines">inline
-<escapes</a>,
+<kbd class="macro-args">\*[SLANT]</kbd> begins pseudo-italicizing. <kbd
class="macro-args"><span class="nobr">\*[SLANTX]</span></kbd> turns
+the feature off. Both are <a href="definitions.html#inlines">inline
+escapes</a>,
therefore they should not appear as separate lines, but rather be
embedded in text lines, like this:
<br/>
@@ -2696,7 +2697,7 @@ you’d do
<span class="pre-in-pp">
\*[SLANT]Not everything is as it seems.\*[SLANTX]
</span>
-Once <kbd><nobr>\*[SLANT]</nobr></kbd> is invoked, it remains in
+Once <kbd><span class="nobr">\*[SLANT]</span></kbd> is invoked, it remains in
effect until turned off.
</p>
@@ -2749,7 +2750,7 @@ to the mom default, do
emboldening type; it merely tells mom what you want the emboldening
offset to be. To start emboldening, use the
<a href="definitions.html#inlines">inline escape</a>
-<kbd><nobr>\*[BOLDER]</nobr></kbd>.
+<kbd><span class="nobr">\*[BOLDER]</span></kbd>.
</p>
</div>
@@ -2767,8 +2768,8 @@ Inline: <kbd class="macro-args">\*[BOLDERX]</kbd>
<p>
<kbd class="macro-args">\*[BOLDER]</kbd> begins emboldening type.
-<kbd class="macro-args"><nobr>\*[BOLDERX]</nobr></kbd> turns the
-<kbd class="macro-args">feature off. Both are
+<kbd class="macro-args"><span class="nobr">\*[BOLDERX]</span></kbd> turns the
+feature off. Both are
<a href="definitions.html#inlines">inline escapes</a>,
therefore they should not appear as separate lines, but rather be
embedded in text lines, like this:
@@ -2782,7 +2783,7 @@ you’d do
<span class="pre-in-pp">
\*[BOLDER]Not everything is as it seems.\*[BOLDERX]
</span>
-Once <kbd><nobr>\*[BOLDER]</nobr></kbd> is invoked, it remains in
+Once <kbd><span class="nobr">\*[BOLDER]</span></kbd> is invoked, it remains in
effect until turned off.
</p>
@@ -2818,7 +2819,7 @@ want the characters to be condensed.
Mom has no default value for CONDENSE, therefore you must set it
before using the
<a href="definitions.html#inlines">inline escape</a>
-<kbd><a href="#cond-inline"><nobr>\*[COND]</nobr></a></kbd>.
+<kbd><a href="#cond-inline"><span class="nobr">\*[COND]</span></a></kbd>.
80 percent of the normal character width is a good value, and
you’d set it like this:
<br/>
@@ -2834,13 +2835,13 @@ pseudo-condensing type; it merely tells mom what
percentage of the
normal character width you want characters to be condensed. To
start pseudo-condensing, use the
<a href="definitions.html#inlines">inline escape</a>
-<kbd><nobr>\*[COND]</nobr></kbd>.
+<kbd><span class="nobr">\*[COND]</span></kbd>.
</p>
<p class="tip-bottom">
<span class="additional-note">Additional note:</span> Make sure that
pseudo-condensing is off (with
-<kbd><a href="#cond-inline"><nobr>\*[CONDX]</nobr></a></kbd>)
+<kbd><a href="#cond-inline"><span class="nobr">\*[CONDX]</span></a></kbd>)
before making any changes to the pseudo-condense percentage
with CONDENSE.
</p>
@@ -2860,7 +2861,7 @@ Inline: <kbd class="macro-args">\*[CONDX]</kbd>
<p>
<kbd>\*[COND]</kbd> begins pseudo-condensing type.
-<kbd><nobr>\*[CONDX]</nobr></kbd> turns the feature off. Both are
+<kbd><span class="nobr">\*[CONDX]</span></kbd> turns the feature off. Both are
<a href="definitions.html#inlines">inline escapes</a>,
therefore they should not appear as separate lines, but rather be
embedded in text lines, like this:
@@ -2868,20 +2869,20 @@ embedded in text lines, like this:
<span class="pre-in-pp">
\*[COND]Not everything is as it seems.\*[CONDX]
</span>
-<kbd><nobr>\*[COND]</nobr></kbd> remains in effect until you turn it
-off with <kbd><nobr>\*[CONDX]</nobr></kbd>.
+<kbd><span class="nobr">\*[COND]</span></kbd> remains in effect until you turn
it
+off with <kbd><span class="nobr">\*[CONDX]</span></kbd>.
</p>
<div class="box-important">
<p class="tip">
<span class="important">IMPORTANT:</span> You must turn
-<kbd><nobr>\*[COND]</nobr></kbd> off before making any changes to
+<kbd><span class="nobr">\*[COND]</span></kbd> off before making any changes to
the point size of your type, either via the
<a href="#ps">PT_SIZE</a>
macro or with the <kbd>\s</kbd> inline escape. If you wish
the new point size to be pseudo-condensed, simply re-invoke
-<kbd><nobr>\*[COND]</nobr></kbd> afterwards. Equally,
-<kbd><nobr>\*[COND]</nobr></kbd> must be turned off before changing
+<kbd><span class="nobr">\*[COND]</span></kbd> afterwards. Equally,
+<kbd><span class="nobr">\*[COND]</span></kbd> must be turned off before
changing
the condense percentage with
<kbd><a href="#condense">.CONDENSE</a></kbd>.
</p>
@@ -2919,7 +2920,7 @@ characters to be extended.
Mom has no default value for EXTEND, therefore you must set it
before using the
<a href="definitions.html#inlines">inline escape</a>
-<kbd><a href="#ext-inline"><nobr>\*[EXT]</nobr></a></kbd>. 120% of
+<kbd><a href="#ext-inline"><span class="nobr">\*[EXT]</span></a></kbd>. 120%
of
the normal character width is a good value, and you’d set it
like this:
<br/>
@@ -2935,7 +2936,7 @@ pseudo-extending type; it merely tells mom what
percentage of the
normal character width you want characters to be extended. To start
pseudo-extending, use the
<a href="definitions.html#inlines">inline escape</a>
-<kbd><nobr>\*[EXT]</nobr></kbd>.
+<kbd><span class="nobr">\*[EXT]</span></kbd>.
</p>
<p class="tip-bottom">
@@ -2961,7 +2962,7 @@ Inline: <kbd class="macro-args">\*[EXTX]</kbd>
<p>
<kbd>\*[EXT]</kbd> begins pseudo-extending type.
-<kbd><nobr>\*[EXTX]</nobr></kbd> turns the feature off. Both are
+<kbd><span class="nobr">\*[EXTX]</span></kbd> turns the feature off. Both are
<a href="definitions.html#inlines">inline escapes</a>,
therefore they should not appear as separate lines, but rather be
embedded in text lines, like this:
@@ -2970,16 +2971,16 @@ embedded in text lines, like this:
\*[EXT]Not everything is as it seems.\*[EXTX]
</span>
<kbd>\*[EXT]</kbd> remains in effect until you turn it off with
-<kbd><nobr>\*[EXTX]</nobr></kbd>.
+<kbd><span class="nobr">\*[EXTX]</span></kbd>.
</p> <div class="box-important"> <p class="tip">
<span class="important">IMPORTANT:</span> You must turn
-<kbd><nobr>\*[EXT]</nobr></kbd> off before making any changes to the
+<kbd><span class="nobr">\*[EXT]</span></kbd> off before making any changes to
the
point size of your type, either via the
<a href="#ps">PT_SIZE</a>
macro or with the <kbd>\s</kbd> inline escape. If you wish
the new point size to be pseudo-extended, simply re-invoke
-<kbd><nobr>\*[EXT]</nobr></kbd> afterwards. Equally,
-<kbd><nobr>\*[EXT]</nobr></kbd> must be turned off before changing
+<kbd><span class="nobr">\*[EXT]</span></kbd> afterwards. Equally,
+<kbd><span class="nobr">\*[EXT]</span></kbd> must be turned off before changing
the extend percentage with
<a href="#extend">EXTEND</a>.
</p>
@@ -2990,7 +2991,7 @@ the extend percentage with
<a href="docprocessing.html#docprocessing">document processing macros</a>
with
<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
-mom ignores <kbd><nobr>\*[EXT]</nobr></kbd> requests.
+mom ignores <kbd><span class="nobr">\*[EXT]</span></kbd> requests.
</p>
</div>
@@ -3033,7 +3034,7 @@ The line preceding <kbd>.SMALLCAPS OFF</kbd> should
also have a
<span class="note">Note:</span>
SMALLCAPS does not have an inline equivalent to
<a href="inlines.html#uc-lc">
-<kbd><nobr>\*[UC]</kbd> / <kbd><nobr>\*[LC]</nobr></kbd>
+<span class="nobr"><kbd>\*[UC]</kbd> / <kbd>\*[LC]</kbd></span>
</a>.
Furthermore, if you’re using the
<a href="docprocessing.html#docprocessing">document processing macros</a>
@@ -3117,7 +3118,7 @@ page relative to the current
<ul class="macro-list">
<li><a href="#ald">ALD</a> – Advance Lead</li>
<li><a href="#rld">RLD</a> – Reverse Lead</li>
- <li>(see also <a href="#space">SPACE</a>)
+ <li>(see also <a href="#space">SPACE</a>)</li>
</ul>
</div>
@@ -3513,9 +3514,9 @@ The first thing you need for string tabs is an
<a href="definitions.html#inputline">input line</a>
with tab positions marked on it. Tabs are marked with the
<a href="definitions.html#inlines">inline escapes</a>
-<a href="#inline-st"><kbd><nobr>\*[ST<n>]</nobr></kbd></a>
+<a href="#inline-st"><kbd><span class="nobr">\*[ST<n>]</span></kbd></a>
and
-<a href="#inline-st"><kbd><nobr>\*[ST<n>X]</nobr></kbd></a>,
+<a href="#inline-st"><kbd><span class="nobr">\*[ST<n>X]</span></kbd></a>,
where <kbd><n></kbd>
is the number you want the tab to have. (In this example, we
enclose the input line with the
@@ -3554,7 +3555,7 @@ into its component parts:
</span>
</li>
<li>We want a 1 pica (12 points) gutter between tab 1 and 2,
- so we insert 12 points of space with <nobr>\*[FWD 12p]:</nobr>
+ so we insert 12 points of space with <span
class="nobr">\*[FWD 12p]:</span>
<br/>
<span class="pre-in-pp" style="margin-bottom: -.25em;">
\*[FWD 12p]
@@ -3606,7 +3607,7 @@ From here on in, you call the tabs with
<kbd><a href="#tab">.TAB</a></kbd>,
<kbd><a href="#tn">.TN</a></kbd>,
or
-<a href="#tn"><kbd><nobr>\*[TB+]</nobr></kbd></a>
+<a href="#tn"><kbd><span class="nobr">\*[TB+]</span></kbd></a>
just like typesetting tabs (see
<a href="#typesetting-tabs-tut">typesetting tabs tutorial</a>).
</p>
@@ -3677,9 +3678,9 @@ of the tabs have altered because of the new point size.
<p>
Now try increasing the gutters to 2 picas
-(<kbd><nobr>\*[FWD 24p]</nobr></kbd> or
-<kbd><nobr>\*[FWD 2P]</nobr></kbd> instead of
-<kbd><nobr>\*[FWD 12p]</nobr></kbd>). Preview the file again,
+(<kbd><span class="nobr">\*[FWD 24p]</span></kbd> or
+<kbd><span class="nobr">\*[FWD 2P]</span></kbd> instead of
+<kbd><span class="nobr">\*[FWD 12p]</span></kbd>). Preview the file
again,
and notice how the tab structure remains the same, but the gutters
are wider.
</p>
@@ -3821,7 +3822,7 @@ or the
set to
<a href="#lrc"><span style="font-style: normal">LEFT</span></a>
in order for these inlines to function properly. Please see
-<a href="#important"><span style="font-style: normal">IMPORTANT</span></a>,
+<a href="#important1"><span style="font-style: normal">IMPORTANT</span></a>,
below.
</p>
@@ -3873,7 +3874,7 @@ macro.
<div class="box-important">
<p class="tip-top">
-<span id="important" class="important">IMPORTANT:</span>
+<span id="important1" class="important">IMPORTANT:</span>
Owing to the way groff processes
<a href="definitions.html#inputline">input lines</a>
and turns them into
@@ -3951,14 +3952,14 @@ Macro: <b>ST</b> <kbd class="macro-args"><tab
number> L | R | C | J [ QUA
<p>
After string tabs have been marked off on an input line (see
-<a href="#inline-st"><kbd><nobr>\*[ST]...\*[STX]</nobr></kbd></a>),
+<a href="#inline-st"><kbd><span
class="nobr">\*[ST]...\*[STX]</span></kbd></a>),
you need to “set” them by giving them a direction and,
optionally, the <kbd>QUAD</kbd> argument. In this respect, ST is
like
<a href="#tab-set">TAB_SET</a>
except that you don’t have to give ST an indent or a
line length (that’s already taken care of, inline, by
-<kbd><nobr>\*[ST]...\*[STX]</nobr></kbd>). If you want string tab 1
+<kbd><span class="nobr">\*[ST]...\*[STX]</span></kbd>). If you want string
tab 1
to be left, enter
<br/>
<span class="pre-in-pp">
@@ -4028,7 +4029,7 @@ If you want the tabs to line up, use
<a href="#tn">TN</a>
(Tab Next)
or, more conveniently, the inline escape
-<a href="#tn"><nobr>\*[TB+]</nobr></a>:
+<a href="#tn"><span class="nobr">\*[TB+]</span></a>:
<br/>
<span class="pre-in-pp">
.TAB 1
@@ -4091,7 +4092,7 @@ If you find remembering whether to put in the
<a href="definitions.html#inlines" class="normal">inline escape</a>
alternative to
<kbd class="normal">.TN</kbd>,
-<a href="inlines.html#tb-plus-mom"><kbd
class="normal"><nobr>\*[TB+]</nobr></kbd></a>,
+<a href="inlines.html#tb-plus-mom"><kbd class="normal"><span
class="nobr">\*[TB+]</span></kbd></a>,
which works consistently regardless of the fill mode.
</p>
@@ -4119,12 +4120,12 @@ The above example, assuming tabs numbered from 1 to 4,
should be entered
.TN
Some more text\c
.TN
- \&\c
+ \&\c
.TN
Yet more text
</span>
-<kbd>\&</kbd> is a zero-width, non-printing character that groff
+<kbd>\&</kbd> is a zero-width, non-printing character that groff
recognizes as valid input, hence meets the requirement for input
text following <kbd>.TN</kbd>.
</p>
diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html
index d58aaf064..c93e3853d 100644
--- a/contrib/mom/momdoc/using.html
+++ b/contrib/mom/momdoc/using.html
@@ -134,6 +134,7 @@ flyer for your lost dog, the following apply.
FAMILY Garamond \
FONT B \
SIZE +2
+ </span>
</span>
are exactly equivalent.
</li>
@@ -170,6 +171,7 @@ flyer for your lost dog, the following apply.
Implications of Forty-Two as the Answer to Life, \
The Universe, and Everything"
</span>
+ </span>
</li>
</ol>
@@ -238,6 +240,7 @@ As of version 2.0, mom supports full PDF integration. The
creation
and processing of mom files into PostScript documents remains
unchanged from 1.x, but the expected and recommended format of final
documents is now PDF.
+</p>
<p>
The manual,
diff --git a/contrib/mom/momdoc/version-2.html
b/contrib/mom/momdoc/version-2.html
index 219b499be..d3eae2801 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -213,7 +213,7 @@ may now be given in any order.
<p>
The 1.x macros HEAD, SUBHEAD, SUBSUBHEAD, are now deprecated and
have been replaced by the single macro
-<a href="docelement.html#heading">HEADING <kbd><n><kbd></a>,
+<a href="docelement.html#heading">HEADING <kbd><n></kbd></a>,
where <kbd><n></kbd> is the heading level. The deprecated
macros may still be used, and conform in style to their original
defaults; they are, however, wrappers around HEADING levels 1
@@ -243,7 +243,7 @@ will abort with an informational message whenever she
encounters
The macro for setting margin note parameters,
<a href="docelement.html#mn-init">MN_INIT</a>,
has been re-written such that each parameter now has the form
-<kbd><PARAMETER> <value></kbd>. This differs
+<kbd><PARAMETER> <value></kbd>. This differs
from 1.x where parameters were entered without a preceding
<kbd><PARAMETER></kbd> flag. Parameters may be entered in any
order. Any that are skipped are set to default values. Documents
@@ -357,7 +357,7 @@ Version 2.2 adds these features:
</li>
</ul>
-<h2 id="v2.2-changes" class="docs">5. Version 2.5 changes</h2>
+<h2 id="v2.5-changes" class="docs">5. Version 2.5 changes</h2>
<p>
Version 2.5 adds shaded backgrounds and frames that span pages
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: [mom]: xhtml cleanup of momdoc files, update BUGS,
Peter Schaffter <=