gbranden pushed a commit to branch master
in repository groff.

commit a740fd8bdce9392d062b137b1c4aabe75698dceb
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Aug 3 19:13:22 2024 -0500

    [docs]: De-document EBCDIC/CCSID 1047 support.
    
    * doc/groff.texi.in
    * man/groff.7.man
    * man/groff_char.7.man
    * man/groff_tmac.5.man
    * src/devices/grotty/grotty.1.man:
    * src/preproc/eqn/eqn.1.man:
    * src/preproc/preconv/preconv.1.man:
    * src/roff/groff/groff.1.man:
    * src/roff/nroff/nroff.1.man:
    * src/utils/grog/grog.1.man:
    * tmac/groff_mdoc.7.man: Do it.
    
    Consequently, stop distinguishing "ISO systems" from "EBCDIC systems".
    
    Continues fixing <https://savannah.gnu.org/bugs/?65724>.
---
 doc/groff.texi.in                 | 49 +++++++--------------------------------
 man/groff.7.man                   | 21 +++--------------
 man/groff_char.7.man              | 46 ++++--------------------------------
 man/groff_tmac.5.man              | 34 +++++++--------------------
 src/devices/grotty/grotty.1.man   | 35 ++--------------------------
 src/preproc/eqn/eqn.1.man         |  3 +--
 src/preproc/preconv/preconv.1.man |  6 ++---
 src/roff/groff/groff.1.man        | 22 ------------------
 src/roff/nroff/nroff.1.man        |  3 +--
 src/utils/grog/grog.1.man         |  5 ++--
 tmac/groff_mdoc.7.man             |  2 +-
 11 files changed, 35 insertions(+), 191 deletions(-)

diff --git a/doc/groff.texi.in b/doc/groff.texi.in
index 7b8dd189d..17fee6019 100644
--- a/doc/groff.texi.in
+++ b/doc/groff.texi.in
@@ -1274,18 +1274,6 @@ For typewriter-like devices that support the @w{Latin-1}
 For typewriter-like devices that use the Unicode (ISO@tie{}10646)
 character set with @w{UTF-8} encoding.
 
-@item cp1047
-@cindex encoding, output, @acronym{EBCDIC}
-@cindex @acronym{EBCDIC} output encoding
-@cindex output encoding, @acronym{EBCDIC}
-@cindex encoding, output, code page 1047
-@cindex code page 1047 output encoding
-@cindex output encoding, code page 1047
-@cindex IBM code page 1047 output encoding
-@cindex CCSID 1047 output encoding (EBCDIC)
-For typewriter-like devices that use the @acronym{EBCDIC} encoding IBM
-code page 1047.
-
 @item lj4
 For HP LaserJet4-compatible (or other PCL5-compatible) printers.
 
@@ -5636,19 +5624,6 @@ conversions.  Input to the GNU @code{troff} formatter 
itself, on the
 other hand, must be in one of two encodings it can recognize.
 
 @table @code
-@item cp1047
-@cindex encoding, input, @acronym{EBCDIC}
-@cindex @acronym{EBCDIC}, input encoding
-@cindex input encoding, @acronym{EBCDIC}
-@cindex encoding, input, code page 1047
-@cindex code page 1047, input encoding
-@cindex input encoding, code page 1047
-@cindex IBM code page 1047 input encoding
-@pindex cp1047.tmac
-The code page 1047 input encoding works only on @acronym{EBCDIC}
-platforms (and conversely, the other input encodings don't work on
-@acronym{EBCDIC} platforms).
-
 @item latin1
 @cindex encoding, input, @w{Latin-1} (ISO @w{8859-1})
 @cindex @w{Latin-1} (ISO @w{8859-1}), input encoding
@@ -6574,13 +6549,9 @@ warning in category @samp{input} (@pxref{Warnings}).  
They are removed
 during interpretation: an identifier @samp{foo}, followed by an invalid
 character and then @samp{bar}, is processed as @samp{foobar}.
 
-On a machine using the ISO 646, 8859, or 10646 character encodings,
-invalid input characters are @code{0x00}, @code{0x0B},
-@code{0x0D}--@code{0x1F}, and @code{0x80}--@code{0x9F}.  On an
-@acronym{EBCDIC} host, they are @code{0x00}--@code{0x01}, @code{0x08},
-@code{0x09}, @code{0x0B}, @code{0x0D}--@code{0x14},
-@code{0x17}--@code{0x1F}, and
-@code{0x30}--@code{0x3F}.@footnote{Historically, control characters like
+Invalid input characters are @code{0x00}, @code{0x0B},
+@code{0x0D}--@code{0x1F}, and
+@code{0x80}--@code{0x9F}.@footnote{Historically, control characters like
 ASCII STX, ETX, and BEL (@key{Control+B}, @key{Control+C}, and
 @key{Control+G}) have been observed in @code{roff} documents,
 particularly in macro packages employing them as delimiters with the
@@ -9281,9 +9252,8 @@ this spacing for the first paragraph in a section.
 @cindex fields, and tabs
 
 @cindex tab character encoding
-A tab character (@acronym{ISO} code point@tie{}9, @acronym{EBCDIC}
-code point@tie{}5) causes a horizontal movement to the next tab stop, if
-any.
+A tab character (code point@tie{}9) causes a horizontal movement to the
+next tab stop, if any.
 
 @Defesc {\\t, , , }
 @cindex tab character, non-interpreted (@code{\t})
@@ -9492,11 +9462,10 @@ refers to how the glyphs ``lead'' the eye across the 
page to the
 corresponding page number or other datum.}
 
 @cindex leader character
-A leader character (@acronym{ISO} and @acronym{EBCDIC} code
-point@tie{}1, also known as @acronym{SOH} or ``start of heading''),
-behaves similarly to a tab character:@: it moves to the next tab stop.
-The difference is that for this movement, the default fill character is
-a period @samp{.}.
+A leader character (@w{code point 1}, also known as @acronym{SOH} or
+``start of heading''), behaves similarly to a tab character:@: it moves
+to the next tab stop.  The difference is that for this movement, the
+default fill character is a period @samp{.}.
 
 @Defesc {\\a, , , }
 @cindex leader character, non-interpreted (@code{\a})
diff --git a/man/groff.7.man b/man/groff.7.man
index 602aefdf2..e7111df7a 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -336,9 +336,8 @@ Input to GNU
 .I troff \" GNU
 is organized into lines separated by the Unix newline character
 (U+000A),
-and must be in one of two character encodings it can recognize:
-IBM code page 1047 on EBCDIC systems,
-and ISO\~Latin-1 (8859-1) otherwise.
+and must be in the character encoding it recognizes:
+ISO\~Latin-1 (8859-1).
 .
 Use of ISO\~646-1991:IRV (\[lq]US-ASCII\[rq]) or (equivalently) the
 \[lq]Basic Latin\[rq]
@@ -1309,27 +1308,13 @@ is processed as \[lq]foobar\[rq].
 .
 .
 .P
-On a machine using the ISO 646,
-8859,
-or 10646 character encodings,
-invalid input characters are
+Invalid input characters are
 .BR 0x00 ,
 .BR 0x0B ,
 .BR 0x0D \[en] 0x1F ,
 and
 .BR 0x80 \[en] 0x9F .
 .
-On an EBCDIC host,
-they are
-.BR 0x00 \[en] 0x01 ,
-.BR 0x08 ,
-.BR 0x09 ,
-.BR 0x0B ,
-.BR 0x0D \[en] 0x14 ,
-.BR 0x17 \[en] 0x1F ,
-and
-.BR 0x30 \[en] 0x3F .
-.
 Some of these code points are used by
 .I @g@troff
 internally,
diff --git a/man/groff_char.7.man b/man/groff_char.7.man
index 98076b448..f516501ad 100644
--- a/man/groff_char.7.man
+++ b/man/groff_char.7.man
@@ -75,16 +75,13 @@ an output device renders
 .I glyphs.
 .
 .IR groff 's
-input character set is restricted to that defined by the standards
-ISO Latin-1
+input character set is restricted to that defined by the ISO Latin-1
 (ISO 8859-1)
-and CCSID \[lq]code page\[rq] 1047
-(an EBCDIC arrangement of Latin-1).
+standard.
 .
 For ease of document maintenance in UTF-8 environments,
 it is advisable to use only the Unicode basic Latin code points,
 a subset of all of the foregoing historically referred to as \%US-ASCII,
-.\" Yes, a subset, albeit a permutation as well in the cp1047 case.
 which has only 94 visible,
 printable code points.
 .\" In groff, 0x20 SP is mapped to a space node, not a glyph node, and
@@ -219,30 +216,13 @@ did you get the Wehrmacht helmet or the Death Star?\e}
 .
 .
 .P
-For brevity in the remainder of this document,
-we shall refer to systems conforming to the
-ISO 646:1991 IRV,
-ISO 8859,
-or
-ISO 10646 (\[lq]Unicode\[rq])
-character encoding standards as \[lq]ISO\[rq] systems,
-and those employing IBM code page 1047 as \[lq]EBCDIC\[rq] systems.
-.
-That said,
-EBCDIC systems that support
-.I groff
-are known to also support UTF-8.
-.
-.
-.P
 While
 .I groff
 accepts eight-bit encoded input,
 not all such code points are valid as input.
 .
 .\" src/libs/libgroff/invalid.cpp
