gbranden pushed a commit to branch master
in repository groff.
commit 4c893b80c3e7b5e737c2f89bbb7543de97b56c94
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Aug 19 17:39:30 2024 -0500
tmac/*: Drop "cp1047" output device support.
* tmac/fallbacks.tmac:
* tmac/troffrc:
* tmac/tty.tmac: Drop "cp1047" output device support.
Continues fixing <https://savannah.gnu.org/bugs/?65724>.
---
ChangeLog | 8 ++++++++
src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh | 2 --
tmac/fallbacks.tmac | 1 -
tmac/troffrc | 2 --
tmac/tty-char.tmac | 6 ++----
tmac/tty.tmac | 8 ++------
6 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c110c29f9..e0063800a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-08-19 G. Branden Robinson <[email protected]>
+
+ * tmac/fallbacks.tmac:
+ * tmac/troffrc:
+ * tmac/tty.tmac: Drop "cp1047" output device support.
+
+ Continues fixing <https://savannah.gnu.org/bugs/?65724>.
+
2024-08-19 G. Branden Robinson <[email protected]>
* m4/groff.m4 (GROFF_EBCDIC, GROFF_OS390): Drop macros.
diff --git a/src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh
b/src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh
index f36105bde..f8c37065f 100755
--- a/src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh
+++ b/src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh
@@ -114,8 +114,6 @@ x trailer
V2640
x stop'
-# TODO: Test cp1047 when we have access to a host environment using it.
-
for D in ascii latin1 utf8
do
if [ "$D" = "utf8" ]
diff --git a/tmac/fallbacks.tmac b/tmac/fallbacks.tmac
index 8c9738d78..ae718a107 100644
--- a/tmac/fallbacks.tmac
+++ b/tmac/fallbacks.tmac
@@ -12,7 +12,6 @@
.\" expressions 'n' and 't' are not reliable. Define ersatz substitute.
.nr fallbacks*troff-mode 1
.if '\?\*[.T]\?'\?ascii\?' .nr fallbacks*troff-mode 0
-.if '\?\*[.T]\?'\?cp1047\?' .nr fallbacks*troff-mode 0
.if '\?\*[.T]\?'\?latin1\?' .nr fallbacks*troff-mode 0
.if '\?\*[.T]\?'\?utf8\?' .nr fallbacks*troff-mode 0
.
diff --git a/tmac/troffrc b/tmac/troffrc
index fe1fee19f..ca73b977f 100644
--- a/tmac/troffrc
+++ b/tmac/troffrc
@@ -35,7 +35,6 @@
.do ds troffrc!ascii tty.tmac
.do ds troffrc!latin1 tty.tmac
.do ds troffrc!utf8 tty.tmac
-.do ds troffrc!cp1047 tty.tmac
.do ds troffrc!lj4 lj4.tmac
.do ds troffrc!lbp lbp.tmac
.do ds troffrc!html html.tmac
@@ -52,7 +51,6 @@ troffrc!X100-12 \
troffrc!ascii \
troffrc!latin1 \
troffrc!utf8 \
-troffrc!cp1047 \
troffrc!lj4 \
troffrc!lbp \
troffrc!html
diff --git a/tmac/tty-char.tmac b/tmac/tty-char.tmac
index f1443c924..3824657fb 100644
--- a/tmac/tty-char.tmac
+++ b/tmac/tty-char.tmac
@@ -1,7 +1,5 @@
-.\" tty-char.tmac
-.\"
-.\" This file defines standard troff characters and some groff
-.\" characters for use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
+.\" Define AT&T troff characters and some groff characters for use
+.\" with the "ascii", "latin1", and "utf8" output devices.
.\"
.\" These definitions are chosen so that, as far as possible, they:
.\" - work with all of -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
diff --git a/tmac/tty.tmac b/tmac/tty.tmac
index 226939230..5a0574fa6 100644
--- a/tmac/tty.tmac
+++ b/tmac/tty.tmac
@@ -1,4 +1,4 @@
-.\" tty.tmac
+.\" Configure grotty(1) output devices: "ascii", "latin1", and "utf8".
.\"
.do nr *groff_tty_tmac_C \n[.cp]
.cp 0
@@ -76,11 +76,7 @@
.defcolor cyan rgb #00ffff
.defcolor white rgb #ffffff
.
-.ie '\*(.T'cp1047' \
-. mso cp1047.tmac
-.el \
-. if !'\*(.T'ascii' \
-. mso latin1.tmac
+.if !'\*(.T'ascii' .mso latin1.tmac
.
.\" If you want the character definitions in tty-char.tmac to be loaded
.\" automatically, remove the '\"' from the next line.
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
