gbranden pushed a commit to branch master
in repository groff.
commit ca4efeded3ba3c1152e18d9ed5790f175f7e45bc
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Apr 13 09:39:25 2026 -0500
[libgroff]: Trivially refactor.
Rename library's `concat()` function to `catenate()`.
* src/include/symbol.h: Rename in declaration.
* src/libs/libgroff/symbol.cpp (concat): Rename this...
(catenate): ...to this.
* src/roff/troff/node.cpp (get_font_name, is_abstract_style)
(font_family::resolve): Update call sites.
---
ChangeLog | 11 +++++++++++
src/include/symbol.h | 2 +-
src/libs/libgroff/symbol.cpp | 2 +-
src/roff/troff/node.cpp | 6 +++---
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 806eae22a..5ce44a89f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2026-04-13 G. Branden Robinson <[email protected]>
+
+ [libgroff]: Trivially refactor. Rename library's `concat()`
+ function to `catenate()`.
+
+ * src/include/symbol.h: Rename in declaration.
+ * src/libs/libgroff/symbol.cpp (concat): Rename this...
+ (catenate): ...to this.
+ * src/roff/troff/node.cpp (get_font_name, is_abstract_style)
+ (font_family::resolve): Update call sites.
+
2026-04-13 G. Branden Robinson <[email protected]>
* src/libs/libgroff/font.cpp (font::load_font, font::load):
diff --git a/src/include/symbol.h b/src/include/symbol.h
index be19c58f7..76936a42c 100644
--- a/src/include/symbol.h
+++ b/src/include/symbol.h
@@ -89,7 +89,7 @@ inline bool symbol::is_empty() const
return ((s != 0 /* nullptr */) && (0 /* nullptr */ == *s));
}
-symbol concat(symbol, symbol);
+symbol catenate(symbol, symbol);
extern symbol default_symbol;
diff --git a/src/libs/libgroff/symbol.cpp b/src/libs/libgroff/symbol.cpp
index 54f165837..4a4e7f40c 100644
--- a/src/libs/libgroff/symbol.cpp
+++ b/src/libs/libgroff/symbol.cpp
@@ -159,7 +159,7 @@ symbol::symbol(const char *p, int how)
}
}
-symbol concat(symbol s1, symbol s2)
+symbol catenate(symbol s1, symbol s2)
{
char *buf = new char [strlen(s1.contents())
+ strlen(s2.contents())
diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp
index f505e6fd9..94ca10915 100644
--- a/src/roff/troff/node.cpp
+++ b/src/roff/troff/node.cpp
@@ -477,7 +477,7 @@ symbol get_font_name(int fontno, environment *env)
{
symbol f = font_table[fontno]->get_name();
if (font_table[fontno]->is_style()) {
- return concat(env->get_family()->nm, f);
+ return catenate(env->get_family()->nm, f);
}
return f;
}
@@ -6753,7 +6753,7 @@ bool is_abstract_style(symbol s)
bool is_font_available(symbol fam, symbol name)
{
if (is_abstract_style(name))
- name = concat(fam, name);
+ name = catenate(fam, name); // Resolve the font name.
return assign_font_and_file_name_to_mounting_position(name,
name /* ignored */, 0 /* ignored */, true /* validate_only */);
}
@@ -6901,7 +6901,7 @@ int font_family::resolve(int mounting_position)
if (!(font_table[pos]->is_style()))
return map[pos] = pos;
symbol sty = font_table[pos]->get_name();
- symbol f = concat(nm, sty);
+ symbol f = catenate(nm, sty);
int n;
// Don't use symbol_fontno, because that might return a style and
// because we don't want to translate the name.
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
