gbranden pushed a commit to branch master
in repository groff.
commit 5eb73a1e883b098ecb3d4912d6143245467f011b
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Nov 21 22:54:43 2025 -0600
[troff]: Give node types human-readable names.
Give node types self-reported type information human-readable names.
That is, use English noun phrases for them instead of C++ identifiers.
* src/roff/troff/column.cpp (vjustify_node::type) [0]:
* src/roff/troff/input.cpp (non_interpreted_char_node)
(token_node, non_interpreted_node):
* src/roff/troff/node.cpp (hyphen_inhibitor_node)
(device_extension_node, suppress_node, tag_node, draw_node)
(extra_size_node, vertical_size_node, hmotion_node)
(space_char_hmotion_node, vmotion_node, hline_node, vline_node)
(dummy_node, transparent_dummy_node, zero_width_node)
(italic_corrected_node, left_italic_corrected_node)
(overstrike_node, bracket_node, composite_node, glyph_node)
(ligature_node, kern_pair_node, dbreak_node, break_char_node)
(line_start_node, space_node, word_space_node)
(unbreakable_space_node, diverted_space_node)
(diverted_copy_file_node): Do it.
---
ChangeLog | 21 ++++++++++++++++
src/roff/troff/column.cpp | 2 +-
src/roff/troff/input.cpp | 6 ++---
src/roff/troff/node.cpp | 62 +++++++++++++++++++++++------------------------
4 files changed, 56 insertions(+), 35 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 64303feeb..fdde7050a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2025-11-21 G. Branden Robinson <[email protected]>
+
+ [troff]: Give node types self-reported type information
+ human-readable names. That is, use English noun phrases for
+ them instead of C++ identifiers.
+
+ * src/roff/troff/column.cpp (vjustify_node::type) [0]:
+ * src/roff/troff/input.cpp (non_interpreted_char_node)
+ (token_node, non_interpreted_node):
+ * src/roff/troff/node.cpp (hyphen_inhibitor_node)
+ (device_extension_node, suppress_node, tag_node, draw_node)
+ (extra_size_node, vertical_size_node, hmotion_node)
+ (space_char_hmotion_node, vmotion_node, hline_node, vline_node)
+ (dummy_node, transparent_dummy_node, zero_width_node)
+ (italic_corrected_node, left_italic_corrected_node)
+ (overstrike_node, bracket_node, composite_node, glyph_node)
+ (ligature_node, kern_pair_node, dbreak_node, break_char_node)
+ (line_start_node, space_node, word_space_node)
+ (unbreakable_space_node, diverted_space_node)
+ (diverted_copy_file_node): Do it.
+
2025-11-20 G. Branden Robinson <[email protected]>
* src/roff/troff/node.cpp (remove_font_specific_character): Add
diff --git a/src/roff/troff/column.cpp b/src/roff/troff/column.cpp
index 218da92cd..20bd4265a 100644
--- a/src/roff/troff/column.cpp
+++ b/src/roff/troff/column.cpp
@@ -669,7 +669,7 @@ node *vjustify_node::copy()
const char *vjustify_node::type()
{
- return "vjustify_node";
+ return "vertical justification node";
}
int vjustify_node::same(node *nd)
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 064b9672f..05a0bb08a 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -1304,7 +1304,7 @@ bool non_interpreted_char_node::is_same_as(node *nd)
const char *non_interpreted_char_node::type()
{
- return "non_interpreted_char_node";
+ return "non-interpreted character node";
}
bool non_interpreted_char_node::causes_tprint()
@@ -1964,7 +1964,7 @@ bool token_node::is_same_as(node *nd)
const char *token_node::type()
{
- return "token_node";
+ return "token node";
}
bool token_node::causes_tprint()
@@ -6320,7 +6320,7 @@ bool non_interpreted_node::is_same_as(node *nd)
const char *non_interpreted_node::type()
{
- return "non_interpreted_node";
+ return "non-interpreted node";
}
bool non_interpreted_node::causes_tprint()
diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp
index 9e4540d48..16766cd2d 100644
--- a/src/roff/troff/node.cpp
+++ b/src/roff/troff/node.cpp
@@ -2630,7 +2630,7 @@ bool hyphen_inhibitor_node::is_same_as(node *)
const char *hyphen_inhibitor_node::type()
{
- return "hyphen_inhibitor_node";
+ return "hyphenation inhibitor node";
}
hyphenation_type hyphen_inhibitor_node::get_hyphenation_type()
@@ -4402,7 +4402,7 @@ bool device_extension_node::is_same_as(node *n)
const char *device_extension_node::type()
{
- return "device_extension_node";
+ return "device extension command node";
}
int device_extension_node::ends_sentence()
@@ -4507,7 +4507,7 @@ bool suppress_node::is_same_as(node *n)
const char *suppress_node::type()
{
- return "suppress_node";
+ return "suppressed output node";
}
node *suppress_node::copy()
@@ -4565,7 +4565,7 @@ bool tag_node::is_same_as(node *nd)
const char *tag_node::type()
{
- return "tag_node";
+ return "tag node";
}
bool tag_node::causes_tprint()
@@ -5144,7 +5144,7 @@ bool draw_node::is_same_as(node *n)
const char *draw_node::type()
{
- return "draw_node";
+ return "drawing command node";
}
bool draw_node::causes_tprint()
@@ -5811,7 +5811,7 @@ bool extra_size_node::is_same_as(node *nd)
const char *extra_size_node::type()
{
- return "extra_size_node";
+ return "extra vertical spacing node";
}
bool extra_size_node::causes_tprint()
@@ -5831,7 +5831,7 @@ bool vertical_size_node::is_same_as(node *nd)
const char *vertical_size_node::type()
{
- return "vertical_size_node";
+ return "vertical spacing node";
}
bool vertical_size_node::set_unformat_flag()
@@ -5857,7 +5857,7 @@ bool hmotion_node::is_same_as(node *nd)
const char *hmotion_node::type()
{
- return "hmotion_node";
+ return "horizontal motion node";
}
bool hmotion_node::set_unformat_flag()
@@ -5898,7 +5898,7 @@ bool space_char_hmotion_node::is_same_as(node *nd)
const char *space_char_hmotion_node::type()
{
- return "space_char_hmotion_node";
+ return "space character horizontal motion node";
}
bool space_char_hmotion_node::causes_tprint()
@@ -5934,7 +5934,7 @@ bool vmotion_node::is_same_as(node *nd)
const char *vmotion_node::type()
{
- return "vmotion_node";
+ return "vertical motion node";
}
bool vmotion_node::causes_tprint()
@@ -5955,7 +5955,7 @@ bool hline_node::is_same_as(node *nd)
const char *hline_node::type()
{
- return "hline_node";
+ return "horizontal rule node";
}
bool hline_node::causes_tprint()
@@ -5976,7 +5976,7 @@ bool vline_node::is_same_as(node *nd)
const char *vline_node::type()
{
- return "vline_node";
+ return "vertical rule node";
}
bool vline_node::causes_tprint()
@@ -5996,7 +5996,7 @@ bool dummy_node::is_same_as(node *)
const char *dummy_node::type()
{
- return "dummy_node";
+ return "dummy node";
}
bool dummy_node::causes_tprint()
@@ -6016,7 +6016,7 @@ bool transparent_dummy_node::is_same_as(node *)
const char *transparent_dummy_node::type()
{
- return "transparent_dummy_node";
+ return "transparent dummy node";
}
bool transparent_dummy_node::causes_tprint()
@@ -6041,7 +6041,7 @@ bool zero_width_node::is_same_as(node *nd)
const char *zero_width_node::type()
{
- return "zero_width_node";
+ return "zero-width output node";
}
bool zero_width_node::causes_tprint()
@@ -6063,7 +6063,7 @@ bool italic_corrected_node::is_same_as(node *nd)
const char *italic_corrected_node::type()
{
- return "italic_corrected_node";
+ return "italic-corrected node";
}
bool italic_corrected_node::causes_tprint()
@@ -6137,7 +6137,7 @@ void left_italic_corrected_node::tprint(troff_output_file
*out)
const char *left_italic_corrected_node::type()
{
- return "left_italic_corrected_node";
+ return "left italic-corrected node";
}
bool left_italic_corrected_node::causes_tprint()
@@ -6264,7 +6264,7 @@ bool overstrike_node::is_same_as(node *nd)
const char *overstrike_node::type()
{
- return "overstrike_node";
+ return "overstricken node";
}
bool overstrike_node::causes_tprint()
@@ -6298,7 +6298,7 @@ bool bracket_node::is_same_as(node *nd)
const char *bracket_node::type()
{
- return "bracket_node";
+ return "bracket-building node";
}
bool bracket_node::causes_tprint()
@@ -6320,7 +6320,7 @@ bool composite_node::is_same_as(node *nd)
const char *composite_node::type()
{
- return "composite_node";
+ return "composite node"; // XXX: composite WHAT? (character macro?)
}
bool composite_node::causes_tprint()
@@ -6343,7 +6343,7 @@ bool glyph_node::is_same_as(node *nd)
const char *glyph_node::type()
{
- return "glyph_node";
+ return "glyph node";
}
bool glyph_node::causes_tprint()
@@ -6365,7 +6365,7 @@ bool ligature_node::is_same_as(node *nd)
const char *ligature_node::type()
{
- return "ligature_node";
+ return "ligature node";
}
bool ligature_node::causes_tprint()
@@ -6387,7 +6387,7 @@ bool kern_pair_node::is_same_as(node *nd)
const char *kern_pair_node::type()
{
- return "kern_pair_node";
+ return "kerned character pair node";
}
bool kern_pair_node::causes_tprint()
@@ -6409,7 +6409,7 @@ bool dbreak_node::is_same_as(node *nd)
const char *dbreak_node::type()
{
- return "dbreak_node";
+ return "discretionary breakpoint node";
}
bool dbreak_node::causes_tprint()
@@ -6455,7 +6455,7 @@ bool break_char_node::is_same_as(node *nd)
const char *break_char_node::type()
{
- return "break_char_node";
+ return "breakpoint node";
}
bool break_char_node::causes_tprint()
@@ -6480,7 +6480,7 @@ bool line_start_node::is_same_as(node *)
const char *line_start_node::type()
{
- return "line_start_node";
+ return "output line start node";
}
bool line_start_node::causes_tprint()
@@ -6502,7 +6502,7 @@ bool space_node::is_same_as(node *nd)
const char *space_node::type()
{
- return "space_node";
+ return "space node";
}
bool word_space_node::is_same_as(node *nd)
@@ -6514,7 +6514,7 @@ bool word_space_node::is_same_as(node *nd)
const char *word_space_node::type()
{
- return "word_space_node";
+ return "word space node";
}
bool word_space_node::causes_tprint()
@@ -6551,7 +6551,7 @@ bool unbreakable_space_node::is_same_as(node *nd)
const char *unbreakable_space_node::type()
{
- return "unbreakable_space_node";
+ return "unbreakable space node";
}
node *unbreakable_space_node::add_self(node *nd, hyphen_list **p)
@@ -6576,7 +6576,7 @@ bool diverted_space_node::is_same_as(node *nd)
const char *diverted_space_node::type()
{
- return "diverted_space_node";
+ return "diverted vertical space node";
}
bool diverted_space_node::causes_tprint()
@@ -6596,7 +6596,7 @@ bool diverted_copy_file_node::is_same_as(node *nd)
const char *diverted_copy_file_node::type()
{
- return "diverted_copy_file_node";
+ return "diverted file throughput node";
}
bool diverted_copy_file_node::causes_tprint()
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
