gbranden pushed a commit to branch master
in repository groff.
commit 9b5948fc051b44f29fcd8ab1fedda54213d5f31d
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Tue Sep 10 00:46:50 2024 -0500
[troff]: Trivially refactor.
* src/roff/troff/div.h (class top_level_diversion): Boolify and rename
member variable: `have_next_page_number` ->
`overriding_next_page_number`.
* src/roff/troff/div.cpp (top_level_diversion::begin_page)
(top_level_diversion::set_next_page_number)
(top_level_diversion::get_next_page_number): Migrate.
---
ChangeLog | 9 +++++++++
src/roff/troff/div.cpp | 13 +++++++------
src/roff/troff/div.h | 2 +-
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2adc9e173..e393d9f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-09-10 G. Branden Robinson <g.branden.robin...@gmail.com>
+
+ * src/roff/troff/div.h (class top_level_diversion): Boolify and
+ rename member variable: `have_next_page_number` ->
+ `overriding_next_page_number`.
+ * src/roff/troff/div.cpp (top_level_diversion::begin_page)
+ (top_level_diversion::set_next_page_number)
+ (top_level_diversion::get_next_page_number): Migrate.
+
2024-09-10 G. Branden Robinson <g.branden.robin...@gmail.com>
* src/roff/troff/div.h (class diversion, class macro_diversion)
diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp
index 970259b59..38e39652e 100644
--- a/src/roff/troff/div.cpp
+++ b/src/roff/troff/div.cpp
@@ -363,7 +363,7 @@ top_level_diversion::top_level_diversion()
: page_number(0), page_count(0), last_page_count(-1),
page_length(units_per_inch*11),
prev_page_offset(units_per_inch), page_offset(units_per_inch),
- page_trap_list(0 /* nullptr */), have_next_page_number(0),
+ page_trap_list(0 /* nullptr */), overriding_next_page_number(false),
ejecting_page(0), before_first_page(1)
{
}
@@ -653,9 +653,9 @@ bool top_level_diversion::begin_page(vunits n)
if (0 /* nullptr */ == the_output)
init_output();
++page_count;
- if (have_next_page_number) {
+ if (overriding_next_page_number) {
page_number = next_page_number;
- have_next_page_number = 0;
+ overriding_next_page_number = false;
}
else if (before_first_page == 1)
page_number = 1;
@@ -701,13 +701,14 @@ void continue_page_eject()
void top_level_diversion::set_next_page_number(int n)
{
- next_page_number= n;
- have_next_page_number = 1;
+ next_page_number = n;
+ overriding_next_page_number = true;
}
int top_level_diversion::get_next_page_number()
{
- return have_next_page_number ? next_page_number : page_number + 1;
+ return overriding_next_page_number ? next_page_number
+ : (page_number + 1);
}
void top_level_diversion::set_page_length(vunits n)
diff --git a/src/roff/troff/div.h b/src/roff/troff/div.h
index 0146b4105..72c3a8115 100644
--- a/src/roff/troff/div.h
+++ b/src/roff/troff/div.h
@@ -109,7 +109,7 @@ class top_level_diversion : public diversion {
hunits page_offset;
trap *page_trap_list;
trap *find_next_trap(vunits *);
- int have_next_page_number;
+ bool overriding_next_page_number;
int next_page_number;
int ejecting_page; // Is the current page being ejected?
public:
_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit
