gbranden pushed a commit to branch master
in repository groff.
commit 9c55a7f7b46775181cef26922fb16e0a72db032d
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Nov 13 08:28:37 2025 -0600
[troff]: Trivially refactor.
Rename `environment` class's member function `handle_tab()` to
`advance_to_tab_stop()`. Rename its argument from `is_leader` to
`use_leader`.
* src/roff/troff/env.h (class environment):
* src/roff/troff/env.cpp: Do it.
* src/roff/troff/input.cpp (unbreakable_space_node::need_reread)
(token::process): Update call sites.
---
ChangeLog | 11 +++++++++++
src/roff/troff/env.cpp | 4 ++--
src/roff/troff/env.h | 2 +-
src/roff/troff/input.cpp | 6 +++---
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 24a8ba05c..4a3b54ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2025-11-13 G. Branden Robinson <[email protected]>
+
+ [troff]: Trivially refactor. Rename `environment` class's
+ member function `handle_tab()` to `advance_to_tab_stop()`.
+ Rename its argument from `is_leader` to `use_leader`.
+
+ * src/roff/troff/env.h (class environment):
+ * src/roff/troff/env.cpp: Do it.
+ * src/roff/troff/input.cpp (unbreakable_space_node::need_reread)
+ (token::process): Update call sites.
+
2025-11-13 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (unbreakable_space_node::need_reread)
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index 1343a9da6..d1f7fde3f 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -3148,13 +3148,13 @@ node *environment::make_tab_node(hunits d, node *next)
return nd;
}
-void environment::handle_tab(bool is_leader)
+void environment::advance_to_tab_stop(bool use_leader)
{
hunits d;
hunits absolute;
if (current_tab != TAB_NONE)
wrap_up_tab();
- charinfo *ci = is_leader ? leader_char : tab_char;
+ charinfo *ci = use_leader ? leader_char : tab_char;
delete leader_node;
leader_node = ci ? make_char_node(ci) : 0;
tab_type t = distance_to_next_tab(&d, &absolute);
diff --git a/src/roff/troff/env.h b/src/roff/troff/env.h
index 10b4ea624..c919d0b9b 100644
--- a/src/roff/troff/env.h
+++ b/src/roff/troff/env.h
@@ -356,7 +356,7 @@ public:
void final_break();
node *make_tag(const char *name, int i);
void newline();
- void handle_tab(bool /* is_leader */ = false); // do a tab or leader
+ void advance_to_tab_stop(bool /* use_leader */ = false);
void add_node(node *);
void add_char(charinfo *);
void add_hyphen_indicator();
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 89f87a292..70cf510ac 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -3275,7 +3275,7 @@ bool unbreakable_space_node::need_reread(bool *)
bool hmotion_node::need_reread(bool *)
{
if (unformat && was_tab) {
- curenv->handle_tab();
+ curenv->advance_to_tab_stop();
unformat = 0;
return true;
}
@@ -8775,7 +8775,7 @@ void token::process()
curenv->add_italic_correction();
break;
case TOKEN_LEADER:
- curenv->handle_tab(true /* is_leader */);
+ curenv->advance_to_tab_stop(true /* use_leader */);
break;
case TOKEN_LEFT_BRACE:
break;
@@ -8816,7 +8816,7 @@ void token::process()
curenv->get_fill_color()));
break;
case TOKEN_TAB:
- curenv->handle_tab();
+ curenv->advance_to_tab_stop();
break;
case TOKEN_TRANSPARENT:
break;
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
