gbranden pushed a commit to branch master
in repository groff.

commit 15b2cc2383bf28107ac7b6ddadd6f60c87aa602e
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Sat Jul 12 12:25:01 2025 -0500

    doc/*,man/*: Relocate and resync material.
    
    Quite a slog--there's more to do.
---
 doc/groff.texi.in    | 139 ++++++++++++++++++++++++++++++-------------
 man/groff_diff.7.man | 163 ++++++++++++++++++++++++---------------------------
 2 files changed, 176 insertions(+), 126 deletions(-)

diff --git a/doc/groff.texi.in b/doc/groff.texi.in
index c47ae2df4..39bfcff6f 100644
--- a/doc/groff.texi.in
+++ b/doc/groff.texi.in
@@ -19505,18 +19505,35 @@ GNU
 @command{troff} @c GNU
 extensions are liable to format their function selector character.
 @cindex @code{\~}, incompatibilities with @acronym{AT&T} @code{troff}
-For example, the adjustable, non-breaking space escape sequence
+For example,
+the adjustable,
+non-breaking space escape sequence
 @code{\~}
 @c BEGIN Keep in sync with groff_diff(7) and groff_man_style(7).
-is also supported by Heirloom Doctools @code{troff} 050915 (September
-2005), @code{mandoc} 1.9.5 (2009-09-21), @code{neatroff} (commit
-1c6ab0f6e, 2016-09-13), and Plan@tie{}9 from User Space @code{troff}
-(commit 93f8143600, 2022-08-12), but not by Solaris@tie{}10
+is also supported by Heirloom Doctools
+@command{troff} @c Heirloom
+050915 (September 2005),
+@command{mandoc}
+1.9.5 (2009-09-21),
+@command{neatroff}
+(commit 1c6ab0f6e,
+2016-09-13),
+and Plan@tie{}9 from User Space
+@command{troff} @c Plan 9
+(commit 93f8143600, 2022-08-12),
+but not by Solaris@tie{}10
 or Documenter's Workbench
-@code{troff}s.
+@code{troff}s. @c DWB, Solaris 10
+which both render it as
+@samp{~}.
 @c as of this writing, 2022-08-13
 @c END Keep in sync with groff_diff(7) and groff_man_style(7).
 @xref{Manipulating Filling and Adjustment}.
+GNU
+@command{troff}'s @c GNU
+features sometimes cause incompatibilities with documents written
+assuming old implementations of
+@code{troff}. @c generic
 
 @cindex @code{\A}, incompatibilities with @acronym{AT&T} @code{troff}
 @cindex @code{\|}, incompatibilities with @acronym{AT&T} @code{troff}
@@ -19583,18 +19600,39 @@ in this adjustment mode
 to prevent ``rivers'' in the text.
 
 @cindex hyphenation, incompatibilities with @acronym{AT&T} @code{troff}
-GNU @command{troff} does not always hyphenate words as @acronym{AT&T}
-@command{troff} does.  The @acronym{AT&T} implementation uses a set of
-hard-coded rules specific to English, while GNU @command{troff} uses
-language-specific hyphenation pattern files derived from @TeX{}.
-Furthermore, in old versions of @command{troff} there was a limited
-amount of space to store hyphenation exceptions (arguments to the
-@code{hw} request); GNU @command{troff} has no such restriction.  When
-the @code{hy} request is invoked without an argument, GNU
-@command{troff} sets the automatic hyphenation mode to the value of the
-@code{.hydefault} register; the @acronym{AT&T} implementation sets it to
-@samp{1}, which is not suitable in GNU @command{troff} for some
-languages, including English.
+GNU
+@command{troff} @c GNU
+does not always hyphenate words as @acronym{AT&T}
+@command{troff} @c AT&T
+does.
+The @acronym{AT&T} implementation uses a set of hard-coded rules
+specific to U.S.@: English,
+while GNU
+@command{troff} @c GNU
+uses language-specific hyphenation pattern files derived from @TeX{}.
+In some versions of
+@code{troff} @c generic
+there was limited space to store hyphenation exceptions
+(arguments to the
+@code{hw}
+request);
+GNU
+@command{troff} @c GNU
+has no such restriction.
+When the
+@code{hy}
+request is invoked without an argument,
+GNU
+@command{troff} @c GNU
+sets the automatic hyphenation mode to the value of the
+@code{.hydefault}
+register;
+the @acronym{AT&T} implementation sets it to
+@samp{1},
+which is not suitable in GNU
+@command{troff}
+for some languages,
+including English.
 
 GNU @command{troff} handles the dummy character @code{\&} differently
 from @acronym{AT&T} @command{troff} when it is followed by the
@@ -19660,27 +19698,21 @@ and doubling of an initial neutral double quote
 if the file name has one.
 
 @cindex output device name string (@code{.T}), in other implementations
-GNU @code{troff} predefines a string @code{.T} containing the argument
-given to the @option{-T} command-line option, namely the current output
-device (for example, @samp{pdf} or @samp{utf8}).  The existence of this
+The existence of the
+@code{.T}
 string is a common feature of device-independent
-@code{troff}s@footnote{DWB@tie{}3.3, Solaris, Heirloom Doctools, and
-Plan@tie{}9 @code{troff}s all support it.} but valid values are specific
-to each implementation.
-
-@cindex removal of read-only registers, incompatibility with @acronym{AT&T} 
@code{troff}
-@cindex register, read-only, removal, incompatibility with @acronym{AT&T} 
@code{troff}
-@cindex read-only register removal, incompatibility with @acronym{AT&T} 
@code{troff}
-@acronym{AT&T} @code{troff} ignored attempts to remove read-only
-registers; GNU @code{troff} honors such requests.  @xref{Built-in
-Registers}.
+@code{troff}s---DWB@tie{}3.3, @c others
+Solaris@tie{}10,
+Heirloom Doctools,
+and Plan@tie{}9
+@code{troff}s @c foreign
+all support it---but valid values are specific to each implementation.
 
 @cindex output device usage register (@code{.T}), incompatibility with 
@acronym{AT&T} @code{troff}
 The (read-only) register
 @code{.T}
 interpolates@tie{}1
-if
-GNU
+if GNU
 @command{troff} @c GNU
 is run with the
 @option{-T}
@@ -19690,21 +19722,48 @@ In contrast,
 AT&T
 @command{troff} @c AT&T
 interpolated@tie{}1 only if
-@command{nroff}
+@command{nroff} @c AT&T
 was the formatter and was run with
 @option{-T}.
 
+@cindex removal of read-only registers, incompatibility with @acronym{AT&T} 
@code{troff}
+@cindex register, read-only, removal, incompatibility with @acronym{AT&T} 
@code{troff}
+@cindex read-only register removal, incompatibility with @acronym{AT&T} 
@code{troff}
+@acronym{AT&T}
+@command{troff} @c AT&T
+ignored attempts to remove read-only registers;
+GNU
+@command{troff} @c GNU
+honors such requests.
+@xref{Built-in Registers}.
+
 @cindex @code{lf} request, incompatibilities with @acronym{AT&T} @code{troff}
-@acronym{AT&T} @code{troff} and other implementations handle the
-@code{lf} request differently.  For them, its @var{line} argument
-changes the line number of the @emph{current} line.
+The
+@code{lf}
+request sets the number of the
+@emph{current}
+input line in AT&T
+@command{troff} @c AT&T
+and the
+@emph{next}
+in GNU
+@command{troff}. @c GNU
 
 @cindex environment availability and naming, incompatibilities with
-@acronym{AT&T} @code{troff} had only environments named @samp{0},
-@samp{1}, and @samp{2}.  In GNU @code{troff}, any number of environments
-may exist, using any valid identifiers for their names
+@acronym{AT&T}
+@command{troff} @c AT&T
+had only environments named
+@samp{0},
+@samp{1},
+and
+@samp{2}.
+In GNU
+@command{troff},
+any number of environments may exist,
+using any valid identifiers for their names
 (@pxref{Identifiers}.)
 
+@c TODO: Resume groff_diff(7) synchronization work here.
 @cindex fractional point sizes
 @cindex fractional type sizes
 @cindex point sizes, fractional
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index 4c05813da..81a9da066 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -5269,41 +5269,6 @@ interpolates the Gregorian year minus 1900.
 .SS Miscellaneous
 .\" ====================================================================
 .
-GNU
-.I troff \" GNU
-predefines one string,
-.BR .T ,
-containing the argument given to the
-.B \-T
-command-line option,
-namely the output device
-(for example,
-.B pdf
-or
-.BR utf8 ).
-.
-The (read-only) register
-.B .T
-interpolates\~1
-if
-GNU
-.I troff \" GNU
-is run with the
-.B \-T
-option,
-and 0\~otherwise.
-In contrast,
-AT&T
-.I troff \" AT&T
-interpolated\~1 only if
-.I nroff
-was the formatter and was run with
-.BR \-T .
-.
-.
-.br
-.ne 3v
-.P
 A font not listed in the output device's
 .I DESC
 file's
@@ -6177,17 +6142,47 @@ The set of additional delimiters comprises
 .SH "Other differences"
 .\" ====================================================================
 .
-.\" TODO: Resync with the node of this name in our Texinfo manual.
+GNU
+.I troff \" GNU
+request names unrecognized by other
+.I troff \" generic
+implementations will likely be ignored by them,
+and escape sequences that are GNU
+.I troff \" GNU
+extensions are liable to format their function selector character.
+.
+For example,
+the adjustable,
+non-breaking space escape sequence
+.B \[rs]\[ti]
+.\" BEGIN Keep in sync with groff.texi node "Other Differences" and
+.\" groff_man_style(7).
+is also supported by Heirloom Doctools
+.I troff \" Heirloom
+050915 (September 2005),
+.I mandoc
+1.9.5 (2009-09-21),
+.I neatroff
+(commit 1c6ab0f6e,
+2016-09-13),
+and Plan\~9 from User Space
+.I troff \" Plan 9
+(commit 93f8143600,
+2022-08-12),
+but not by Solaris\~10
+or Documenter's Workbench
+.IR troff s, \" DWB, Solaris 10
+which both render it as
+.RB \[lq] \[ti] \[rq].
+.\" as of this writing, 2022-08-13
+.\" END Keep in sync with groff.texi node "Other Differences" and
+.\" groff_man_style(7).
 GNU
 .IR troff 's \" GNU
 features sometimes cause incompatibilities with documents written
 assuming old implementations of
 .IR troff . \" generic
 .
-Some GNU extensions to
-.I troff \" generic
-are supported by other implementations.
-.
 .
 .P
 GNU
@@ -6258,8 +6253,8 @@ does not always hyphenate words as AT&T
 .I troff \" AT&T
 does.
 .
-The AT&T implementation uses a set of hard-coded rules specific to
-U.S.\& English,
+The AT&T implementation uses a set of hard-coded rules
+specific to U.S.\& English,
 while GNU
 .I troff \" GNU
 uses language-specific hyphenation pattern files derived from \*[tx].
@@ -6274,6 +6269,21 @@ GNU
 .I troff \" GNU
 has no such restriction.
 .
+When the
+.B hy
+request is invoked without an argument,
+GNU
+.I troff \" GNU
+sets the automatic hyphenation mode to the value of the
+.B \%.hydefault
+register;
+the AT&T implementation sets it to
+.RB \[lq] 1 \[rq],
+which is not suitable in GNU
+.I troff \" GNU
+for some languages,
+including English.
+.
 .
 .P
 GNU
@@ -6341,7 +6351,7 @@ if the file name has one.
 .P
 The existence of the
 .B .T
-string is a common feature of post-CSTR\~#97
+string is a common feature of device-independent
 .IR troff s\[em]DWB\~3.3, \" others
 Solaris\~10,
 Heirloom Doctools,
@@ -6349,19 +6359,36 @@ and Plan\~9
 .I troff \" foreign
 all support it\[em]but valid values are specific to each implementation.
 .
-The behavior of the
+.
+.P
+The (read-only) register
 .B .T
-register in GNU
+interpolates\~1
+if GNU
 .I troff \" GNU
-differs from AT&T
-.IR troff , \" AT&T
-which interpolated\~1 only if
+is run with the
+.B \-T
+option,
+and\~0 otherwise.
+In contrast,
+AT&T
+.I troff \" AT&T
+interpolated\~1 only if
 .I nroff \" AT&T
-was the formatter and was called with
+was the formatter and was run with
 .BR \-T .
 .
 .
 .P
+AT&T
+.I troff \" AT&T
+ignored attempts to remove read-only registers;
+GNU
+.I troff \" GNU
+honors such requests.
+.
+.
+.P
 The
 .B lf
 request sets the number of the
@@ -6391,6 +6418,7 @@ any number of environments may exist,
 using any valid identifiers for their names.
 .
 .
+.\" TODO: Resume Texinfo "Other Differences" synchronization work here.
 .P
 GNU
 .I troff \" GNU
@@ -6430,43 +6458,6 @@ does.
 .
 .
 .P
-GNU
-.I troff \" GNU
-request names unrecognized by other
-.I troff \" generic
-implementations will likely be ignored by them,
-and escape sequences that are GNU
-.I troff \" GNU
-extensions are liable to format their function selector character.
-.
-For example,
-the adjustable,
-non-breaking space escape sequence
-.B \[rs]\[ti]
-.\" BEGIN Keep in sync with groff.texi node "Other Differences" and
-.\" groff_man_style(7).
-is also supported by Heirloom Doctools
-.I troff \" Heirloom
-050915 (September 2005),
-.I mandoc
-1.9.5 (2009-09-21),
-.I neatroff
-(commit 1c6ab0f6e,
-2016-09-13),
-and Plan\~9 from User Space
-.I troff \" Plan 9
-(commit 93f8143600,
-2022-08-12),
-but not by Solaris\~10
-.IR troff s, \" Solaris
-which renders it as
-.BR \[ti] .
-.\" as of this writing, 2022-08-13
-.\" END Keep in sync with groff.texi node "Other Differences" and
-.\" groff_man_style(7).
-.
-.
-.P
 Normally,
 the syntax form
 .BI \[rs]s n

_______________________________________________
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to