gbranden pushed a commit to branch master
in repository groff.
commit 5a4e3f2f55753aa2b46d54f4ba78f4bcc6f759f1
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Oct 6 05:56:59 2025 -0500
Reform terminology: hyphenation "flags" -> "mode".
The latter usage is already strongly preponderant.
* src/roff/troff/TODO:
* tmac/cs.tmac:
* tmac/de.tmac:
* tmac/es.tmac:
* tmac/fr.tmac:
* tmac/it.tmac:
* tmac/ru.tmac:
* tmac/sv.tmac: Do it.
* src/roff/troff/env.cpp (hyphenate_request): Update diagnostic
messages, and recast where necessary.
---
ChangeLog | 17 +++++++++++++++++
src/roff/troff/TODO | 2 +-
src/roff/troff/env.cpp | 10 +++++-----
tmac/cs.tmac | 2 +-
tmac/de.tmac | 2 +-
tmac/es.tmac | 2 +-
tmac/fr.tmac | 2 +-
tmac/it.tmac | 2 +-
tmac/ru.tmac | 2 +-
tmac/sv.tmac | 2 +-
10 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0b33f8f99..53d18279c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2025-10-06 G. Branden Robinson <[email protected]>
+
+ Reform terminology ("hyphenation flags" -> "hyphenation mode").
+ The latter usage is already strongly preponderant.
+
+ * src/roff/troff/TODO:
+ * tmac/cs.tmac:
+ * tmac/de.tmac:
+ * tmac/es.tmac:
+ * tmac/fr.tmac:
+ * tmac/it.tmac:
+ * tmac/ru.tmac:
+ * tmac/sv.tmac: Do it.
+
+ * src/roff/troff/env.cpp (hyphenate_request): Update diagnostic
+ messages, and recast where necessary.
+
2025-10-06 G. Branden Robinson <[email protected]>
[man]: Test and document `TP` interaction with `MT`/`ME` and
diff --git a/src/roff/troff/TODO b/src/roff/troff/TODO
index 56ba0d204..c0cfc27cf 100644
--- a/src/roff/troff/TODO
+++ b/src/roff/troff/TODO
@@ -78,7 +78,7 @@ R.display and then R. Probably necessary to be able to
specify a
separate unitwidth for each sizesuffix (e.g., uuu for X).
Make it possible to suppress hyphenation on a word-by-word basis.
-(Perhaps store hyphenation flags in tfont.)
+(Perhaps store hyphenation mode in tfont.)
Possibly allow multiple simultaneous input line traps.
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index 43fe62bb6..7055f27ee 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -1777,15 +1777,15 @@ void hyphenate_request()
int n;
if (has_arg() && get_integer(&n)) {
if (n < HYPHEN_NONE) {
- warning(WARN_RANGE, "ignoring negative hyphenation flags: %1", n);
+ warning(WARN_RANGE, "ignoring negative hyphenation mode: %1", n);
} else if (n > HYPHEN_MAX) {
- warning(WARN_RANGE, "hyphenation flags must be in range 0..%1,"
- " got %2", HYPHEN_MAX, n);
+ warning(WARN_RANGE, "hyphenation mode must be in range 0..%1, got"
+ " %2", HYPHEN_MAX, n);
} else if (((n & HYPHEN_DEFAULT) && (n & ~HYPHEN_DEFAULT))
|| ((n & HYPHEN_FIRST_CHAR) && (n & HYPHEN_NOT_FIRST_CHARS))
|| ((n & HYPHEN_LAST_CHAR) && (n & HYPHEN_NOT_LAST_CHARS)))
- warning(WARN_SYNTAX, "ignoring contradictory hyphenation flags: "
- "%1", n);
+ warning(WARN_SYNTAX, "ignoring self-contradictory hyphenation"
+ " mode: %1", n);
else
curenv->hyphenation_mode = n;
}
diff --git a/tmac/cs.tmac b/tmac/cs.tmac
index aaf233418..863891a59 100644
--- a/tmac/cs.tmac
+++ b/tmac/cs.tmac
@@ -126,7 +126,7 @@
.if r GS \{\
. \" update the date
. ds DY \n[dy] \*[MO] \n[year]
-. \" set hyphenation flags
+. \" set hyphenation mode
. nr HY 2
.\}
.
diff --git a/tmac/de.tmac b/tmac/de.tmac
index 9f20bf684..e015922dc 100644
--- a/tmac/de.tmac
+++ b/tmac/de.tmac
@@ -126,7 +126,7 @@
.if r GS \{\
. \" update the date
. ds DY \n[dy].\~\*[MO] \n[year]
-. \" set hyphenation flags
+. \" set hyphenation mode
. nr HY 2
.\}
.
diff --git a/tmac/es.tmac b/tmac/es.tmac
index 7b3cf5e36..0b1338d97 100644
--- a/tmac/es.tmac
+++ b/tmac/es.tmac
@@ -126,7 +126,7 @@
.if r GS \{\
. \" update the date
. ds DY \n[dy] de \*[MO] de \n[year]
-. \" set hyphenation flags
+. \" set hyphenation mode
. nr HY 6
.\}
.
diff --git a/tmac/fr.tmac b/tmac/fr.tmac
index fc63e89ec..f699b3c38 100644
--- a/tmac/fr.tmac
+++ b/tmac/fr.tmac
@@ -126,7 +126,7 @@
.if r GS \{\
. \" update the date
. ds DY \n[dy] \*[MO] \n[year]
-. \" set hyphenation flags
+. \" set hyphenation mode
. nr HY 6
.\}
.
diff --git a/tmac/it.tmac b/tmac/it.tmac
index f4bdfea3c..44f913f95 100644
--- a/tmac/it.tmac
+++ b/tmac/it.tmac
@@ -126,7 +126,7 @@
.if r GS \{\
. \" update the date
. ds DY \n[dy] \*[MO] \n[year]
-. \" set hyphenation flags
+. \" set hyphenation mode
. nr HY 2
.\}
.
diff --git a/tmac/ru.tmac b/tmac/ru.tmac
index f96c9a187..3718545a4 100644
--- a/tmac/ru.tmac
+++ b/tmac/ru.tmac
@@ -126,7 +126,7 @@
.if r GS \{\
. \" update the date
. ds DY \n[dy] \*[MO] \n[year]
-. \" set hyphenation flags
+. \" set hyphenation mode
. nr HY 8
.\}
.
diff --git a/tmac/sv.tmac b/tmac/sv.tmac
index 49a7fcfc1..7c047a306 100644
--- a/tmac/sv.tmac
+++ b/tmac/sv.tmac
@@ -126,7 +126,7 @@
.if r GS \{\
. \" update the date
. ds DY \n[dy] \*[MO] \n[year]
-. \" set hyphenation flags
+. \" set hyphenation mode
. nr HY 34
.\}
.
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
