gbranden pushed a commit to branch master
in repository groff.
commit d5439846a857f95859bd49a36a950dc5848298f0
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Sep 10 00:55:54 2024 -0500
[troff]: Boolify `ejecting_page`.
* src/roff/troff/div.h (class top_level_diversion): Boolify member
variable `ejecting_page`, migrating trivial accessor and mutator.
* src/roff/troff/div.cpp (top_level_diversion::top_level_diversion):
Migrate constructor.
(top_level_diversion::begin_page): Migrate.
---
ChangeLog | 9 +++++++++
src/roff/troff/div.cpp | 4 ++--
src/roff/troff/div.h | 6 +++---
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e393d9f35..db78e4257 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-09-10 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/div.h (class top_level_diversion): Boolify
+ member variable `ejecting_page`, migrating trivial accessor and
+ mutator.
+ * src/roff/troff/div.cpp
+ (top_level_diversion::top_level_diversion): Migrate constructor.
+ (top_level_diversion::begin_page): Migrate.
+
2024-09-10 G. Branden Robinson <[email protected]>
* src/roff/troff/div.h (class top_level_diversion): Boolify and
diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp
index 38e39652e..45fb8f7f1 100644
--- a/src/roff/troff/div.cpp
+++ b/src/roff/troff/div.cpp
@@ -364,7 +364,7 @@ top_level_diversion::top_level_diversion()
page_length(units_per_inch*11),
prev_page_offset(units_per_inch), page_offset(units_per_inch),
page_trap_list(0 /* nullptr */), overriding_next_page_number(false),
- ejecting_page(0), before_first_page(1)
+ ejecting_page(false), before_first_page(1)
{
}
@@ -667,7 +667,7 @@ bool top_level_diversion::begin_page(vunits n)
trap *next_trap = find_next_trap(&next_trap_pos);
vertical_position = V0;
high_water_mark = V0;
- ejecting_page = 0;
+ ejecting_page = false;
// If before_first_page was 2, then the top of page transition was
// undone using eg .nr nl 0-1. See nl_reg::set_value.
if (before_first_page != 2)
diff --git a/src/roff/troff/div.h b/src/roff/troff/div.h
index 72c3a8115..daef2c0bf 100644
--- a/src/roff/troff/div.h
+++ b/src/roff/troff/div.h
@@ -111,7 +111,7 @@ class top_level_diversion : public diversion {
trap *find_next_trap(vunits *);
bool overriding_next_page_number;
int next_page_number;
- int ejecting_page; // Is the current page being ejected?
+ bool ejecting_page;
public:
int before_first_page;
top_level_diversion();
@@ -140,8 +140,8 @@ public:
void set_next_page_number(int);
void set_page_length(vunits);
void copy_file(const char *filename);
- int get_ejecting() { return ejecting_page; }
- void set_ejecting() { ejecting_page = 1; }
+ bool get_ejecting() { return ejecting_page; }
+ void set_ejecting() { ejecting_page = true; }
friend void page_offset();
void set_diversion_trap(symbol, vunits);
void clear_diversion_trap();
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