-On ISO platforms,
-character codes
+Character codes
 0,
 11,
 13\[en]31,
@@ -256,16 +236,6 @@ SOH through LF
 and FF
 [Control+L].)
 .
-On EBCDIC platforms,
-0,
-8\[en]9,
-11,
-13\[en]20,
-23\[en]31,
-and
-48\[en]63
-are invalid.
-.
 Some of these code points are used by
 .I groff
 for internal purposes,
@@ -289,8 +259,7 @@ anything in the language,
 even over one million code points in Unicode,
 can be expressed using it.
 .
-On ISO systems,
-code points in the range 33\[en]126 comprise a common set of
+Code points in the range 33\[en]126 comprise a common set of
 printable glyphs in all of the aforementioned ISO character encoding
 standards.
 .
@@ -299,11 +268,6 @@ It is this character set and
 the corresponding glyph repertoire for which AT&T
 .I troff
 was implemented.
-.
-On EBCDIC systems,
-printable characters are in the range 66\[en]201 and 203\[en]254;
-those without counterparts in the ISO range 33\[en]126 are discussed
-in the next subsection.
 .\" From this point, do not talk about numerical character assignments.
 .
 .
@@ -545,7 +509,7 @@ falling back to basic Latin glyphs only when necessary.
 ISO 646 is a seven-bit code encoding 128 code points;
 eight-bit codes are twice the size.
 .
-ISO 8859-1 and code page 1047 allocated the additional space to what
+ISO Latin-1 (8859-1) allocated the additional space to what
 Unicode calls \[lq]C1 controls\[rq]
 (control characters)
 and the \[lq]Latin-1 supplement\[rq].
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index a859cc2f0..50de61e41 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -124,13 +124,14 @@ It can even be empty.
 .
 .
 .P
-Encode macro files in ISO 646 (\[lq]ASCII\[rq]) or either of
-CCSID
-(\[lq]code page\[rq])
-1047
-(on EBCDIC systems)
-or
-ISO Latin-1 (8859-1) (otherwise).
+Encode macro files in ISO 646 (\[lq]ASCII\[rq])
+or ISO Latin-1 (8859-1).
+.
+To prepare for a future
+.I groff
+release supporting UTF-8 input,
+restrict files to ISO 646 codes.
+.
 .
 .MR @g@soelim 1
 by design does not interpret
@@ -468,11 +469,6 @@ Latin-9 encodings
 .
 .
 .TP
-.I cp1047
-supports EBCDIC-based systems using CCSID\~1047.
-.
-.
-.TP
 .I koi8\-r
 supports the KOI8-R encoding.
 .
@@ -489,20 +485,6 @@ see
 .MR groff_char @MAN7EXT@ .
 .
 .
-.P
-Because different input character codes constitute valid GNU
-.I troff \" GNU
-input on ISO and EBCDIC systems,
-the
-.I latin
-and
-.I koi8\-r
-macro files cannot be used on EBCDIC systems,
-and
-.I cp1047
-cannot be used on ISO systems.
-.
-.
 .\" ====================================================================
 .SS "Auxiliary packages"
 .\" ====================================================================
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.1.man
index 29d98b101..332ed0659 100644
--- a/src/devices/grotty/grotty.1.man
+++ b/src/devices/grotty/grotty.1.man
@@ -107,12 +107,7 @@ when the latter is given one of the
 .RB \[lq] \-T\~latin1 \[rq],
 or
 .RB \[lq] \-T\~utf8 \[rq]
-options on systems using ISO character encoding standards,
-or with
-.RB \[lq] \-T\~cp1047 \[rq]
-or
-.RB \[lq] \-T\~utf8 \[rq]
-on EBCDIC-based hosts.
+options.
 .
 (In this installation,
 .B @DEVICE@
@@ -482,9 +477,8 @@ describes the output device's character encoding,
 one of
 .BR ascii ,
 .BR latin1 ,
-.BR utf8 ,
 or
-.BR cp1047 .
+.BR utf8 .
 .
 .
 .TP
@@ -595,21 +589,6 @@ on device
 .
 .
 .TP
-.I @FONTDIR@/\:\%devcp1047/\:DESC
-describes the
-.B cp1047
-output device.
-.
-.
-.TP
-.IR @FONTDIR@/\:\%devcp1047/ F
-describes the font known
-.RI as\~ F
-on device
-.BR cp1047 .
-.
-.
-.TP
 .I @FONTDIR@/\:\%devlatin1/\:DESC
 describes the
 .B latin1
@@ -643,7 +622,6 @@ on device
 .I @MACRODIR@/\:tty\:.tmac
 defines macros for use with the
 .BR ascii ,
-.BR cp1047 ,
 .BR latin1 ,
 and
 .B utf8
@@ -663,15 +641,6 @@ See
 .MR nroff @MAN1EXT@ .
 .
 .
-.\" XXX: The following no longer seems to be true; an inspection of the
-.\" font/*/dev*.am files suggests no evidence of it, at any rate.
-.\".P
-.\"Note that on EBCDIC hosts,
-.\"only files for the
-.\".B cp1047
-.\"device are installed.
-.
-.
 .\" ====================================================================
 .SH Limitations
 .\" ====================================================================
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index 38830f194..e3f4f3a9a 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -1547,9 +1547,8 @@ file sets the default:
 .BR 1 \~on
 .BR ascii ,
 .BR latin1 ,
-.BR utf8 ,
 and
-.B cp1047
+.B utf8
 devices,
 .RB otherwise\~ 0 .
 .
diff --git a/src/preproc/preconv/preconv.1.man 
b/src/preproc/preconv/preconv.1.man
index 0f2901840..4512aa5d9 100644
--- a/src/preproc/preconv/preconv.1.man
+++ b/src/preproc/preconv/preconv.1.man
@@ -408,10 +408,8 @@ is ignored during comparison with the above tags.
 While
 .I \%preconv
 recognizes all of the coding tags listed above,
-it is capable on its own of interpreting only three encodings:
-Latin-1,
-code page 1047,
-and UTF-8.
+it is capable on its own of interpreting only two encodings:
+Latin-1 and and UTF-8.
 .
 If
 .I iconv
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 19f49379f..b855a4a69 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -1386,11 +1386,6 @@ also known as US-ASCII.
 .
 .
 .TP
-.B cp1047
-for terminals using the IBM code page 1047 character set and encoding.
-.
-.
-.TP
 .B dvi
 for TeX DVI format.
 .
@@ -1557,7 +1552,6 @@ provides
 .MR grotty @MAN1EXT@
 provides
 .BR ascii ,
-.BR cp1047 ,
 .BR latin1 ,
 and
 .BR utf8 .
@@ -2063,7 +2057,6 @@ are equivalent.
 .
 When paging output for the
 .BR ascii ,
-.BR cp1047 ,
 .BR latin1 ,
 and
 .B utf8
@@ -2078,21 +2071,6 @@ see
 .MR grotty @MAN1EXT@ .
 .
 .
-.P
-On EBCDIC hosts such as OS/390 Unix,
-the output devices
-.B ascii
-and
-.B latin1
-aren't available.
-.
-Conversely,
-the output device
-.B cp1047
-is not available on systems based on the ISO\~646 or ISO\~8859 character
-encoding standards.
-.
-.
 .\" ====================================================================
 .SH "Installation directories"
 .\" ====================================================================
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.1.man
index b8b1a566d..db935dd5b 100644
--- a/src/roff/nroff/nroff.1.man
+++ b/src/roff/nroff/nroff.1.man
@@ -134,9 +134,8 @@ acceptable arguments to the
 option are
 .BR ascii ,
 .BR latin1 ,
-.BR utf8 ,
 and
-.BR cp1047 ;
+.BR utf8 ;
 any others are ignored.
 .
 If neither the
diff --git a/src/utils/grog/grog.1.man b/src/utils/grog/grog.1.man
index 40ca9a8f6..af2cb4240 100644
--- a/src/utils/grog/grog.1.man
+++ b/src/utils/grog/grog.1.man
@@ -191,9 +191,10 @@ compatibility mode and
 .B \-T
 to select a non-default output device.
 .
-If the input is not encoded in US-ASCII,
+If the input is not encoded in
+US-ASCII
+or
 ISO 8859-1,
-or IBM code page 1047,
 specification of a
 .I groff
 option to run the
diff --git a/tmac/groff_mdoc.7.man b/tmac/groff_mdoc.7.man
index e376fa24f..4a65b1b3d 100644
--- a/tmac/groff_mdoc.7.man
+++ b/tmac/groff_mdoc.7.man
@@ -4884,7 +4884,7 @@ String    7-bit   8-bit   UCS     Prefer  Meaning
 .Pp
 Some column headings are shorthand for standardized character encodings;
 \[lq]7-bit\[rq] for ISO 646:1991 IRV (US-ASCII),
-\[lq]8-bit\[rq] for ISO 8859-1 (Latin-1) and IBM code page 1047,
+\[lq]8-bit\[rq] for ISO 8859-1 (Latin-1),
 and
 \[lq]UCS\[rq] for ISO 10646 (Unicode character set).
 .

_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to