gbranden pushed a commit to branch master
in repository groff.
commit e6378e1fdc989e4d958bfbd8c93455dc10b6f0fb
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Nov 28 18:52:14 2023 -0600
src/roff/troff/input.cpp: Update indentation.
...per previous commit.
---
src/roff/troff/input.cpp | 62 ++++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 8a92553e2..ab1a63ef7 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -4120,42 +4120,42 @@ void composite_request()
skip_line();
return;
}
- const char *from_gn = glyph_name_to_unicode(from.contents());
+ const char *from_gn = glyph_name_to_unicode(from.contents());
+ if (!from_gn) {
+ from_gn = check_unicode_name(from.contents());
if (!from_gn) {
- from_gn = check_unicode_name(from.contents());
- if (!from_gn) {
- error("invalid composite glyph name '%1'", from.contents());
- skip_line();
- return;
- }
+ error("invalid composite glyph name '%1'", from.contents());
+ skip_line();
+ return;
}
- const char *from_decomposed = decompose_unicode(from_gn);
- if (from_decomposed)
- from_gn = &from_decomposed[1];
- symbol to = get_name();
- if (to.is_null()) {
- composite_dictionary.remove(symbol(from_gn));
- warning(WARN_MISSING, "composite character request expects two"
- " arguments");
+ }
+ const char *from_decomposed = decompose_unicode(from_gn);
+ if (from_decomposed)
+ from_gn = &from_decomposed[1];
+ symbol to = get_name();
+ if (to.is_null()) {
+ composite_dictionary.remove(symbol(from_gn));
+ warning(WARN_MISSING, "composite character request expects two"
+ " arguments");
+ skip_line();
+ return;
+ }
+ const char *to_gn = glyph_name_to_unicode(to.contents());
+ if (!to_gn) {
+ to_gn = check_unicode_name(to.contents());
+ if (!to_gn) {
+ error("invalid composite glyph name '%1'", to.contents());
skip_line();
return;
}
- const char *to_gn = glyph_name_to_unicode(to.contents());
- if (!to_gn) {
- to_gn = check_unicode_name(to.contents());
- if (!to_gn) {
- error("invalid composite glyph name '%1'", to.contents());
- skip_line();
- return;
- }
- }
- const char *to_decomposed = decompose_unicode(to_gn);
- if (to_decomposed)
- to_gn = &to_decomposed[1];
- if (strcmp(from_gn, to_gn) == 0)
- composite_dictionary.remove(symbol(from_gn));
- else
- (void)composite_dictionary.lookup(symbol(from_gn), (void *)to_gn);
+ }
+ const char *to_decomposed = decompose_unicode(to_gn);
+ if (to_decomposed)
+ to_gn = &to_decomposed[1];
+ if (strcmp(from_gn, to_gn) == 0)
+ composite_dictionary.remove(symbol(from_gn));
+ else
+ (void)composite_dictionary.lookup(symbol(from_gn), (void *)to_gn);
skip_line();
}
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
