[groff] 01/01: man pages: Make style fixes.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit a4f9b86065c02f6b2f385c85526a175ab13ae361
Author: G. Branden Robinson <address@hidden>
Date:   Mon Nov 20 02:41:17 2017 -0500

    man pages: Make style fixes.
    
    * src/devices/grolj4/lj4_font.5.man:
    * src/utils/hpftodit/hpftodit.1.man:
      + Get rid of ".tr ~" trick.  Use \~ instead.
      + Convert \( character escapes to \[].
      + Stop trying to outwit .TP's calculation of a good indentation value.
      + Set filenames in italics, not bold.
      + Add discretionary hyphenless breakpoints (\:) to absolute paths,
        since they can get long after macro expansion of @FONTDIR@ and
        similar.
      + Wrap lines after [,;:] and parenthetical asides.
      + Add \~ between digit sequences and units of measurement.
      + Reflow to 72 columns.
      + Use an ordinary hyphen, not an en-dash, in phrases like "Mercedes
        E-class" or "LaserJet 4-series".
      + Update and parallelize editor aid comments.
      + Make structural comments more consistent.
    
    * src/devices/grolj4/lj4_font.5.man:
      + "One-quarter point" would take the singular, but "0.25 points" takes
        the plural.
      + "Kern pairs" -> "kerning pairs".
      + "Version 1" -> "version 1.0" (of Unicode).
      + Set font DESC file parameters "res" and "unitwidth" in italics.
      + Use eqn(1) to present an equation.
      + Use a division sign (obelus) instead of a slash in running prose.
      + Add devlj4 "generate" script to FILES section (with description
        cribbed from comments in the awk file).
      + Remove SEE ALSO cross reference to groff_diff(7), nowhere motivated
        in the discussion.
    
    * src/utils/hpftodit/hpftodit.1.man:
      + Convert synopsis to use SY/OP/YS macros.
      + ...which also obviates a remark about whitespace in option syntax.
      + Convert complex markup of examples using a constant-width font
        family to EX/EE.
      + Convert inline use of constant-width font to simple boldface.
      + Use hyphens, not underscores, in metavariable phrases; this is
        human-readable prose, not C.
      + Expand abbreviation MSL on first occurrence.
      + Add cross reference to groff_char(7) in discussion of groff glyph
        names.
      + Mention that -v option exits the program.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 src/devices/grolj4/lj4_font.5.man | 224 ++++++++++++++----------
 src/utils/hpftodit/hpftodit.1.man | 358 +++++++++++++++++++++-----------------
 2 files changed, 332 insertions(+), 250 deletions(-)

diff --git a/src/devices/grolj4/lj4_font.5.man 
b/src/devices/grolj4/lj4_font.5.man
index bc041d6..6e4cf51 100644
--- a/src/devices/grolj4/lj4_font.5.man
+++ b/src/devices/grolj4/lj4_font.5.man
@@ -1,10 +1,12 @@
-.tr ~
+'\" e
 .TH LJ4_FONT @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 lj4_font \- groff fonts for use with devlj4
 .
 .
-.\" license
+.\" ====================================================================
+.\" Legal Terms
+.\" ====================================================================
 .\"
 .\" Copyright (C) 2004-2014 Free Software Foundation, Inc.
 .\"
@@ -24,50 +26,48 @@ lj4_font \- groff fonts for use with devlj4
 .\" instead of in the original English.
 .
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.
-.tr ~
 .\" ====================================================================
 .SH DESCRIPTION
 .\" ====================================================================
 .
-Nominally, all Hewlett-Packard LaserJet~4\(enseries and newer printers
-have the same internal fonts: 45 scalable fonts and one bitmapped
-Lineprinter font.
+Nominally,
+all Hewlett-Packard LaserJet\~\%4-series and newer printers have the
+same internal fonts:
+45 scalable fonts and one bitmapped Lineprinter font.
 .
-The scalable fonts are available in sizes between 0.25 point and
-999.75 points, in 0.25-point increments; the Lineprinter font is
-available only in 8.5-point size.
+The scalable fonts are available in sizes between 0.25 points and 999.75
+points,
+in 0.25-point increments;
+the Lineprinter font is available only in 8.5-point size.
 .
 .
 .LP
 The LaserJet font files included with
 .B groff
-assume that all printers since the LaserJet~4 are identical.
+assume that all printers since the LaserJet\~4 are identical.
 .
-There are some differences between fonts in the earlier and more
-recent printers, however.
+There are some differences between fonts in the earlier and more recent
+printers,
+however.
 .
-The LaserJet~4 printer used Agfa Intellifont technology for 35 of the
-internal scalable fonts; the remaining 10 scalable fonts were
-TrueType.
+The LaserJet\~4 printer used Agfa Intellifont technology for 35 of the
+internal scalable fonts;
+the remaining 10 scalable fonts were TrueType.
 .
-Beginning with the LaserJet~4000\(enseries printers introduced in
-1997, all scalable internal fonts have been TrueType.
+Beginning with the LaserJet\~\%4000-series printers introduced in 1997,
+all scalable internal fonts have been TrueType.
 .
-The number of printable glyphs differs slightly between Intellifont
-and TrueType fonts (generally, the TrueType fonts include more
-glyphs), and there are some minor differences in glyph metrics.
+The number of printable glyphs differs slightly between Intellifont and
+TrueType fonts
+(generally,
+the TrueType fonts include more glyphs),
+and
+there are some minor differences in glyph metrics.
 .
 Differences among printer models are described in the
-.I "PCL~5 Comparison Guide"
+.I "PCL\~5 Comparison Guide"
 and the
-.I "PCL~5 Comparison Guide Addendum"
+.I "PCL\~5 Comparison Guide Addendum"
 (for printers introduced since approximately 2001).
 .
 .
@@ -75,50 +75,73 @@ and the
 LaserJet printers reference a glyph by a combination of a 256-glyph
 symbol set and an index within that symbol set.
 .
-Many glyphs appear in more than one symbol set; all combinations of
-symbol set and index that reference the same glyph are equivalent.
+Many glyphs appear in more than one symbol set;
+all combinations of symbol set and index that reference the same glyph
+are equivalent.
 .
 For each glyph,
 .BR hpftodit (@MAN1EXT@)
-searches a list of symbol sets, and selects the first set that
-contains the glyph.
+searches a list of symbol sets,
+and selects the first set that contains the glyph.
 .
 The printing code generated by
 .BR hpftodit (@MAN1EXT@)
 is an integer that encodes a numerical value for the symbol set in the
-high byte(s), and the index in the low byte.
+high byte(s),
+and the index in the low byte.
 .
 See
 .BR groff_font (@MAN5EXT@)
-for a complete description of the font file format; symbol sets are
-described in greater detail in the
-.IR "PCL~5 Printer Language Technical Reference Manual" .
+for a complete description of the font file format;
+symbol sets are described in greater detail in the
+.IR "PCL\~5 Printer Language Technical Reference Manual" .
 .
 .
 .LP
-Two of the scalable fonts, Symbol and Wingdings, are bound to
-256-glyph symbol sets; the remaining scalable fonts, as well as the
-Lineprinter font, support numerous symbol sets, sufficient to enable
-printing of more than 600 glyphs.
+Two of the scalable fonts,
+Symbol and Wingdings,
+are bound to 256-glyph symbol sets;
+the remaining scalable fonts,
+as well as the Lineprinter font,
+support numerous symbol sets,
+sufficient to enable printing of more than 600 glyphs.
 .
 .
 .LP
 The metrics generated by
 .BR hpftodit (@MAN1EXT@)
-assume that the DESC file contains values of 1200 for res and 6350 for
-unitwidth (or any combination (e.g., 2400 and 3175) for which
-res~\(mu~unitwidth~=~7\|620\|000).
-.
-Although HP PCL~5 LaserJet printers support an internal resolution of
-7200 units per inch, they use a 16-bit signed integer for cursor
-positioning; if
+assume that the DESC file contains values of 1200 for
+.I res
+and 6350 for
+.IR unitwidth ,
+or any combination
+(e.g.,
+2400 and 3175)
+for which
+.EQ
+res\~\[mu]\~unitwidth = 7\|620\|000.
+.EN
+.
+Although HP PCL\~5 LaserJet printers support an internal resolution of
+7200 units per inch,
+they use a 16-bit signed integer for cursor positioning;
+if
 .B devlj4
-is to support U.S.\& ledger paper (11~in~\(mu~17~in; in = inch),
-the maximum usable resolution is 32\|767~/~17, or 1927 units per inch,
+is to support U.S.\& ledger paper (11\~in\~\[mu]\~17\~in;
+in = inch),
+the maximum usable resolution is 32\|767\~\[di]\~17,
+or 1927 units per inch,
 which rounds down to 1200 units per inch.
 .
-If the largest required paper size is less (e.g., 8.5~in~\(mu~11~in,
-or A5), a greater resolution (and lesser unitwidth) can be specified.
+If the largest required paper size is less
+(e.g.,
+8.5\~in\~\[mu]\~11\~in,
+or A5),
+a greater
+.I res
+(and lesser
+.IR unitwidth )
+can be specified.
 .
 .
 .\" ====================================================================
@@ -129,55 +152,64 @@ Font metrics for Intellifont fonts were provided by 
Tagged Font Metric
 (TFM) files originally developed by Agfa/Compugraphic.
 .
 The TFM files provided for these fonts supported 600+ glyphs and
-contained extensive lists of kern pairs.
+contained extensive lists of kerning pairs.
 .
 .
 .LP
-To accommodate developers who had become accustomed to TFM files, HP also
-provided TFM files for the 10 TrueType fonts included in the LaserJet~4.
+To accommodate developers who had become accustomed to TFM files,
+HP also provided TFM files for the 10 TrueType fonts included in the
+LaserJet\~4.
 .
 The TFM files for TrueType fonts generally included less information
-than the Intellifont TFMs, supporting fewer glyphs, and in most cases,
+than the Intellifont TFMs,
+supporting fewer glyphs,
+and in most cases,
 providing no kerning information.
 .
-By the time the LaserJet~4000 printer was introduced, most
-developers had migrated to other means of obtaining font metrics,
+By the time the LaserJet\~4000 printer was introduced,
+most developers had migrated to other means of obtaining font metrics,
 and support for new TFM files was very limited.
 .
-The TFM files provided for the TrueType fonts in the LaserJet~4000
-support only the Latin 2 (ISO 8859-2) symbol set, and include no kerning
-information; consequently, they are of little value for any but the most
-rudimentary documents.
+The TFM files provided for the TrueType fonts in the LaserJet\~4000
+support only the Latin 2 (ISO 8859-2) symbol set,
+and include no kerning information;
+consequently,
+they are of little value for any but the most rudimentary documents.
 .
 .
 .LP
-Because the Intellifont TFM files contain considerably more
-information, they generally are preferable to the TrueType TFM files
-even for use with the TrueType fonts in the newer printers.
+Because the Intellifont TFM files contain considerably more information,
+they generally are preferable to the TrueType TFM files even for use
+with the TrueType fonts in the newer printers.
 .
-The metrics for the TrueType fonts are very close, though not identical,
+The metrics for the TrueType fonts are very close,
+though not identical,
 to those for the earlier Intellifont fonts of the same names.
 .
 Although most output using the Intellifont metrics with the newer
-printers is quite acceptable, a few glyphs may fail to print as
-expected.
+printers is quite acceptable,
+a few glyphs may fail to print as expected.
 .
 The differences in glyph metrics may be particularly noticeable with
-composite parentheses, brackets, and braces used by
+composite parentheses,
+brackets,
+and braces used by
 .BR eqn (@MAN1EXT@) .
 .
-A script, located in
-.BR @FONTDIR@/devlj4/generate ,
-can be used to adjust the metrics for these glyphs in the special font S
-for use with printers that have all TrueType fonts.
+A script,
+located in
+.IR @FONTDIR@/\:devlj4/\:generate ,
+can be used to adjust the metrics for these glyphs in the special font
+\[lq]S\[rq] for use with printers that have all TrueType fonts.
 .
 .
 .LP
-At the time HP last supported TFM files, only Version 1 of the Unicode
-standard was available.
+At the time HP last supported TFM files,
+only version 1.0 of the Unicode standard was available.
 .
-Consequently, many glyphs lacking assigned code points were assigned by
-HP to the Private Use Area (PUA).
+Consequently,
+many glyphs lacking assigned code points were assigned by HP to the
+Private Use Area (PUA).
 .
 Later versions of the Unicode standard included code points outside the
 PUA for many of these glyphs.
@@ -186,21 +218,31 @@ The HP-supplied TrueType TFM files use the PUA 
assignments;
 TFM files generated from more recent TrueType font files require the
 later Unicode values to access the same glyphs.
 .
-Consequently, two different mapping files may be required: one for the
-HP-supplied TFM files, and one for more recent TFM files.
+Consequently,
+two different mapping files may be required:
+one for the HP-supplied TFM files,
+and one for more recent TFM files.
 .
 .
-.\" ==========================================================================
+.\" ====================================================================
 .SH FILES
-.\" ==========================================================================
+.\" ====================================================================
 .
-.Tp \w'address@hidden@/devlj4/DESC'u+2n
-.B @FONTDIR@/devlj4/DESC
-Device description file.
 .TP
-.BI @FONTDIR@/devlj4/ F
-Font description file for font
-.IR F .
+.I @FONTDIR@/\:devlj4/\:DESC
+device description file
+.
+.
+.TP
+.IR @FONTDIR@/\:devlj4/\: F
+font description file for font
+.I F
+.
+.
+.TP
+.I @FONTDIR@/\:devlj4/\:generate
+corrects Intellifont-based height metrics for several glyphs in the
+special font for TrueType CG Times (LaserJet\~4000 and later).
 .
 .
 .\" ====================================================================
@@ -208,13 +250,17 @@ Font description file for font
 .\" ====================================================================
 .
 .BR groff (@MAN1EXT@),
-.BR groff_diff (@MAN1EXT@),
 .BR hpftodit (@MAN1EXT@),
 .BR grolj4 (@MAN1EXT@),
 .BR groff_font (@MAN5EXT@)
 .
 .
+.\" ====================================================================
+.\" Editor settings
+.\" ====================================================================
+.
 .\" Local Variables:
 .\" mode: nroff
+.\" fill-column: 72
 .\" End:
-.\" vim: set filetype=groff:
+.\" vim: set filetype=groff textwidth=72:
diff --git a/src/utils/hpftodit/hpftodit.1.man 
b/src/utils/hpftodit/hpftodit.1.man
index 683a5cc..9d5ba9b 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -1,4 +1,3 @@
-.tr ~
 .TH HPFTODIT @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 hpftodit \- create font description files for use with groff \-Tlj4
@@ -31,87 +30,88 @@ hpftodit \- create font description files for use with 
groff \-Tlj4
 .
 .
 .\" ====================================================================
-.\" Definitions
-.\" ====================================================================
-.
-.de CW
-.ie \\n(.$>2 \&\\$1\f(CR\\$2\fP\\$3
-.el \&\f(CR\\$1\fP\\$2
-..
-.
-.tr ~
-.
-.\" ==========================================================================
 .SH SYNOPSIS
-.\" ==========================================================================
-.B hpftodit
-[
-.B \-adqsv
-]
-[
-.BI \-i n
-]
-.I tfm_file
-.I map_file
-.I font
-.PP
-It is possible to have whitespace between the
-.B \-i
-option and its parameter.
+.\" ====================================================================
+.SY hpftodit
+.OP \-aqsv
+.OP \-i n
+.I tfm-file
+.I map-file
+.I output-font
+.YS
+.
+.SY hpftodit
+.B \-d
+.I tfm-file
+.RI [ map-file ]
+.YS
 .
 .
-.\" ==========================================================================
+.\" ====================================================================
 .SH DESCRIPTION
-.\" ==========================================================================
+.\" ====================================================================
 .
 .B hpftodit
-creates a font file for use with a Hewlett-Packard LaserJet~4\(enseries
+creates a font file for use with a Hewlett-Packard LaserJet\~\%4-series
 (or newer) printer with
 .BR "groff \-Tlj4" ,
 using data from an HP tagged font metric (TFM) file.
-.I tfm_file
-is the name of the TFM file for the font; Intellifont and
-TrueType TFM files are supported, but symbol set TFM files are not.
-.I map_file
-is a file giving the groff names for characters in the font; this file
-should consist of a sequence of lines of the form:
-.IP
-.I
-m u c1 c2 \fR.\|.\|. [
-.CW #
-.I comment
-]
 .
-.
-.LP
+.I tfm-file
+is the name of the TFM file for the font;
+Intellifont and TrueType TFM files are supported,
+but symbol set TFM files are not.
+.
+.I map-file
+is a file giving the
+.I groff
+names for characters in the font;
+this file should consist of a sequence of lines of the form:
+.RS
+.EX
+.IR "m u c1 c2 " "\&.\|.\|.\& [#" " comment" "]"
+.EE
+.RE
 where
 .I m
-is a decimal integer giving the MSL number of the character,
+is a decimal integer giving the MSL (Master Symbol List) number of the
+character,
 .I u
 is a hexadecimal integer giving the Unicode value of the character,
 and
 .IR c1 ,
 .IR c2 ", .\|.\|."
-are the groff names of the character.
-.
-The values can be separated by any whitespace; the Unicode value must
-use uppercase digits A\^\(en\^F, and must be without a leading
-.CW \[oq] 0x \[cq],
-.CW \[oq] u \[cq],
+are the
+.I groff
+names of the character
+(see
+.BR groff_char (7)
+for a list).
+.
+The values can be separated by any whitespace;
+the Unicode value must use uppercase digits A\^\[en]\^F,
+and must be without a leading
+.RB \[oq] 0x \[cq],
+.RB \[oq] u \[cq],
 or
-.CW \[oq] U+ \[cq].
-Unicode values corresponding to composite glyphs are decomposed; e.g.,
-.CW \[oq] u00C0 \[cq]
+.RB \[oq] U+ \[cq].
+Unicode values corresponding to composite glyphs are decomposed;
+e.g.,
+.RB \[oq] u00C0 \[cq]
 becomes
-.CW \[oq] u0041_0300 \[cq].
+.RB \[oq] u0041_0300 \[cq].
 .
-The name for a glyph without a groff name may be given as
-.CW u \fIXXXX\fP
-if the glyph corresponds to a Unicode value, or as an unnamed glyph
-.CW \[oq] --- \[cq].
+The name for a glyph without a
+.I groff
+name may be given as
+.BI u XXXX
+if the glyph corresponds to a Unicode value,
+or as an unnamed glyph
+.RB \[oq] \-\-\- \[cq].
 .
 If the given Unicode value is in the Private Use Area
-(0xE000\^\(en\^0xF8FF), the glyph is included as an unnamed glyph.
+(0xE000\^\[en]\^0xF8FF),
+the glyph is included as an unnamed glyph.
 .
 Refer to
 .BR groff_diff (@MAN1EXT@)
@@ -120,63 +120,81 @@ for additional information about unnamed glyphs and how 
to access them.
 .
 .LP
 Blank lines and lines beginning with
-.CW \[oq] # \[cq]
+.RB \[oq] # \[cq]
 are ignored.
 .
 A
-.CW \[oq] # \[cq]
-following one or more groff names begins a comment.
+.RB \[oq] # \[cq]
+following one or more
+.I groff
+names begins a comment.
 .
 Because
-.CW \[oq] # \[cq]
-is a valid groff name, it must appear first in a list of
-groff names if a comment is included, e.g.,
-.IP
-.CW "3   0023   #   # number sign"
-.LP
+.RB \[oq] # \[cq]
+is a valid
+.I groff
+name,
+it must appear first in a list of
+.I groff
+names if a comment is included,
+e.g.,
+.
+.RS
+.EX
+.B
+3   0023   #   # number sign
+.EE
+.RE
+.
 or
-.IP
-.CW "3   0023   # sh   # number sign"
-.LP
+.
+.RS
+.EX
+.B
+3   0023   # sh   # number sign
+.EE
+.RE
+.
 rather than
-.IP
-.CW "3   0023   sh #   # number sign"
-.LP
+.
+.RS
+.EX
+.B
+3   0023   sh #   # number sign
+.EE
+.RE
+.
 which will treat the first
-.CW \[oq] # \[cq]
+.RB \[oq] # \[cq]
 as the beginning of the comment.
 .
 .
 .LP
-.I font
-is the name of the groff font file.
-.
-The groff font file is written to
-.IR font ;
-if
-.I font
-is specified as
-.CW \[oq] - \[cq],
-the output is written to the standard output.
+The
+.I groff
+font file is written to the specified
+.IR output-font ;
+if this operand is
+.RB \[oq] \- \[cq],
+the font file is written to the standard output.
 .
 .
 .LP
 The
 .B \-s
 option should be given if the font is special
-(a font is
-.I special
-if
-.B troff
-should search it whenever
-a character is not found in the current font).
+(a font is \[lq]special\[rq] if
+.I groff
+should search it whenever a character is not found in the current font).
 .
 If the font is special,
 it should be listed in the
 .B fonts
 command in the DESC file;
-if it is not special, there is no need to list it, since
-.B troff
+if it is not special,
+there is no need to list it,
+since
+.I groff
 can automatically mount it when it's first used.
 .
 .
@@ -192,85 +210,95 @@ for each character
 .BR groff_font (@MAN5EXT@)).
 .
 .
-.\" ==========================================================================
+.\" ====================================================================
 .SH OPTIONS
-.\" ==========================================================================
+.\" ====================================================================
 .
 .TP
 .B \-a
-Include characters in the TFM file that are not included in the map
-file.
+Include characters in the TFM file that are not included in
+.IR map-file .
 .
 A glyph with corresponding Unicode value is given the name
 .RI u XXXX ;
 a glyph without a Unicode value is included as an unnamed glyph
-\&\[oq]\-\^\-\^\-\[cq].
+\[oq]\-\^\-\^\-\[cq].
 .
 A glyph with a Unicode value in the Private Use Area
-(0xE000\^\(en\^0xF8FF) also is included as an unnamed glyph.
+(0xE000\^\[en]\^0xF8FF) also is included as an unnamed glyph.
+.
 .
 .IP
 This option provides a simple means of adding Unicode-named and
-unnamed glyphs to a font without including them in the map file, but
-it affords little control over which glyphs are placed in a regular
+unnamed glyphs to a font without including them in the map file,
+but it affords little control over which glyphs are placed in a regular
 font and which are placed in a special font.
 .
 The presence or absence of the
 .B \-s
-option has some effect on which glyphs are included: without the
+option has some effect on which glyphs are included:
+without the
 .B \-s
-option, only the \(lqtext\(rq symbol sets are searched for matching
-glyphs; with the
+option,
+only the \[lq]text\[rq] symbol sets are searched for matching glyphs;
+with the
 .B \-s
-option, only the \(lqmathematical\(rq symbol sets
-are searched.
+option,
+only the \[lq]mathematical\[rq] symbol sets are searched.
 .
-Nonetheless, restricting the symbol sets searched isn't very
-selective\(emmany glyphs are placed in both regular and special fonts.
+Nonetheless,
+restricting the symbol sets searched isn't very selective\[em]many
+glyphs are placed in both regular and special fonts.
 .
-Normally, the
+Normally,
+the
 .B \-a
 option should be used only as a last resort.
 .
 .
 .TP
 .B \-d
-Dump information about the TFM file to the standard output; this
-option can be useful for ensuring that a TFM file is a proper match
-for a font, and that the contents of the TFM file are suitable.
+Dump information about the TFM file to the standard output;
+this option can be useful for ensuring that a TFM file is a proper match
+for a font,
+and that the contents of the TFM file are suitable.
 .
-The information includes the values of important TFM tags, and a
-listing (by MSL number for Intellifont TFM files or by Unicode value
-for TrueType TFM files) of the glyphs included in the TFM file.
+The information includes the values of important TFM tags,
+and a listing (by MSL number for Intellifont TFM files or by Unicode
+value for TrueType TFM files) of the glyphs included in the TFM file.
 .
 The unit of measure \[oq]DU\[cq] for some tags indicates design units;
-there are 8782 design units per em for Intellifont fonts, and 2048
-design units per em for TrueType fonts.
+there are 8782\~design units per em for Intellifont fonts,
+and 2048\~design units per em for TrueType fonts.
 .
 Note that the accessibility of a glyph depends on its inclusion in a
-symbol set; some TFM files list many glyphs but only a few symbol
-sets.
+symbol set;
+some TFM files list many glyphs but only a few symbol sets.
 .
 .IP
-The glyph listing includes the glyph index within the TFM file, the MSL
-or Unicode value, and the symbol set and character code that will be
-used to print the glyph.
+The glyph listing includes the glyph index within the TFM file,
+the MSL or Unicode value,
+and the symbol set and character code that will be used to print the
+glyph.
 .
 If
-.I map_file
+.I map-file
 is given,
-groff names are given for matching glyphs.
+.I groff
+names are given for matching glyphs.
 .
-If only the glyph index and MSL or Unicode value are given, the glyph
-does not appear in any supported symbol set and cannot be printed.
+If only the glyph index and MSL or Unicode value are given,
+the glyph does not appear in any supported symbol set and cannot be
+printed.
 .
 .IP
 With the
 .B \-d
 option,
-.I map_file
-is optional, and
-.I font
+.I map-file
+is optional,
+and
+.I output-font
 is ignored if given.
 .
 .TP
@@ -289,7 +317,7 @@ to the standard output.
 .B \-v
 Print the
 .B hpftodit
-version number.
+version number and exit.
 .
 .TP
 .B \-s
@@ -297,67 +325,70 @@ The font is special.
 .
 This option adds the
 .B special
-command to the font file, and affects the order in which HP symbol sets
-are searched for each glyph.
+command to the font file,
+and affects the order in which HP symbol sets are searched for each
+glyph.
 .
 Without the
 .B \-s
-option, the \[lq]text\[rq] sets are searched before
-the \[lq]mathematical\[rq] symbol sets.
+option,
+the \[lq]text\[rq] sets are searched before the \[lq]mathematical\[rq]
+symbol sets.
 With the
 .B \-s
-option, the search order is reversed.
+option,
+the search order is reversed.
 .
 .TP
 .BI \-i n
-Generate an italic correction for each character so that the
-character's width plus the character's italic correction is
-equal to
+Generate an italic correction for each character so that the character's
+width plus the character's italic correction is equal to
 .I n
 thousandths of an em plus the amount by which the right edge of the
-character's bounding is to the right of the character's
-origin.
+character's bounding is to the right of the character's origin.
 .
-If this would result in a negative italic correction, use a zero italic
-correction instead.
+If this would result in a negative italic correction,
+use a zero italic correction instead.
 .
 .IP
-Also generate a subscript correction equal to the product of the
-tangent of the slant of the font and four fifths of the x-height of
-the font.
+Also generate a subscript correction equal to the product of the tangent
+of the slant of the font and four fifths of the x-height of the font.
 .
 If this would result in a subscript correction greater than the italic
-correction, use a subscript correction equal to the italic correction
-instead.
+correction,
+use a subscript correction equal to the italic correction instead.
 .
 .IP
 Also generate a left italic correction for each character equal to
 .I n
 thousandths of an em plus the amount by which the left edge of the
-character's bounding box is to the left of the character's
-origin.
+character's bounding box is to the left of the character's origin.
 .
 The left italic correction may be negative.
 .
 .IP
 This option normally is needed only with italic or oblique fonts;
-a value of 50 (0.05 em) usually is a reasonable choice.
+a value of 50 (0.05\~em) usually is a reasonable choice.
 .
 .
-.\" ==========================================================================
+.\" ====================================================================
 .SH FILES
-.\" ==========================================================================
+.\" ====================================================================
+.
+.TP
+.I @FONTDIR@/\:devlj4/\:DESC
+device description file
+.
 .
-.TP \w'address@hidden@/devlj4/generate/\fP\,\fI*\/\fP.map'u+2n
-.B @FONTDIR@/devlj4/DESC
-Device description file.
 .TP
-.BI @FONTDIR@/devlj4/ F
+.IR @FONTDIR@/\:devlj4/\: F
 Font description file for font
-.IR F .
+.I F
+.
+.
 .TP
-.BI @FONTDIR@/devlj4/generate/ * .map
-Symbol mapping files
+.IR @FONTDIR@/\:devlj4/\:generate/\: * .map
+symbol mapping files
 .
 .
 .\" ====================================================================
@@ -373,7 +404,12 @@ Symbol mapping files
 .cp \n[groff_C]
 .
 .
+.\" ====================================================================
+.\" Editor settings
+.\" ====================================================================
+.
 .\" Local Variables:
 .\" mode: nroff
+.\" fill-column: 72
 .\" End:
-.\" vim: set filetype=groff:
+.\" vim: set filetype=groff textwidth=72: