[groff] 21/35: [docs]: Relocate material.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 5eebf9ee38ed4aa4c5959fba97b89fc4bd60b11c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Jul 16 02:23:07 2021 +1000

    [docs]: Relocate material.
    
    * doc/groff.texi (Font File Format):
    * man/groff_font.5.man (Description/Font file format): Relocate
      description of "metrics" field in a "charset" section to follow the
      glyph "name" field description so that the discussion order matches
      the syntactic order.
---
 doc/groff.texi       |  62 +++++++++++------------
 man/groff_font.5.man | 136 +++++++++++++++++++++++++--------------------------
 2 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/doc/groff.texi b/doc/groff.texi
index 76cc62d..87f066e 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -18021,37 +18021,6 @@ The name @samp{---} is special and indicates that the 
glyph is unnamed;
 such glyphs can only be used by means of the @code{\N} escape sequence
 in @code{gtroff}.
 
-The @var{type} field gives the glyph type:
-
-@table @code
-@item 1
-the glyph has a descender, for example, @samp{p};
-
-@item 2
-the glyph has an ascender, for example, @samp{b};
-
-@item 3
-the glyph has both an ascender and a descender, for example, @samp{(}.
-@end table
-
-The @var{code} field gives the code that the postprocessor uses to
-print the glyph.  The glyph can also be input to @code{gtroff} using
-this code by means of the @code{\N} escape sequence.  @var{code} can be
-any integer.  If it starts with @samp{0} it is interpreted as octal; if
-it starts with @samp{0x} or @samp{0X} it is interpreted as hexadecimal.
-Note, however, that the @code{\N} escape sequence only accepts a decimal
-integer.
-
-The @var{entity-name} field gives an @acronym{ASCII} string identifying
-the glyph that the postprocessor uses to print the @code{gtroff} glyph
-@var{name}.  This field is optional and has been introduced so that the
-@code{grohtml} device driver can encode its character set.  For example,
-the glyph @samp{\[Po]} is represented as @samp{&pound;} in
-@acronym{HTML} 4.0.
-
-Anything on the line after the @var{entity-name} field resp.@: after
-@samp{--} is ignored.
-
 The @var{metrics} field has the form:
 
 @display
@@ -18084,6 +18053,37 @@ by a glyph from a roman font.  The 
@var{subscript-correction} gives the
 amount of space that should be added after a glyph before adding a
 subscript.  This should be less than the italic correction.
 
+The @var{type} field gives the glyph type:
+
+@table @code
+@item 1
+the glyph has a descender, for example, @samp{p};
+
+@item 2
+the glyph has an ascender, for example, @samp{b};
+
+@item 3
+the glyph has both an ascender and a descender, for example, @samp{(}.
+@end table
+
+The @var{code} field gives the code that the postprocessor uses to
+print the glyph.  The glyph can also be input to @code{gtroff} using
+this code by means of the @code{\N} escape sequence.  @var{code} can be
+any integer.  If it starts with @samp{0} it is interpreted as octal; if
+it starts with @samp{0x} or @samp{0X} it is interpreted as hexadecimal.
+Note, however, that the @code{\N} escape sequence only accepts a decimal
+integer.
+
+The @var{entity-name} field gives an @acronym{ASCII} string identifying
+the glyph that the postprocessor uses to print the @code{gtroff} glyph
+@var{name}.  This field is optional and has been introduced so that the
+@code{grohtml} device driver can encode its character set.  For example,
+the glyph @samp{\[Po]} is represented as @samp{&pound;} in
+@acronym{HTML} 4.0.
+
+Anything on the line after the @var{entity-name} field resp.@: after
+@samp{--} is ignored.
+
 A line in the @code{charset} section can also have the format
 
 @Example
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index 1428d12..a644d0d 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -580,6 +580,74 @@ escape sequence in
 .
 .LP
 The
+.I metrics
+field has the form
+(on one line;
+it may be broken here for the sake of readability):
+.
+.IP
+.I width\/\c
+.RI [\fB, \:height\/\c
+.RI [\fB, \:depth\/\c
+.RI [\fB, \:\%italic-correction\/\c
+.RI [\fB, \:\%left-italic-correction\/\c
+.RI [\fB, \:\%subscript-correction ]]]]]
+.
+.LP
+There must not be any spaces between these subfields.
+.
+Missing subfields are assumed to be\~0.
+.
+The subfields are all decimal integers.
+.
+Since there is no associated binary format,
+these values are not required to fit into a variable of type
+.B char
+as they are in ditroff.
+.
+The
+.I width
+subfields gives the width of the glyph.
+.
+The
+.I height
+subfield gives the height of the glyph
+(upwards is positive);
+if a glyph does not extend above the baseline,
+it should be given a zero height,
+rather than a negative height.
+.
+The
+.I depth
+subfield gives the depth of the glyph,
+that is,
+the distance below the baseline to which the glyph extends
+(downwards is positive);
+if a glyph does not extend below the baseline,
+it should be given a zero depth,
+rather than a negative depth.
+.
+The
+.I italic-correction
+subfield gives the amount of space that should be added after the
+glyph when it is immediately to be followed by a glyph
+from a roman font.
+.
+The
+.I left-italic-correction
+subfield gives the amount of space that should be added before the
+glyph when it is immediately to be preceded by a glyph
+from a roman font.
+.
+The
+.I subscript-correction
+gives the amount of space that should be added after a glyph
+before adding a subscript.
+.
+This should be less than the italic correction.
+.
+.LP
+The
 .I type
 field gives the glyph type:
 .
@@ -651,74 +719,6 @@ Anything on the line after the encoding field or 
\[oq]\-\-\[cq] are
 ignored.
 .
 .LP
-The
-.I metrics
-field has the form
-(on one line;
-it may be broken here for the sake of readability):
-.
-.IP
-.I width\/\c
-.RI [\fB, \:height\/\c
-.RI [\fB, \:depth\/\c
-.RI [\fB, \:\%italic-correction\/\c
-.RI [\fB, \:\%left-italic-correction\/\c
-.RI [\fB, \:\%subscript-correction ]]]]]
-.
-.LP
-There must not be any spaces between these subfields.
-.
-Missing subfields are assumed to be\~0.
-.
-The subfields are all decimal integers.
-.
-Since there is no associated binary format,
-these values are not required to fit into a variable of type
-.B char
-as they are in ditroff.
-.
-The
-.I width
-subfields gives the width of the glyph.
-.
-The
-.I height
-subfield gives the height of the glyph
-(upwards is positive);
-if a glyph does not extend above the baseline,
-it should be given a zero height,
-rather than a negative height.
-.
-The
-.I depth
-subfield gives the depth of the glyph,
-that is,
-the distance below the baseline to which the glyph extends
-(downwards is positive);
-if a glyph does not extend below the baseline,
-it should be given a zero depth,
-rather than a negative depth.
-.
-The
-.I italic-correction
-subfield gives the amount of space that should be added after the
-glyph when it is immediately to be followed by a glyph
-from a roman font.
-.
-The
-.I left-italic-correction
-subfield gives the amount of space that should be added before the
-glyph when it is immediately to be preceded by a glyph
-from a roman font.
-.
-The
-.I subscript-correction
-gives the amount of space that should be added after a glyph
-before adding a subscript.
-.
-This should be less than the italic correction.
-.
-.LP
 A line in the charset section can also have the format
 .
 .IP