gbranden pushed a commit to branch master
in repository groff.
commit 7bcc781d4e9869e2d10532206cefe535d9222c49
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Apr 26 23:16:18 2024 -0500
[troff]: Boolify env.cpp (7/25).
[troff]: Boolify more `environment` class member variables, member
function parameters, and local variables.
* src/roff/troff/env.h (class environment):
* src/roff/troff/env.cpp (environment::space_newline)
(environment::space, environment::environment, environment::copy)
(environment::print_env):
- Rename member variable `spread_flag` to `spreading` and demote it
from `int` to `bool`.
- Assign Boolean literals to it.
---
ChangeLog | 8 ++++++++
src/roff/troff/env.cpp | 16 ++++++++--------
src/roff/troff/env.h | 4 ++--
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f7a66aad9..aa6a8b722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,14 @@
- Rename `widow_control` to `want_widow_control` and demote it
from `int` to `bool`.
+ * src/roff/troff/env.h (class environment):
+ * src/roff/troff/env.cpp (environment::space_newline)
+ (environment::space, environment::environment)
+ (environment::copy, environment::print_env):
+ - Rename member variable `spread_flag` to `spreading` and demote
+ it from `int` to `bool`.
+ - Assign Boolean literals to it.
+
2024-04-24 G. Branden Robinson <[email protected]>
* src/roff/troff/env.cpp (tab_stops::to_string)
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index ec4af3093..5e9cbb301 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -482,8 +482,8 @@ void environment::space_newline()
return;
}
add_node(new word_space_node(x, get_fill_color(), w));
- possibly_break_line(0, spread_flag);
- spread_flag = 0;
+ possibly_break_line(0, spreading);
+ spreading = false;
}
void environment::space()
@@ -518,8 +518,8 @@ void environment::space(hunits space_width, hunits
sentence_space_width)
get_fill_color(),
new width_list(space_width,
sentence_space_width)));
- possibly_break_line(0, spread_flag);
- spread_flag = 0;
+ possibly_break_line(0, spreading);
+ spreading = false;
}
static node *do_underline_special(bool do_underline_spaces)
@@ -729,7 +729,7 @@ environment::environment(symbol nm)
leader_char(charset_table['.']),
current_field(0),
discarding(false),
- spread_flag(0),
+ spreading(false),
margin_character_flags(0),
margin_character_node(0),
margin_character_distance(points_to_units(10)),
@@ -823,7 +823,7 @@ environment::environment(const environment *e)
leader_char(e->leader_char),
current_field(0),
discarding(false),
- spread_flag(0),
+ spreading(false),
margin_character_flags(e->margin_character_flags),
margin_character_node(e->margin_character_node),
margin_character_distance(e->margin_character_distance),
@@ -900,7 +900,7 @@ void environment::copy(const environment *e)
control_character = e->control_character;
no_break_control_character = e->no_break_control_character;
hyphen_indicator_char = e->hyphen_indicator_char;
- spread_flag = 0;
+ spreading = false;
line = 0;
pending_lines = 0;
discarding = false;
@@ -3446,7 +3446,7 @@ void environment::print_env()
errprint(" input line start: %1u\n", input_line_start.to_units());
errprint(" line tabs: %1\n", line_tabs ? "yes" : "no");
errprint(" discarding: %1\n", discarding ? "yes" : "no");
- errprint(" spread flag set: %1\n", spread_flag ? "yes" : "no"); // \p
+ errprint(" spread flag set: %1\n", spreading ? "yes" : "no"); // \p
if (margin_character_node) {
errprint(" margin character flags: %1\n",
margin_character_flags == MARGIN_CHARACTER_ON
diff --git a/src/roff/troff/env.h b/src/roff/troff/env.h
index f599fe881..41394c8bd 100644
--- a/src/roff/troff/env.h
+++ b/src/roff/troff/env.h
@@ -201,7 +201,7 @@ class environment {
int tab_field_spaces;
int tab_precedes_field;
bool discarding;
- int spread_flag; // set by \p
+ bool spreading; // set by \p
unsigned margin_character_flags;
node *margin_character_node;
hunits margin_character_distance;
@@ -342,7 +342,7 @@ public:
void set_char_slant(int);
void set_input_line_position(hunits); // used by \n(hp
void interrupt();
- void spread() { spread_flag = 1; }
+ void spread() { spreading = true; }
void possibly_break_line(int start_here = 0, int forced = 0);
void do_break(bool /* want_adjustment */ = false); // .br, .brp
void final_break();
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
