gbranden pushed a commit to branch master
in repository groff.
commit 82e120701ebc633b100ebe44fe9836608f03aa24
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Fri Apr 7 21:46:39 2023 -0500
[eqn]: Trivially refactor (gfont -> gifont).
[eqn]: Trivially refactor, renaming various globals from containing
"gfont" to "gifont", to make it clearer that they deal with the italic
font used by equations.
* src/preproc/eqn/box.cpp (gfont): Rename global char pointer from
this...
(gifont): ...to this.
* src/preproc/eqn/box.cpp (get_gfont, set_gfont):
* src/preproc/eqn/box.h (get_gfont, set_gfont):
* src/preproc/eqn/lex.cpp (do_gfont): Rename functions from these...
* src/preproc/eqn/box.cpp (get_gifont, set_gifont):
* src/preproc/eqn/box.h (gifont, get_gifont, set_gifont):
* src/preproc/eqn/lex.cpp (do_gifont): ...to these.
* src/preproc/eqn/box.cpp (get_gifont, set_gifont): Update global
`gfont` access sites.
* src/preproc/eqn/box.cpp (box::top_level):
* src/preproc/eqn/eqn.ypp (simple):
* src/preproc/eqn/lex.cpp (do_gifont, yylex):
* src/preproc/eqn/main.cpp (main): Update call sites.
* src/preproc/eqn/eqn.ypp:
* src/preproc/eqn/lex.cpp (token_table, yylex): Rename "GFONT" token
type to "GIFONT".
---
ChangeLog | 26 ++++++++++++++++++++++++++
src/preproc/eqn/box.cpp | 16 ++++++++--------
src/preproc/eqn/box.h | 4 ++--
src/preproc/eqn/eqn.ypp | 4 ++--
src/preproc/eqn/lex.cpp | 10 +++++-----
src/preproc/eqn/main.cpp | 2 +-
6 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d4300fb4d..408a4c7ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2023-04-07 G. Branden Robinson <g.branden.robin...@gmail.com>
+
+ [eqn]: Trivially refactor, renaming various globals from
+ containing "gfont" to "gifont", to make it clearer that they
+ deal with the italic font used by equations.
+
+ * src/preproc/eqn/box.cpp (gfont): Rename global char pointer
+ from this...
+ (gifont): ...to this.
+ * src/preproc/eqn/box.cpp (get_gfont, set_gfont):
+ * src/preproc/eqn/box.h (get_gfont, set_gfont):
+ * src/preproc/eqn/lex.cpp (do_gfont): Rename functions from
+ these...
+ * src/preproc/eqn/box.cpp (get_gifont, set_gifont):
+ * src/preproc/eqn/box.h (gifont, get_gifont, set_gifont):
+ * src/preproc/eqn/lex.cpp (do_gifont): ...to these.
+ * src/preproc/eqn/box.cpp (get_gifont, set_gifont): Update
+ global `gfont` access sites.
+ * src/preproc/eqn/box.cpp (box::top_level):
+ * src/preproc/eqn/eqn.ypp (simple):
+ * src/preproc/eqn/lex.cpp (do_gifont, yylex):
+ * src/preproc/eqn/main.cpp (main): Update call sites.
+ * src/preproc/eqn/eqn.ypp:
+ * src/preproc/eqn/lex.cpp (token_table, yylex): Rename "GFONT"
+ token type to "GIFONT".
+
2023-04-07 G. Branden Robinson <g.branden.robin...@gmail.com>
* src/preproc/eqn/main.cpp (main): Prefix generated *roff
diff --git a/src/preproc/eqn/box.cpp b/src/preproc/eqn/box.cpp
index b3395a3fb..933b7bf3b 100644
--- a/src/preproc/eqn/box.cpp
+++ b/src/preproc/eqn/box.cpp
@@ -23,7 +23,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
const char *current_roman_font;
-char *gfont = 0 /* nullptr */;
+char *gifont = 0 /* nullptr */;
char *grfont = 0 /* nullptr */;
char *gbfont = 0 /* nullptr */;
int gsize = 0;
@@ -187,9 +187,9 @@ void set_script_reduction(int n)
script_size_reduction = n;
}
-const char *get_gfont()
+const char *get_gifont()
{
- return gfont ? gfont : "I";
+ return gifont ? gifont : "I";
}
const char *get_grfont()
@@ -202,10 +202,10 @@ const char *get_gbfont()
return gbfont ? gbfont : "B";
}
-void set_gfont(const char *s)
+void set_gifont(const char *s)
{
- delete[] gfont;
- gfont = strsave(s);
+ delete[] gifont;
+ gifont = strsave(s);
}
void set_grfont(const char *s)
@@ -294,7 +294,7 @@ void box::top_level()
printf(".nr " SAVED_FONT_REG " \\n[.f]\n");
printf(".ft\n");
printf(".nr " SAVED_PREV_FONT_REG " \\n[.f]\n");
- printf(".ft %s\n", get_gfont());
+ printf(".ft %s\n", get_gifont());
printf(".nr " SAVED_SIZE_REG " \\n[.ps]\n");
if (gsize > 0) {
char buf[INT_DIGITS + 1];
@@ -334,7 +334,7 @@ void box::top_level()
"\\s'\\En[" SAVED_INLINE_SIZE_REG "]u'"
"\n");
printf(".as1 " LINE_STRING " \\&\\E*[" SAVE_FONT_STRING "]");
- printf("\\f[%s]", get_gfont());
+ printf("\\f[%s]", get_gifont());
printf("\\s'\\En[" SAVED_SIZE_REG "]u'");
current_roman_font = get_grfont();
b->output();
diff --git a/src/preproc/eqn/box.h b/src/preproc/eqn/box.h
index 981b46412..6d1934638 100644
--- a/src/preproc/eqn/box.h
+++ b/src/preproc/eqn/box.h
@@ -256,10 +256,10 @@ box *make_special_box(char *, box *);
void set_space(int);
int set_gsize(const char *);
-void set_gfont(const char *);
+void set_gifont(const char *);
void set_grfont(const char *);
void set_gbfont(const char *);
-const char *get_gfont();
+const char *get_gifont();
const char *get_grfont();
const char *get_gbfont();
void start_string();
diff --git a/src/preproc/eqn/eqn.ypp b/src/preproc/eqn/eqn.ypp
index a22ad593a..d6f8c8b58 100644
--- a/src/preproc/eqn/eqn.ypp
+++ b/src/preproc/eqn/eqn.ypp
@@ -86,7 +86,7 @@ void yyerror(const char *);
/* these are handled in the lexer */
%token SPACE
-%token GFONT
+%token GIFONT
%token GSIZE
%token DEFINE
%token NDEFINE
@@ -236,7 +236,7 @@ simple:
| BOLD simple
{ $$ = new font_box(strsave(get_gbfont()), $2); }
| ITALIC simple
- { $$ = new font_box(strsave(get_gfont()), $2); }
+ { $$ = new font_box(strsave(get_gifont()), $2); }
| FAT simple
{ $$ = new fat_box($2); }
| FONT text simple
diff --git a/src/preproc/eqn/lex.cpp b/src/preproc/eqn/lex.cpp
index e38a486e3..658e5a7bc 100644
--- a/src/preproc/eqn/lex.cpp
+++ b/src/preproc/eqn/lex.cpp
@@ -94,7 +94,7 @@ static struct {
{ "mark", MARK },
{ "lineup", LINEUP },
{ "space", SPACE },
- { "gfont", GFONT },
+ { "gfont", GIFONT },
{ "gsize", GSIZE },
{ "define", DEFINE },
{ "sdefine", SDEFINE },
@@ -1002,7 +1002,7 @@ void do_gsize()
lex_error("invalid size '%1'", token_buffer.contents());
}
-void do_gfont()
+void do_gifont()
{
int t = get_token(2);
if (t != TEXT && t != QUOTED_TEXT) {
@@ -1010,7 +1010,7 @@ void do_gfont()
return;
}
token_buffer += '\0';
- set_gfont(token_buffer.contents());
+ set_gifont(token_buffer.contents());
}
void do_grfont()
@@ -1167,8 +1167,8 @@ int yylex()
case GSIZE:
do_gsize();
break;
- case GFONT:
- do_gfont();
+ case GIFONT:
+ do_gifont();
break;
case GRFONT:
do_grfont();
diff --git a/src/preproc/eqn/main.cpp b/src/preproc/eqn/main.cpp
index 8c9e17eea..324e2b4fb 100644
--- a/src/preproc/eqn/main.cpp
+++ b/src/preproc/eqn/main.cpp
@@ -361,7 +361,7 @@ int main(int argc, char **argv)
}
break;
case 'f':
- set_gfont(optarg);
+ set_gifont(optarg);
break;
case 'T':
device = optarg;
_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit
