[groff] 38/39: [grolj4]: Absorb lj4_font(5) into grolj4(1).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit f366524e5241e464fd9ba1b19bd82813fbc665f9
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Oct 29 13:13:04 2022 -0500

    [grolj4]: Absorb lj4_font(5) into grolj4(1).
    
    * src/devices/grolj4/lj4_font.5.man: Delete, moving content...
    * src/devices/grolj4/grolj4.1.man (Fonts): ...hither.
    
    * doc/doc.am (GROFF_MAN_PAGES1):
    * src/devices/grolj4/grolj4.am (man5_MANS, EXTRA_DIST): Stop formatting
      and shipping removed page.
    
    * src/roff/groff/groff.1.man:
    * src/utils/hpftodit/hpftodit.1.man: Drop references to page.
    
    Fixes <https://savannah.gnu.org/bugs/index.php?61819>.
---
 ChangeLog                         |  16 ++
 doc/doc.am                        |   1 -
 src/devices/grolj4/grolj4.1.man   | 196 +++++++++++++++++++++++-
 src/devices/grolj4/grolj4.am      |   4 +-
 src/devices/grolj4/lj4_font.5.man | 305 --------------------------------------
 src/roff/groff/groff.1.man        |   3 +-
 src/utils/hpftodit/hpftodit.1.man |   3 +-
 7 files changed, 214 insertions(+), 314 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc2e58364..71ee8e0d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2022-10-29  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [grolj4]: Absorb lj4_font(5) man page into grolj4(1).
+
+       * src/devices/grolj4/lj4_font.5.man: Delete, moving content...
+       * src/devices/grolj4/grolj4.1.man (Fonts): ...hither.
+
+       * doc/doc.am (GROFF_MAN_PAGES1):
+       * src/devices/grolj4/grolj4.am (man5_MANS, EXTRA_DIST): Stop
+       formatting and shipping removed page.
+
+       * src/roff/groff/groff.1.man:
+       * src/utils/hpftodit/hpftodit.1.man: Drop references to page.
+
+       Fixes <https://savannah.gnu.org/bugs/index.php?61819>.
+
 2022-10-29  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [mdoc]: Support `SN` register to configure subsection heading
diff --git a/doc/doc.am b/doc/doc.am
index a5eae91fe..9c2198683 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -217,7 +217,6 @@ GROFF_MAN_PAGES1 = \
   man/groff_font.5 \
   man/groff_out.5 \
   man/groff_tmac.5 \
-  src/devices/grolj4/lj4_font.5 \
   man/groff.7 \
   man/groff_char.7 \
   man/groff_diff.7 \
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.1.man
index 379e0d816..8e397dbd3 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -532,6 +532,201 @@ commands.
 .
 .
 .\" ====================================================================
+.SS Fonts
+.\" ====================================================================
+.
+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 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
+.I groff
+assume that all printers since the LaserJet\~4 are identical.
+.
+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.
+.
+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.
+.
+Differences among printer models are described in the
+.I "PCL\~5 Comparison Guide"
+and the
+.I "PCL\~5 Comparison Guide Addendum"
+(for printers introduced since approximately 2001).
+.
+.
+.LP
+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.
+.
+For each glyph,
+.MR hpftodit @MAN1EXT@
+searches a list of symbol sets,
+and selects the first set that contains the glyph.
+.
+The printing code generated by
+.I hpftodit
+is an integer that encodes a numerical value for the symbol set in the
+high byte(s),
+and the index in the low byte.
+.
+See
+.MR 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" .
+.
+.
+.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.
+.
+.
+.LP
+The metrics generated by
+.I hpftodit
+assume that the
+.I DESC
+file contains values of 1200 for
+.I res
+and 6350 for
+.IR unitwidth ,
+or any combination
+(e.g.,
+2400 and 3175)
+for which
+.IR res \~\[tmu]\~ 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 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\~\[di]\~17,
+or 1927 units per inch,
+which rounds down to 1200 units per inch.
+.
+If the largest required paper dimension is less
+(e.g.,
+8.5\~in\~\[mu]\~11\~in,
+or A5),
+a greater
+.I res
+(and lesser
+.IR unitwidth )
+can be specified.
+.
+.
+.P
+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 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.
+.
+The TFM files for TrueType fonts generally included less information
+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,
+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.
+.
+.
+.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.
+.
+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.
+.
+The differences in glyph metrics may be particularly noticeable with
+composite parentheses,
+brackets,
+and braces used by
+.MR eqn @MAN1EXT@ .
+.
+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.0 of the Unicode standard was available.
+.
+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.
+.
+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.
+.
+.
+.\" ====================================================================
 .SH Options
 .\" ====================================================================
 .
@@ -664,7 +859,6 @@ Small dots.
 .
 .P
 .MR hpftodit @MAN1EXT@ ,
-.MR lj4_font @MAN5EXT@ ,
 .MR groff @MAN1EXT@ ,
 .MR @g@troff @MAN1EXT@ ,
 .MR groff_out @MAN5EXT@ ,
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 65afb1804..37138b222 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -22,10 +22,8 @@ grolj4_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a
 man1_MANS += src/devices/grolj4/grolj4.1
-man5_MANS += src/devices/grolj4/lj4_font.5
 EXTRA_DIST += \
-  src/devices/grolj4/grolj4.1.man \
-  src/devices/grolj4/lj4_font.5.man
+  src/devices/grolj4/grolj4.1.man
 
 # Local Variables:
 # fill-column: 72
diff --git a/src/devices/grolj4/lj4_font.5.man 
b/src/devices/grolj4/lj4_font.5.man
deleted file mode 100644
index e4aeecac6..000000000
--- a/src/devices/grolj4/lj4_font.5.man
+++ /dev/null
@@ -1,305 +0,0 @@
-.TH lj4_font @MAN5EXT@ "@MDATE@" "groff @VERSION@"
-.SH Name
-lj4_font \- groff fonts for use with devlj4
-.
-.
-.\" ====================================================================
-.\" Legal Terms
-.\" ====================================================================
-.\"
-.\" Copyright (C) 2004-2020 Free Software Foundation, Inc.
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of
-.\" this manual under the conditions for verbatim copying, provided that
-.\" the entire resulting derived work is distributed under the terms of
-.\" a permission notice identical to this one.
-.\"
-.\" Permission is granted to copy and distribute translations of this
-.\" manual into another language, under the above conditions for
-.\" modified versions, except that this permission notice may be
-.\" included in translations approved by the Free Software Foundation
-.\" instead of in the original English.
-.
-.
-.\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
-.do nr *groff_lj4_font_5_man_C \n[.cp]
-.cp 0
-.
-.
-.\" ====================================================================
-.SH Description
-.\" ====================================================================
-.
-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 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
-.I groff
-assume that all printers since the LaserJet\~4 are identical.
-.
-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.
-.
-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.
-.
-Differences among printer models are described in the
-.I "PCL\~5 Comparison Guide"
-and the
-.I "PCL\~5 Comparison Guide Addendum"
-(for printers introduced since approximately 2001).
-.
-.
-.LP
-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.
-.
-For each glyph,
-.MR hpftodit @MAN1EXT@
-searches a list of symbol sets,
-and selects the first set that contains the glyph.
-.
-The printing code generated by
-.I hpftodit
-is an integer that encodes a numerical value for the symbol set in the
-high byte(s),
-and the index in the low byte.
-.
-See
-.MR 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" .
-.
-.
-.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.
-.
-.
-.LP
-The metrics generated by
-.I hpftodit
-assume that the
-.I DESC
-file contains values of 1200 for
-.I res
-and 6350 for
-.IR unitwidth ,
-or any combination
-(e.g.,
-2400 and 3175)
-for which
-.IR res \~\[tmu]\~ 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 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\~\[di]\~17,
-or 1927 units per inch,
-which rounds down to 1200 units per inch.
-.
-If the largest required paper dimension is less
-(e.g.,
-8.5\~in\~\[mu]\~11\~in,
-or A5),
-a greater
-.I res
-(and lesser
-.IR unitwidth )
-can be specified.
-.
-.
-.\" ====================================================================
-.SH Limitations
-.\" ====================================================================
-.
-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 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.
-.
-The TFM files for TrueType fonts generally included less information
-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,
-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.
-.
-.
-.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.
-.
-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.
-.
-The differences in glyph metrics may be particularly noticeable with
-composite parentheses,
-brackets,
-and braces used by
-.MR eqn @MAN1EXT@ .
-.
-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.0 of the Unicode standard was available.
-.
-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.
-.
-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.
-.
-.
-.\" ====================================================================
-.SH Files
-.\" ====================================================================
-.
-.TP
-.I @FONTDIR@/\:\%devlj4/\:DESC
-describes the
-.B lj4
-output device.
-.
-.
-.TP
-.IR @FONTDIR@/\:\%devlj4/\: F
-describes the font known
-.RI as\~ F
-on device
-.BR lj4 .
-.
-.
-.TP
-.I @FONTDIR@/\:\%devlj4/\:\%generate/\:\%Makefile
-is a
-.MR make 1
-script that uses
-.MR hpftodit @MAN1EXT@
-to prepare the foregoing font description files from HP TFM data;
-in can be used to regenerate the
-.I groff
-font descriptions in the event the TFM files are updated.
-.
-.
-.TP
-.I @FONTDIR@/\:\%devlj4/\:\%generate/\:\%special\:.awk
-is an
-.MR awk 1
-script that corrects the Intellifont-based height metrics for several
-glyphs in the
-.B S
-(special) font for TrueType CG Times used in the HP LaserJet\~4000 and
-later.
-.
-.
-.TP
-.I @FONTDIR@/\:\%devlj4/\:\%generate/\:\%special\:.map
-.TQ
-.I @FONTDIR@/\:\%devlj4/\:\%generate/\:\%symbol\:.map
-.TQ
-.I @FONTDIR@/\:\%devlj4/\:\%generate/\:text\:.map
-.TQ
-.I @FONTDIR@/\:\%devlj4/\:\%generate/\:\%wingdings.map
-map MSL indices and HP Unicode Private Use Area assignments to
-.I groff
-special character identifiers.
-.
-.
-.\" ====================================================================
-.SH "See also"
-.\" ====================================================================
-.
-.MR groff @MAN1EXT@ ,
-.MR hpftodit @MAN1EXT@ ,
-.MR grolj4 @MAN1EXT@ ,
-.MR groff_font @MAN5EXT@
-.
-.
-.\" Restore compatibility mode (for, e.g., Solaris 10/11).
-.cp \n[*groff_lj4_font_5_man_C]
-.do rr *groff_lj4_font_5_man_C
-.
-.
-.\" Local Variables:
-.\" fill-column: 72
-.\" mode: nroff
-.\" End:
-.\" vim: set filetype=groff textwidth=72:
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 883803c23..ae5b6edbf 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -2176,7 +2176,7 @@ manual.
 You can browse it interactively with \[lq]info groff\[rq].
 .
 .
-.\" groff ships 60 man pages generated from 59 source files.  The
+.\" groff ships 59 man pages generated from 58 source files.  The
 .\" numbered comments refer to their sorting order in the source tree,
 .\" so that it is easier to tell that we've enumerated all of them.
 .TP
@@ -2267,7 +2267,6 @@ Postprocessors for output devices:
 .MR grohtml @MAN1EXT@ , \" #25
 .MR grolbp @MAN1EXT@ , \" #26
 .MR grolj4 @MAN1EXT@ , \" #27
-.MR lj4_font @MAN5EXT@ , \" #28
 .MR gropdf @MAN1EXT@ , \" #29
 .MR grops @MAN1EXT@ , \" #31
 .MR grotty @MAN1EXT@ \" #32
diff --git a/src/utils/hpftodit/hpftodit.1.man 
b/src/utils/hpftodit/hpftodit.1.man
index 288d97eda..ff14ec719 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -443,8 +443,7 @@ special character identifiers.
 .MR groff @MAN1EXT@ ,
 .MR groff_diff @MAN1EXT@ ,
 .MR grolj4 @MAN1EXT@ ,
-.MR groff_font @MAN5EXT@ ,
-.MR lj4_font @MAN5EXT@
+.MR groff_font @MAN5EXT@
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).