PTPi pushed a commit to branch master in repository groff. commit 80c52b201cac1de7fb27b10117eb99458bcbaa85 Author: Peter Schaffter <pe...@schaffter.ca> Date: Sun Nov 3 17:59:52 2019 -0500
Replace errant apostrophes. Replace typewriter apostrophes with ’ html entity. --- contrib/mom/momdoc/appendices.html | 12 +-- contrib/mom/momdoc/color.html | 26 +++---- contrib/mom/momdoc/cover.html | 6 +- contrib/mom/momdoc/docelement.html | 54 +++++++------- contrib/mom/momdoc/docprocessing.html | 93 +++++++++++++++++------ contrib/mom/momdoc/goodies.html | 10 +-- contrib/mom/momdoc/graphical.html | 25 ++++--- contrib/mom/momdoc/headfootpage.html | 6 +- contrib/mom/momdoc/images.html | 116 ++++++++++++++--------------- contrib/mom/momdoc/inlines.html | 24 +++--- contrib/mom/momdoc/letters.html | 4 +- contrib/mom/momdoc/macrolist.html | 3 + contrib/mom/momdoc/refer.html | 10 +-- contrib/mom/momdoc/reserved.html | 2 +- contrib/mom/momdoc/tables-of-contents.html | 12 +-- contrib/mom/momdoc/toc.html | 16 ++-- contrib/mom/momdoc/typesetting.html | 6 +- contrib/mom/momdoc/using.html | 6 +- 18 files changed, 242 insertions(+), 189 deletions(-) diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html index 847c208..6fe71fc 100644 --- a/contrib/mom/momdoc/appendices.html +++ b/contrib/mom/momdoc/appendices.html @@ -542,7 +542,7 @@ and <version>. </p> <p> -In addition, unless you're installing fonts from your home +In addition, unless you’re installing fonts from your home directory, make links to the files 'generate-t42.pe' and 'generate-pfa.pe'. <br/> @@ -583,7 +583,7 @@ Move the .t42 and groff font files to </p> <p> -If you're running a recent version of groff that includes +If you’re running a recent version of groff that includes the native pdf device (gropdf), move the .pfa file to <kbd><prefix>/<version>/font/devpdf/</kbd>. If not, you may safely remove it. You may also safely remove the .afm file. @@ -611,7 +611,7 @@ for advice on naming groff fonts.) </p> <p> -If you're running a recent version of groff that includes the +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 @@ -689,7 +689,7 @@ contain <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 +If you’re running a recent version of groff that includes the native pdf device (gropdf), you must update its download file as well, which is found in <kbd><prefix>/<version>/font/devpdf/</kbd>. The instructions are identical to those above, but with one important @@ -744,7 +744,7 @@ to use it. </p> <p> -For example, the font, Goudy Stout, isn't really part of the +For example, the font, Goudy Stout, isn’t really part of the Goudy family, and while "stout" describes it, Stout is not a recognized font style. Therefore, its groff name could simply be GoudyStout, and whenever you needed it, you could call it with @@ -877,7 +877,7 @@ If you want to visit mom’s website, you’ll find a link to it at <br/> <span class="pre-in-pp"> - http://www.schaffter.ca + https://www.schaffter.ca </span> The site contains links to some of my fiction, all of which was typeset with mom and groff. diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html index d5d5910..40c6293 100644 --- a/contrib/mom/momdoc/color.html +++ b/contrib/mom/momdoc/color.html @@ -66,7 +66,7 @@ with the name of the colour you want. <p id="color-example"> For example, say you want to have the name “Jack” in the sentence “All work and no play makes Jack a dull boy” -appear in yellow. You'd begin by telling mom about the colour, +appear in yellow. You’d begin by telling mom about the colour, yellow. There are two ways of doing this; see <kbd><a href="#newcolor">NEWCOLOR</a></kbd> and @@ -75,7 +75,7 @@ for a full explanation of the difference between the two. </p> <p> -If you use XCOLOR, you'd enter this: +If you use XCOLOR, you’d enter this: <br/> <span class="pre-in-pp"> .XCOLOR yellow @@ -89,8 +89,8 @@ If you use NEWCOLOR, you might enter: <p id="color-example2" style="margin-top: -1em;"> After “defining” (or “initializing”) the -colour “yellow”, you'd colourize the name, Jack, either -with an inline escape +colour “yellow”, you’d colourize the name, Jack, +either with an inline escape <br/> <span class="pre-in-pp"> All work and no play makes \*[yellow]Jack\*[black] a dull boy. @@ -224,8 +224,8 @@ could enter one of the following: .NEWCOLOR YELLOW CYM #00FF00 \"or ##0000FFFF0000 or "0 1 0" .NEWCOLOR YELLOW CYMK #00FF0000 \"or ##0000FFFF00000000 or "0 0 1 0" </span> -After you've told mom about a colour, you can then get her to set -text in that colour either with the +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>\*[<colorname>]</kbd></a>, or the macro @@ -326,8 +326,8 @@ will colourize 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>\*[coral]</kbd> will equally colourize text coral after you've -initialized the colour with XCOLOR.) +<kbd>\*[coral]</kbd> will equally colourize text coral after +you’ve initialized the colour with XCOLOR.) </p> <p> @@ -438,7 +438,7 @@ Inline: <kbd>\*[<colorname>]</kbd> </p> <p> -Once you've told mom about a colour (via +Once you’ve told mom about a colour (via <a href="#newcolor">NEWCOLOR</a> or <a href="#xcolor">XCOLOR</a>, @@ -470,10 +470,10 @@ string argument passed to <a href="docelement.html#subhead">SUBHEAD</a> or <a href="docelement.html#parahead">PARAHEAD</a>, -and you've requested that any of these types of heads be numbered, -the numbers themselves will not be coloured, only the text you -passed the macro. If you wish the numbers to be colourized as well, -you must explicitly tell mom that you wish all of the head(s), +and you’ve requested that any of these types of heads be +numbered, the numbers themselves will not be coloured, only the text +you passed the macro. If you wish the numbers to be colourized as +well, you must explicitly tell mom that you wish all of the head(s), subhead(s) or parahead(s), including the numbers, colourized by invoking the appropriate <a href="docelement.html#docelement-control">control macro</a>. diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html index b08dc9b..363e306 100644 --- a/contrib/mom/momdoc/cover.html +++ b/contrib/mom/momdoc/cover.html @@ -123,7 +123,7 @@ covers in a collated document on-the-fly. Automatic generation of covers or doc-covers after the first one(s) only takes place if you are working with collated documents. Mom provides no mechanism for saying ”print a section cover -here even though I'm still working on the same (non-collated) +here even though I’m still working on the same (non-collated) document.” </p> </div> @@ -397,7 +397,7 @@ what you want on the cover page: <a href="#pagination">COVERS_COUNT_PAGES</a>, the blank page will be taken into account in the pagination scheme, though no page number appears on it. Otherwise, blank - pages are invisible to mom's pagination. + pages are invisible to mom’s pagination. </span> </dd> <dl/> @@ -573,7 +573,7 @@ often require. </p> <p> -Here's a simple recipe for setting an abstract: +Here’s a simple recipe for setting an abstract: <br/> <span class="pre-in-pp"> .COVERTEXT diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html index a6ef1c6..81336fe 100644 --- a/contrib/mom/momdoc/docelement.html +++ b/contrib/mom/momdoc/docelement.html @@ -1355,10 +1355,10 @@ ending in _FAMILY, _FONT, _SIZE, _QUAD, or _COLOR. See <kbd>UNDERSCORE</kbd> and <kbd>UNDERSCORE2</kbd> require that a weight for the underscore be given, in points (decimal fractions allowed), but without the unit of measure <kbd>p</kbd> appended. -They also require that the underscore's distance from the baseline -be supplied; in the case of UNDERSCORE2, an additional gap argument -representing the distance between the two underscores must be -provided. +They also require that the underscore’s distance from the +baseline be supplied; in the case of UNDERSCORE2, an additional gap +argument representing the distance between the two underscores must +be provided. </p> <p class="defaults" style="margin-bottom: 1em"> @@ -1395,9 +1395,9 @@ should not be appended to the argument. <p class="defaults" style="margin-bottom: 1em"> <kbd>SPACE_AFTER</kbd> inserts a blank line equal to the current <a href="definitions.html#leading">leading</a> after a HEADING. -If you'd like a full linespace after a heading level, use -<kbd>SPACE_AFTER</kbd>. If you'd like additional space before a -heading level, you must introduce it yourself with +If you’d like a full linespace after a heading level, use +<kbd>SPACE_AFTER</kbd>. If you’d like additional space before +a heading level, you must introduce it yourself with <a href="typesetting.html#space">SPACE</a> or <a href="typesetting.html#ald">ALD</a>. @@ -1426,7 +1426,7 @@ the same way if flex-spacing is enabled. <p class="defaults" style="padding-bottom: .5em"> The argument list is long, so you may want to break it into several lines by using the backslash character (<kbd>\</kbd>). -Here's an example of how you might style a level 1 heading: +Here’s an example of how you might style a level 1 heading: <br/> <span class="pre defaults"> .HEADING_STYLE 1 \ @@ -1436,7 +1436,7 @@ Here's an example of how you might style a level 1 heading: BASELINE_ADJUST 3p \ NUMBER </span> -This creates a level-1 heading style that's bold, centred, +This creates a level-1 heading style that’s bold, centred, underscored and numbered, raised by 3 points from the baseline. </p> </div> @@ -1570,19 +1570,20 @@ description of the default styles in the sections <a href="#subhead">SUBHEAD</a> (now HEADING 2), and <a href="#subsubhead">SUBSUBHEAD</a> (now HEADING 3). -Mom also emits a message to stderr alerting you to what she's doing. +Mom also emits a message to stderr alerting you to what she’s +doing. </p> <p> The control macros formerly associated with oldstyle headings are no -longer present in mom's macro file, which means that if you -made changes to mom's default for those headings, you must recreate -the changes with the +longer present in mom’s macro file, which means that if you +made changes to mom’s default for those headings, you must +recreate the changes with the <a href="#heading-style">HEADING_STYLE</a> macro. The entire style need not be recreated, only those -parameters that differed from mom's defaults. Thus, if your HEADs -were set flush left, instead of the oldstyle default, centred, but -otherwise kept mom's settings, you need only do +parameters that differed from mom’s defaults. Thus, if your +HEADs were set flush left, instead of the oldstyle default, centred, +but otherwise kept mom’s settings, you need only do <br/> <span class="pre-in-pp"> .HEADING_STYLE 1 QUAD L @@ -1606,7 +1607,7 @@ paraheads, the former defaults for PARAHEAD can be set up like this: Equally, the macro NUMBER_PARAHEADS is no longer available. You must enable numbering of the correct level for paraheads with HEADING_STYLE. Again assuming a heading level of 3 for paraheads, -it's simply done: +it’s simply done: <br/> <span class="pre-in-pp"> .HEADING_STYLE 3 NUMBER @@ -2688,13 +2689,14 @@ percent sign (<kbd>%</kbd>). Thus, is you want the point size of your CODE font Fixed-width fonts have notoriously whimsical <a href="definitions.html#xheight">x-heights</a>, meaning that they frequently look bigger (or, in some cases, -smaller) than the type surrounding them, even if they're 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 miniscule in relation to the type around it. All -invocations of <kbd>.CODE</kbd> or <kbd>\*[CODE]</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. +smaller) than the type surrounding them, even if they’re +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 miniscule in relation +to the type around it. All invocations of <kbd>.CODE</kbd> or +<kbd>\*[CODE]</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> <div class="rule-short"><hr/></div> @@ -3265,7 +3267,7 @@ Consider the following: Normally, within a nested list, when you return to an incrementally-enumerated list, the enumerator continues incrementing from where it left off. That means, in the example above, the -normal state of affairs for the alpha'ed list under +normal state of affairs for the alpha’ed list under <br/> <span class="pre-in-pp"> 2. Feed the cat @@ -5140,7 +5142,7 @@ Macro: <b>ENDNOTE_SPACING</b> <kbd class="macro-args"><space to insert betwee </p> <p> -If you'd like some whitespace between endnotes, just invoke +If you’d like some whitespace between endnotes, just invoke ENDNOTE_SPACING with the amount of space you want, e.g., <br/> <span class="pre-in-pp"> diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html index 853da60..a15b79f 100644 --- a/contrib/mom/momdoc/docprocessing.html +++ b/contrib/mom/momdoc/docprocessing.html @@ -277,7 +277,7 @@ unless shimming or flex-spacing is enabled. <h3 id="shim-vs-flex" class="docs">Shimming <span style="text-transform: none">vs.</span> flex-spacing</h3> <p> -<b>Shimming</b> is mom's default mode of operation. She applies it +<b>Shimming</b> is mom’s default mode of operation. She applies it automatically before headings, around quotes and blockquotes, and beneath <a href="definitions.html#float">floats</a> @@ -673,7 +673,7 @@ tell her how you want your document formatted. What kind of document is it? Should it be typeset or typewritten? Is this a final copy (for the world to see) or just a draft? Mom calls the macros that answer these questions “the docstyle -macros”, and they're essentially templates. +macros”, and they’re essentially templates. </p> <ul style="margin-top: -.5em; margin-bottom: -.5em;"> <li>PRINTSTYLE—typeset or typewritten</li> @@ -897,7 +897,7 @@ processing macros. </div> <div class="box-macro-args"> -Macro: <b>TITLE</b> <kbd>"<title string>" ["<2nd line>" ["<3rd line>" ... ] ]</kbd> +Macro: <b>TITLE</b> <kbd class=marco-args>[COVER | DOC_COVER] "<title string>" ["<2nd line>" ["<3rd line>" ... ] ]</kbd> </div> <p class="requires"> • Arguments must be enclosed in double-quotes @@ -932,6 +932,50 @@ should be the title of the opus, not “CHAPTER whatever”. </p> </div> +<p> +If the optional argument, <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>, +is given to TITLE, the remaining string arguments represent the +title that will appear on cover or document cover pages (see the +<a href="cover.html#cover-intro">Introduction to cover pages</a> +for a description of the difference between “document +covers” and “covers”). Thus, it is possible +to have differing titles appear on the document cover, the cover +(“title”) page, and in the document header. For +example, +<br/> +<span class="pre-in-pp"> + .TITLE DOC_COVER "Collected Essays" + .TITLE COVER "The Meming of Meaning" + .TITLE "LOL Cat Corruption" + .AUTHOR "D. Rawkins" + .DOC_COVER TITLE AUTHOR + .COVER TITLE + .START +</span> +creates a document cover with “Collected Essays” and the +author, a cover page with “The Meming of Meaning”, +and a docheader title, “LOL Cat Corruption” at the top +of the essay. +</p> + +<p> +Alternatively, you can use the macros +<a href="#doc-covertitle">DOC_COVERTITLE</a> +and +<a href="#covertitle">COVERTITLE</a> +to accomplish the same thing. +</p> + +<h4 id="no-toc-entry" class="docs">Table of Contents exceptions</h4> +<p> +Except for standalone documents (i.e. non-collated documents such +as essays), the TITLE string appears as an entry in the Table of +Contents. If you would like a document section not to appear in the +Table of Contents (e.g. the copyright page), invoke the macro +<kbd>.NO_TOC_ENTRY</kbd> after <kbd>.TITLE</kbd>. +</p> + + <!-- -DOCTITLE- --> <div class="macro-id-overline"> @@ -1643,26 +1687,27 @@ Macro: <b>DOC_COVERTITLE</b> <kbd class="macro-args">"<user defined docu <p> The arguments passed to COVERTITLE or DOC_COVERTITLE are only used on cover or doc cover pages, and then only if the argument -COVERTITLE or DOC_COVERTITLE is passed to +<kbd>COVERTITLE</kbd> or <kbd>DOC_COVERTITLE</kbd> is explicitly +passed to <a href="cover.html#cover">COVER</a> or <a href="cover.html#doc-cover">DOC_COVER</a>. </p> <p> -The only time you require a COVERTITLE or DOC_COVERTITLE is when -none of the required first arguments to COVER or DOC_COVER fits -your needs for the title you want to appear on cover (or doc cover) -pages. -</p> - -<p> COVERTITLE and DOC_COVERTITLE accept multiple arguments, each surrounded by double-quotes. Each argument is printed on a separate line, permitting you to create multi-line titles on your cover and/or doc cover pages. </p> +<p> +You only require COVERTITLE or DOC_COVERTITLE if they differ from +TITLE. Note that +<a href="#title">TITLE</a> +itself has two optional arguments that accomplish the same thing. +</p> + <div class="macro-id-overline"> <h3 class="macro-id">PDF Title</h3> </div> @@ -1940,7 +1985,7 @@ Do not use mom’s <a href="inlines.html#inline-size-mom"><kbd>\*[SIZE ±n]</kbd></a> inline escape to change point size in the strings passed to HEADER or FOOTER. Prefer either mom’s <kbd>\*S[±n]</kbd> or -groff's <kbd>\s[±n]</kbd>. +groff’s <kbd>\s[±n]</kbd>. </span> </p> </div> @@ -1970,13 +2015,13 @@ many or as few parameters as you wish. Parameters are, in order, 5. scale 6. bool </span> -You don't have to fill them all out. If you only need the first -three, that's all you need to input. If you need the first and -third, enter the second as a period (dot), which is used any time -you want to leave a parameter at its current default or when it -isn’t applicable. For example, if you want a Box transition -that lasts 1 second, filling the screen from the centre outwards, -you'd enter +You don’t have to fill them all out. If you only need the +first three, that’s all you need to input. If you need the +first and third, enter the second as a period (dot), which is used +any time you want to leave a parameter at its current default or +when it isn’t applicable. For example, if you want a Box +transition that lasts 1 second, filling the screen from the centre +outwards, you’d enter <span class="pre-in-pp"> TRANSITION "Box 1 . O" </span> @@ -2238,8 +2283,8 @@ If, for some reason, you would prefer the output of <p style="margin-top: .5em;"> If you’d prefer a monospace <a href="definitions.html#family">family</a> -for PRINTSTYLE <kbd>TYPEWRITE</kbd> other than than mom's default, -Courier, you can change it with +for PRINTSTYLE <kbd>TYPEWRITE</kbd> other than than mom’s +default, Courier, you can change it with <kbd>.TYPEWRITER_FAMILY <family></kbd> (or <kbd>.TYPEWRITER_FAM</kbd>). Since groff ships with only the Courier family, you will have to install any other monospace family @@ -2716,8 +2761,8 @@ well. <div class="box-tip"> <p class="tip"> <span class="experts">Experts:</span> -INCLUDE is an alias for the groff request, <kbd>.so</kbd>. Mix 'n' -match with impunity. +INCLUDE is an alias for the groff request, <kbd>.so</kbd>. Mix +’n’ match with impunity. </p> </div> @@ -2810,7 +2855,7 @@ that fit on the page coincides perfectly with the bottom margin of In most instances, the difference between the requested lead and the adjusted lead is unnoticeable, and since in almost all cases adjusted leading is what you want, it’s mom’s default -and you don't have to invoke it explicitly. +and you don’t have to invoke it explicitly. </p> <p> diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html index 046e07d..3db71a6 100644 --- a/contrib/mom/momdoc/goodies.html +++ b/contrib/mom/momdoc/goodies.html @@ -218,7 +218,7 @@ the top of your documents, please. <p class="tip"> <span class="experts">Experts:</span> ALIAS is an alias of <kbd>.als</kbd>. You can use either, or mix -'n' match with impunity. +’n’ match with impunity. </p> </div> @@ -603,8 +603,8 @@ in order to avoid spaces you can’t see, like this <div class="box-tip"> <p class="tip"> <span class="experts">Experts:</span> -STRING is an alias for -<b>ds</b>. You can use either, or mix 'n' match with impunity. +STRING is an alias for <b>ds</b>. You can use either, or mix +’n’ match with impunity. </p> </div> @@ -649,7 +649,7 @@ escape character to its default. <div class="box-tip"> <p class="tip"> <span class="experts">Experts:</span> -ESC_CHAR is an alias of <kbd>.ec</kbd>. Mix 'n' match +ESC_CHAR is an alias of <kbd>.ec</kbd>. Mix ’n’ match the two with impunity. </p> </div> @@ -908,7 +908,7 @@ underline. Lastly, files that use UNDERLINE must be processed with <span class="pre-in-pp"> pdfmom -Tps filename.mom | ps2pdf - filename.pdf </span> -since groff's native pdf driver does not recognize UNDERLINE. +since groff’s native pdf driver does not recognize UNDERLINE. </p> <p> diff --git a/contrib/mom/momdoc/graphical.html b/contrib/mom/momdoc/graphical.html index ae8c6ea..fcd5741 100644 --- a/contrib/mom/momdoc/graphical.html +++ b/contrib/mom/momdoc/graphical.html @@ -124,9 +124,9 @@ and optionally a colour for the object. </p> <p> -There are no defaults for the arguments to mom'a graphical object -macros, which means you must supply the arguments every time you -invoke them. +There are no defaults for the arguments to mom’s graphical +object macros, which means you must supply the arguments every time +you invoke them. </p> <div class="box-tip"> @@ -158,10 +158,10 @@ carved-in-stone ways: </ol> <p> -The consistency means that once you've mastered the very simple -order of arguments that applies to invoking graphical object -macros, you can draw objects with full confidence that you know -exactly where they’re placed and how much room they +The consistency means that once you’ve mastered the very +simple order of arguments that applies to invoking graphical +object macros, you can draw objects with full confidence that you +know exactly where they’re placed and how much room they occupy. Furthermore, because all return to their point of origin, you’ll know exactly where you are on the page. </p> @@ -287,7 +287,7 @@ or an X-colour alias (again, initialized with XCOLOR). <p> Say, for example, you want to draw a 1-1/4 point horizontal rule that starts 2 picas from the current left margin and runs for 3 -inches. To do so, you'd invoke <kbd>.DRH</kbd> like this: +inches. To do so, you’d invoke <kbd>.DRH</kbd> like this: <br/> <span class="pre-in-pp"> weight length @@ -375,7 +375,8 @@ or an X-colour alias (again, initialized with XCOLOR). <p> Say, for example, you want to draw a 3/4-point vertical rule that starts 19-1/2 picas from the current left margin and has a depth of -6 centimeters. To do so, you'd invoke <kbd>.DRV</kbd> like this: +6 centimeters. To do so, you’d invoke <kbd>.DRV</kbd> like +this: <br/> <span class="pre-in-pp"> weight depth @@ -464,7 +465,8 @@ or an X-colour alias (again, initialized with XCOLOR). <p> Say, for example, you want to draw a 1/2 point outline box that starts one inch from the current left margin and has the dimensions -12 picas x 6 picas. To do so, you'd invoke <kbd>.DBX</kbd> like this: +12 picas x 6 picas. To do so, you’d invoke <kbd>.DBX</kbd> +like this: <br/> <span class="pre-in-pp"> indent depth @@ -564,7 +566,8 @@ or an X-colour alias (again, initialized with XCOLOR). Say, for example, you want to draw a 1/2 point outline circle (ellipse, actually, in this case) that starts one inch from the current left margin and has the dimensions 6 centimeters x 3 -centimeters. To do so, you'd invoke <kbd>.DCL</kbd> like this: +centimeters. To do so, you’d invoke <kbd>.DCL</kbd> like +this: <br/> <span class="pre-in-pp"> indent depth diff --git a/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/headfootpage.html index 13f0809..a6b64fd 100644 --- a/contrib/mom/momdoc/headfootpage.html +++ b/contrib/mom/momdoc/headfootpage.html @@ -160,7 +160,7 @@ page element. <div id="author-note" class="box-tip"> <p class="tip"> -<span class="note">Author's note:</span> +<span class="note">Author’s note:</span> Left to their own devices (ie if you’re happy with the way mom does things by default), headers are something you never have to worry about. You can skip reading this section entirely. But if @@ -1635,8 +1635,8 @@ and, as an added bonus, mom provides a special mechanism whereby it’s possible to <a href="#padding-hdrftr">pad</a> the string as well. The padding mechanism lets you create headers -that contain left, centre and right parts like mom's defaults but -entirely of your own design. +that contain left, centre and right parts like mom’s defaults +but entirely of your own design. </p> <div class="macro-list-container"> diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html index 15ecbd7..29345a1 100644 --- a/contrib/mom/momdoc/images.html +++ b/contrib/mom/momdoc/images.html @@ -273,7 +273,7 @@ order, although it’s best to put <kbd>CAPTION</kbd>, <kbd>SHORT_CAPTION</kbd>, and <kbd>LABEL</kbd> last. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'SCALE'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">SCALE</h5> <p> <kbd>SCALE</kbd> allows you to scale the image by @@ -283,7 +283,7 @@ scales the image to 50 percent of its original size. No percent sign or unit of measure should be appended. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'ADJUST'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5> <p> <kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower (<kbd>-</kbd>) the image @@ -309,7 +309,7 @@ with PDF_IMAGE’s ADJUST argument. </p> </div> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_SHIM'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_SHIM</h5> <p> <kbd>NO_SHIM</kbd> instructs mom not to apply @@ -327,7 +327,7 @@ image on the page should be shimmed, ie should not be given the <kbd>NO_SHIM</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_FLEX'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_FLEX</h5> <p> <kbd>NO_FLEX</kbd> instructs mom not to apply @@ -340,7 +340,7 @@ page. If there are no others, the final image should be flex-spaced, ie not given the <kbd>NO_FLEX</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'FRAME'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">FRAME</h5> <p> <kbd>FRAME</kbd> instructs mom to put a frame around the image. @@ -348,7 +348,7 @@ Parameters for the frame are set with <a href="#pdf-image-frame">PDF_IMAGE_FRAME</a>. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">CAPTION</h5> <p> <kbd>CAPTION</kbd> allows you to give the image a caption. By @@ -360,7 +360,7 @@ in The text of the caption must be surrounded by double-quotes. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'SHORT_CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">SHORT_CAPTION</h5> <p> <kbd>SHORT_CAPTION</kbd> allows you to trim long captions for @@ -368,7 +368,7 @@ inclusion in the List of Figures. The text you supply, surrounded by double-quotes, is what will appear in the List. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'LABEL'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">LABEL</h5> <p> <kbd>LABEL</kbd>, if given, appears beneath the image. The text you @@ -379,7 +379,7 @@ an auto-labelling facility for images (see which, if enabled, overrides the <kbd>LABEL</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'TARGET'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">TARGET</h5> <p> <kbd>TARGET</kbd> followed by a unique name surrounded by @@ -736,7 +736,7 @@ whatever you want the float to contain. When you’re done, invoke <kbd>.FLOAT OFF</kbd> (or <kbd>QUIT, END, X</kbd>, etc). </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'ADJUST'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5> <p> The optional <kbd>ADJUST</kbd> argument tells mom to raise @@ -759,7 +759,7 @@ a following page but respected for subsequent deferred floats output immediately afterward. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'FORCE'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">FORCE</h5> <p> The <kbd>FORCE</kbd> argument instructs mom to output the float @@ -776,7 +776,7 @@ has been deferred to a subsequent page, insert <kbd>\!.bp</kbd> immediately before terminating the float. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'SPAN'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">SPAN</h5> <p> The <kbd>SPAN</kbd> argument tells mom that a float, if deferred, @@ -786,7 +786,7 @@ a warning should this occur. Unboxed tables, on the other hand, are acceptable within floats that are given the <kbd>SPAN</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'INDENT'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">INDENT</h5> <p> <kbd>INDENT</kbd> allows you to indent a float from the left margin @@ -795,22 +795,22 @@ by a specified value. The value must have a appended to it. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'CENTER'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">CENTER</h5> <p> <kbd>CENTER</kbd> instructs mom to center a float if it is not already centered by default. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'RIGHT'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">RIGHT</h5> <p> <kbd>RIGHT</kbd> instructs mom to place a float a the right of the -page; the longest line in the float will be flush with the page's -right margin. +page; the longest line in the float will be flush with the +page’s right margin. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_SHIM'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_SHIM</h5> <p> <kbd>NO_SHIM</kbd> instructs mom not to apply @@ -828,7 +828,7 @@ float on the page should be shimmed, ie should not be given the <kbd>NO_SHIM</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_FLEX'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_FLEX</h5> <p> <kbd>NO_FLEX</kbd> instructs mom not to apply @@ -841,7 +841,7 @@ page. If there are no others, the final float should be flex-spaced, ie not given the <kbd>NO_FLEX</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'TARGET'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">TARGET</h5> <p> <kbd>TARGET</kbd> followed by a unique name surrounded by @@ -1459,7 +1459,7 @@ in any order, although it is advisable to put <kbd>CAPTION</kbd>, <kbd>SHORT_CAPTION</kbd>, and/or <kbd>LABEL</kbd> last. </p> -<h5 id="h" class="docs" style="margin-top: 1em; text-transform: none">'H'</h5> +<h5 id="h" class="docs" style="margin-top: 1em; text-transform: none">H</h5> <p> With the <b>H</b> argument, a table will span as many pages as @@ -1501,7 +1501,7 @@ circumstances under which it fails, whereas <kbd>.TS</kbd> without </p> </div> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'BOXED'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">BOXED</h5> <p> If a table is to be boxed (ie <kbd>tbl</kbd> is given the flags @@ -1519,7 +1519,7 @@ If a table is to be boxed (ie <kbd>tbl</kbd> is given the flags </span> </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'CENTER'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">CENTER</h5> <p> If a table is to be centered on the page, (ie <kbd>tbl</kbd> is @@ -1542,17 +1542,17 @@ with a running header. </span> </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NEEDS'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NEEDS</h5> <p> If a table is not inside a float and you pass <kbd>.TS </kbd> the <kbd>H</kbd> argument (which you should; see the tip <a href="#h-tip">here</a>), -mom begins output immediately where the table occurs in the input -file <i>if there is enough room on the output page for the table -header plus at least one row of table data</i>. If there isn't -enough room, mom breaks to a new page before beginning the table, -leaving a gap in +mom begins output immediately where the table occurs in the +input file <i>if there is enough room on the output page for the +table header plus at least one row of table data</i>. If there +isn’t enough room, mom breaks to a new page before beginning +the table, leaving a gap in <a href="definitions.html#running">running text</a> at the bottom of the previous page. If, for aesthetic reasons, you would prefer that mom require more than one row of table data @@ -1561,7 +1561,7 @@ number with the <kbd>NEEDS</kbd> argument, followed by the desired number of rows. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'ADJUST'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5> <p> <kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower @@ -1571,7 +1571,7 @@ is useful for achieving good optical centering between surrounding blocks of type. A unit of measure is required. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_SHIM'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_SHIM</h5> <p> <kbd>NO_SHIM</kbd> instructs mom not to apply @@ -1589,7 +1589,7 @@ table on the page should be shimmed, ie should not be given the <kbd>NO_SHIM</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_FLEX'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_FLEX</h5> <p> <kbd>NO_FLEX</kbd> instructs mom not to apply @@ -1602,7 +1602,7 @@ page. If there are no others, the final table should be flex-spaced, ie not given the <kbd>NO_FLEX</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">CAPTION</h5> <p> <kbd>CAPTION</kbd> allows you to give the table a caption. By @@ -1621,7 +1621,7 @@ of <a href="#th">TH</a>. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'SHORT_CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">SHORT_CAPTION</h5> <p> <kbd>SHORT_CAPTION</kbd> allows you to trim long captions for @@ -1629,7 +1629,7 @@ inclusion in the List of Tables. The text you supply, surrounded by double-quotes, is what will appear in the List. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'LABEL'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">LABEL</h5> <p> <kbd>LABEL</kbd>, if given, appears beneath the table. The text you @@ -1640,7 +1640,7 @@ an auto-labelling facility for tables (see which, if enabled, overrides the <kbd>LABEL</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'TARGET'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">TARGET</h5> <p> <kbd>TARGET</kbd> followed by a unique name surrounded by @@ -1831,7 +1831,7 @@ requested height. In the case of two non-zero arguments being given, only the height scaling is applied. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'ADJUST'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5> <p> <kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower @@ -1842,7 +1842,7 @@ optical centering between surrounding blocks of type. A unit of measure is required. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_SHIM'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_SHIM</h5> <p> <kbd>NO_SHIM</kbd> instructs mom not to apply @@ -1860,7 +1860,7 @@ diagram on the page should be shimmed, ie should not be given the <kbd>NO_SHIM</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_FLEX'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_FLEX</h5> <p> <kbd>NO_FLEX</kbd> instructs mom not to apply @@ -1873,7 +1873,7 @@ on the page. If there are no others, the final diagram should be flex-spaced, ie not given the <kbd>NO_FLEX</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">CAPTION</h5> <p> <kbd>CAPTION</kbd> allows you to give the diagram a caption. By @@ -1885,7 +1885,7 @@ in The text of the caption must be surrounded by double-quotes. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'SHORT_CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">SHORT_CAPTION</h5> <p> <kbd>SHORT_CAPTION</kbd> allows you to trim long captions for @@ -1893,7 +1893,7 @@ inclusion in the List of Figures. The text you supply, surrounded by double-quotes, is what will appear in the List. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'LABEL'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">LABEL</h5> <p> <kbd>LABEL</kbd>, if given, appears beneath the diagram. The text you @@ -1904,7 +1904,7 @@ an auto-labelling facility for diagrams (see which, if enabled, overrides the <kbd>LABEL</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'TARGET'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">TARGET</h5> <p> <kbd>TARGET</kbd> followed by a unique name surrounded by @@ -2111,7 +2111,7 @@ if <kbd>-L</kbd> or <kbd>-I</kbd> are passed as arguments to <kbd>.EQ</kbd>. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'ADJUST'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5> <p> <kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower @@ -2122,7 +2122,7 @@ optical centering between surrounding blocks of type. A unit of measure is required. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_SHIM'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_SHIM</h5> <p> <kbd>NO_SHIM</kbd> instructs mom not to apply @@ -2140,7 +2140,7 @@ equation on the page should be shimmed, ie should not be given the <kbd>NO_SHIM</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'NO_FLEX'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">NO_FLEX</h5> <p> <kbd>NO_FLEX</kbd> instructs mom not to apply @@ -2154,14 +2154,14 @@ flex-spaced, ie not given the <kbd>NO_FLEX</kbd> argument. </p> </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">CAPTION</h5> <p> <kbd>CAPTION</kbd> allows you to give the equation a caption. Equation captions always appear beneath the equation. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'SHORT_CAPTION'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">SHORT_CAPTION</h5> <p> <kbd>SHORT_CAPTION</kbd> allows you to trim long captions for @@ -2169,7 +2169,7 @@ inclusion in the List of Equations. The text you supply, surrounded by double-quotes, is what will appear in the List. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'LABEL'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">LABEL</h5> <p> <kbd>LABEL</kbd>, if given, appears on the same baseline as the last line of the @@ -2182,7 +2182,7 @@ Equations. Mom provides an auto-labelling facility for equations (see which, if enabled, overrides the <kbd>LABEL</kbd> argument. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'SHIFT_LABEL'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">SHIFT_LABEL</h5> <p> <kbd>SHIFT_LABEL</kbd> allows you to raise (<kbd>-</kbd>) or lower @@ -2193,7 +2193,7 @@ with the last line. Assuming a three-line equation, one line, thus centering it vertically on the equation. </p> -<h5 class="docs" style="margin-top: 1em; text-transform: none">'TARGET'</h5> +<h5 class="docs" style="margin-top: 1em; text-transform: none">TARGET</h5> <p> <kbd>TARGET</kbd> followed by a unique name surrounded by @@ -2420,9 +2420,9 @@ For the purposes of labelling, mom treats <a href="docprocessing.html#doctype">DOCTYPE DEFAULT</a> as if it were <b>DOCTYPE CHAPTER</b>, hence, with <kbd>PREFIX_CHAPTER</kbd>, each collated <b>DEFAULT</b> -doctype's prefixed “chapter” number is incremented -and the label number itself reset to “1”. If -you do not give <kbd>PREFIX_CHAPTER</kbd>, the label number +doctype’s prefixed “chapter” number is +incremented and the label number itself reset to “1”. +If you do not give <kbd>PREFIX_CHAPTER</kbd>, 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>. @@ -2498,8 +2498,8 @@ would disable captions after labels for pdf images only. <p> If <a href="#mla">MLA</a> -is enabled, there's no need to invoke <kbd>CAPTION_AFTER_LABEL</kbd> -as this is implied. +is enabled, there’s no need to invoke +<kbd>CAPTION_AFTER_LABEL</kbd> as this is implied. </p> <div class="box-tip"> @@ -2751,8 +2751,8 @@ to the end of your input file. </p> <p> -Also like the Table of Contents, entries in the Lists' output are -clickable PDF links when a document is viewed at the screen. +Also like the Table of Contents, entries in the Lists’ output +are clickable PDF links when a document is viewed at the screen. </p> <h3 id="lists-placement" class="docs">Placement of Lists</h3> diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html index d700ffe..6ced83e 100644 --- a/contrib/mom/momdoc/inlines.html +++ b/contrib/mom/momdoc/inlines.html @@ -104,9 +104,9 @@ your documents. These escapes are the ones listed under <p> Despite mom’s best intentions, there are still a number of typesetting functions that can only be accomplished -with groff’s native inline escapes. I've listed the ones that -strike me as essential, but there are many others. If you want -to know what they are, please read the +with groff’s native inline escapes. I’ve listed the +ones that strike me as essential, but there are many others. If you +want to know what they are, please read the <a href="intro.html#canonical">canonical reference materials</a> pertaining to groff. </p> @@ -582,7 +582,7 @@ This can be accomplished with the macro <a href="typesetting.html#el">EL</a> or with the escape <kbd>\*[B]</kbd>. Simply attach <kbd>\*[B]</kbd> to the end of any input line. Using the example given in the -document entry for EL, you'd use <kbd>\*[B]</kbd> like this: +document entry for EL, you’d use <kbd>\*[B]</kbd> like this: <br/> <span class="pre-in-pp"> .LEFT @@ -730,7 +730,7 @@ It takes a single argument: the weight of the rule in <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>\*[RULE]</kbd> to 1-1/4 points, you'd do +drawn with <kbd>\*[RULE]</kbd> to 1-1/4 points, you’d do <br/> <span class="pre-in-pp"> .RULE_WEIGHT 1.25 @@ -900,9 +900,9 @@ is where it would be if you hadn’t used <kbd>\v</kbd>. <p class="tip"> <span class="tip">Tip:</span> When using <kbd>\v</kbd> for occasional effects in a line, -don’t forget to reverse it when you've done what you want to -do. Otherwise, the remaining type will be set too high (if you -used <kbd>\v</kbd> with the minus sign) or too low (if you used +don’t forget to reverse it when you’ve done what you +want to do. Otherwise, the remaining type will be set too high (if +you used <kbd>\v</kbd> with the minus sign) or too low (if you used <kbd>\v</kbd> without the minus sign). </p> </div> @@ -949,13 +949,13 @@ as in the example above. The <kbd>\l'distance'</kbd> inline allows you to draw a horizontal rule of the specified distance. You must supply a <a href="definitions.html#unitofmeasure">unit of measure</a>. -Therefore, to set a 3-pica rule into a line of text, you'd do +Therefore, to set a 3-pica rule into a line of text, you’d do <br/> <span class="pre-in-pp"> A line of text with a superfluous \l'3P' 3-pica rule in it. </span> <kbd>\l'3P'</kbd>, above, not only draws the rule, but advances 3 -picas horizontally as well, just as you'd expect. +picas horizontally as well, just as you’d expect. </p> <p> @@ -1024,8 +1024,8 @@ meaning of some of these characters, consult the <p> For a complete list of special characters and glyphs (ie just -about anything you'd ever want to appear on the printed page, -including mathematical symbols, accented characters, unusual +about anything you’d ever want to appear on the printed +page, including mathematical symbols, accented characters, unusual ligatures and letters unique to various European languages), consult <kbd>man groff-char</kbd>. </p> diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html index 63dbb32..3c85e54 100644 --- a/contrib/mom/momdoc/letters.html +++ b/contrib/mom/momdoc/letters.html @@ -100,8 +100,8 @@ Underwood by a shapely secretary with 1940s gams. <p> Please note that if you choose <kbd>PRINTSTYLE TYPEWRITE</kbd>, -there's no need to give the <kbd>SINGLESPACE</kbd> option, as this -is the unalterable default for letters. +there’s no need to give the <kbd>SINGLESPACE</kbd> option, as +this is the unalterable default for letters. </p> <p> diff --git a/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macrolist.html index 2c39e0e..00e9944d 100644 --- a/contrib/mom/momdoc/macrolist.html +++ b/contrib/mom/momdoc/macrolist.html @@ -1199,6 +1199,9 @@ elsewhere in the documentation. <td><a href="tables-of-contents.html#toc">TOC</a></td><td>-- output a table of contents</td> </tr> <tr> +<td><a href="docprocessing.html#no-toc-entry">NO_TOC_ENTRY</a></td><td>-- omit a document section from the TOC</td> +</tr> +<tr> <td><a href="tables-of-contents.html#index-toc-control">Control macros</a></td> </tr> </table> diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html index bd814c0..0ff9afb 100644 --- a/contrib/mom/momdoc/refer.html +++ b/contrib/mom/momdoc/refer.html @@ -645,8 +645,8 @@ add the closing parenthesis yourself after the page number.) <p> If your document cites more than one work by Bradbury and you need -a title and page number in addition to the author's name in the -inline reference, +a title and page number in addition to the author’s name in +the inline reference, <br/> <span class="pre-in-pp"> "...aluminum roaches and iron crickets." @@ -1837,9 +1837,9 @@ on bibliography pages. Chapters get treated differently in that, by default, mom does not print the header/footer centre string (normally the chapter number or chapter title.) In most cases, this is what you want. However, should you not want mom to remove the -centre string from the bibliography pages headers/footers, or you -would like her to add one in cases where there hasn't been one -before (e.g. DOCTYPE DEFAULT) invoke +centre string from the bibliography pages’ headers/footers, or +you would like her to add one in cases where there hasn’t been +one before (e.g. DOCTYPE DEFAULT) invoke <kbd><a href="#bibliography-hdrftr-center">.BIBLIOGRAPHY_HEADER_CENTER</a></kbd> with no argument. </p> diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html index 2cfc463..7f271b2 100644 --- a/contrib/mom/momdoc/reserved.html +++ b/contrib/mom/momdoc/reserved.html @@ -2448,7 +2448,7 @@ Prior to version 1.1.9, all macros that included the word COLOR had aliases that used COLOUR instead. This convenience has now been removed, in an effort to reduce the size of the om.tmac file. - Furthermore, if you want the convenience, you'll have to edit the +Furthermore, if you want the convenience, you’ll have to edit the om.tmac file. Simply aliasing, say, HEAD_COLOR as HEAD_COLOUR will not work, owing to significant changes in the handling of docelement control macros that end in _COLOR. diff --git a/contrib/mom/momdoc/tables-of-contents.html b/contrib/mom/momdoc/tables-of-contents.html index 4872039..b885f58 100644 --- a/contrib/mom/momdoc/tables-of-contents.html +++ b/contrib/mom/momdoc/tables-of-contents.html @@ -203,7 +203,7 @@ below. <div class="box-tip"> <p class="tip"> <span class="note">Note:</span> -Note: <kbd>.AUTO_RELOCATE_TOC</kbd> must come before +<kbd>AUTO_RELOCATE_TOC</kbd> must come before <a href="docprocessing.html#start">START</a>. </p> </div> @@ -528,8 +528,8 @@ immediately prior to <kbd>.TOC</kbd>. A special macro <kbd><a href="#toc-pagenum-style">TOC_PAGENUM_STYLE</a></kbd> controls the style of table of contents pagination (ie the actual -table of contents pages' numbers, not the page number references of -entries). +table of contents pages’ numbers, not the page number +references of entries). </p> <!-- -PAGINATE_TOC- --> @@ -1068,9 +1068,9 @@ Macro: <b>SPACE_TOC_ITEMS</b></kbd> <p> If you’d like mom to add a small amount of space between table of contents entry levels, use <kbd>.SPACE_TOC_ITEMS</kbd>. Mom will -visually group entry levels in a way that's pleasing to the eye. -The only catch to this macro is that the bottom margins of table of -contents pages may not align perfectly. +visually group entry levels in a way that’s pleasing to the +eye. The only catch to this macro is that the bottom margins of +table of contents pages may not align perfectly. </p> <!-- -TOC_PADDING- --> diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html index 1a79b56..8a03d79 100644 --- a/contrib/mom/momdoc/toc.html +++ b/contrib/mom/momdoc/toc.html @@ -20,7 +20,7 @@ FDL in the main directory of the groff source package. <head> <meta http-equiv="content-type" content="text/html;charset=utf-8"/> - <title>Mom, version 2.4-2 -- Table of Contents</title> + <title>Mom, version 2.4-3 -- Table of Contents</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" /> </head> @@ -31,7 +31,7 @@ FDL in the main directory of the groff source package. <div class="page"> <div class="version"> - mom, version 2.4-2 + mom, version 2.4-3 </div> <h1 class="toc" style="margin-top: 9px;">Table of Contents</h1> @@ -46,7 +46,7 @@ FDL in the main directory of the groff source package. <br/> <a href="#full-toc">Full Table of Contents</a>. <br/> - If you've been using mom for a while, you may prefer the + If you’ve been using mom for a while, you may prefer the <br/> <a href="macrolist.html#top">Quick Reference Guide</a>. </p> @@ -145,8 +145,8 @@ FDL in the main directory of the groff source package. <li><a href="intro.html#intro-intro">1.1 Who is mom meant for?</a></li> <li><a href="intro.html#intro-typesetting">1.2 Typesetting with mom</a></li> <li><a href="intro.html#intro-docprocessing">1.3 Document processing with mom</a></li> - <li><a href="intro.html#intro-philosophy">1.4 Mom's philosophy</a></li> - <li><a href="intro.html#intro-documentation">1.5 A note on mom's documentation</a> + <li><a href="intro.html#intro-philosophy">1.4 Mom’s philosophy</a></li> + <li><a href="intro.html#intro-documentation">1.5 A note on mom’s documentation</a> <ul> <li><a href="intro.html#canonical">1.5.1 Canonical reference materials</a></li> <li><a href="intro.html#macro-args">1.5.2 How to read macro arguments</a></li> @@ -161,7 +161,7 @@ FDL in the main directory of the groff source package. <ul class="toc"> <li><a href="definitions.html#typesetting-terms">2.1 Typesetting terms</a></li> <li><a href="definitions.html#groff-terms">2.2 Groff terms</a></li> - <li><a href="definitions.html#mom-terms">2.3 Mom's document processing terms</a></li> + <li><a href="definitions.html#mom-terms">2.3 Mom’s document processing terms</a></li> </ul> <h3 id="using" class="toc"><a style="color: #6e70cc" href="using.html#top">3. USING MOM</a></h3> @@ -240,7 +240,7 @@ FDL in the main directory of the groff source package. <ul> <li><a href="inlines.html#intro-inlines">4.12.1 Introduction to inline escapes</a></li> <li><a href="inlines.html#index-inlines">4.12.2 List of inline escapes</a></li> - <li><a href="inlines.html#inlines-mom-top">4.12.3 Mom's personal inline escapes</a></li> + <li><a href="inlines.html#inlines-mom-top">4.12.3 Mom’s personal inline escapes</a></li> <li><a href="inlines.html#inlines-groff-top">4.12.4 Commonly-used groff inline escapes</a> <ul> <li><a href="inlines.html#inline-characters-groff">4.12.4.1 Special characters and symbols</a></li> @@ -289,7 +289,7 @@ FDL in the main directory of the groff source package. <li><a href="docprocessing.html#covertitle">5.3.2.12 DOC_COVERTITLE</a></li> <li><a href="docprocessing.html#pdftitle">5.3.2.12 PDF_TITLE</a></li> </ul></li> - <li><a href="docprocessing.html#docstyle-macros">5.3.3 The docstyle macros</a> – base templates; what kind of document you're creating, how you want it to look overall + <li><a href="docprocessing.html#docstyle-macros">5.3.3 The docstyle macros</a> – base templates; what kind of document you’re creating, how you want it to look overall <ul> <li><a href="docprocessing.html#doctype">5.3.3.1 DOCTYPE</a> – the kind of document (default, chapter, named, letter) <ul style="list-style-type: circle"> diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html index fc71165..12e53ec 100644 --- a/contrib/mom/momdoc/typesetting.html +++ b/contrib/mom/momdoc/typesetting.html @@ -191,8 +191,8 @@ When mom files are processed with <a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>, which is recommended (see <a href="http://www.schaffter.ca/mom/pdf/mom-pdf.pdf"><span class="book-title">Producing PDFs with groff and mom</span></a>), -page dimensions are automatically passed to groff, and you don't -have to worry about them. +page dimensions are automatically passed to groff, and you +don’t have to worry about them. </p> <p> @@ -3016,7 +3016,7 @@ Macro: <b>SMALLCAPS_STYLE</b> <kbd class="macro-args">SIZE <percentage> WE True smallcaps are not a font effect, but, like designer cuts of bold, condensed, and extended, actual fonts provided with some families. It is highly recommended that you acquire real smallcaps -fonts rather than relying on mom's pseudo version. +fonts rather than relying on mom’s pseudo version. </p> <p> diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html index 851d637..a7917c9 100644 --- a/contrib/mom/momdoc/using.html +++ b/contrib/mom/momdoc/using.html @@ -103,7 +103,7 @@ flyer for your lost dog, the following apply. </li> <li> Macros begin with a period (dot) at the left margin of your text - editor's screen, and must be entered in upper case (capital) + editor’s screen, and must be entered in upper case (capital) letters. </li> <li> @@ -223,7 +223,7 @@ viewable/printable PostScript file. <h3 id="pdf" class="docs">Mom and PDF</h3> <p> -Adobe's Portable Document Format (PDF) has largely supplanted +Adobe’s Portable Document Format (PDF) has largely supplanted PostScript, of which it is a subset, as the standard for typeset documents. While printed versions of documents in either format will be identical, PDF documents, when viewed at the screen, may @@ -256,7 +256,7 @@ it: pdfmom filename.mom > filename.pdf </span> <strong>pdfmom</strong> is a wrapper around groff, and accepts all -groff's command-line options as listed in the groff manpage. +groff’s command-line options as listed in the groff manpage. Full usage is explained in the manual, <a href="http://www.schaffter.ca/mom/pdf/mom-pdf.pdf"><span class="book-title">Producing PDFs with groff and mom</span></a>. </p> _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit