aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/roff.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2022-05-31 18:09:57 +0000
committerIngo Schwarze <schwarze@openbsd.org>2022-05-31 18:09:57 +0000
commitea452a23a02a06e590a1b863b12b3fa42b728535 (patch)
treedaad6e3ff564c8c5940bccb04cc02fd1c8ae9cc0 /roff.c
parentda6633e8c5db9f71ef2499ad46bc43e3854c2ac9 (diff)
downloadmandoc-ea452a23a02a06e590a1b863b12b3fa42b728535.tar.gz
mandoc-ea452a23a02a06e590a1b863b12b3fa42b728535.tar.zst
mandoc-ea452a23a02a06e590a1b863b12b3fa42b728535.zip
Trivial patch to put the roff(7) \g (interpolate format of register)
escape sequence into the correct parsing class, ESCAPE_EXPAND. Expansion of \g is supposed to work exactly like the expansion of the related escape sequence \n (interpolate register value), but since we ignore the .af (assign output format) request, we just interpolate an empty string to replace the \g sequence. Surprising as it may seem, this actually makes a formatting difference for deviate input like ".O\gNx" which used to raise bogus "escaped character not allowed in a name" and "skipping unknown macro" errors and printed nothing, whereas now it correctly prints "OpenBSD".
Diffstat (limited to 'roff.c')
-rw-r--r--roff.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/roff.c b/roff.c
index 59e2644f..0c36e08e 100644
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.389 2022/05/30 23:03:47 schwarze Exp $ */
+/* $Id: roff.c,v 1.390 2022/05/31 18:09:57 schwarze Exp $ */
/*
* Copyright (c) 2010-2015, 2017-2022 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -1535,6 +1535,8 @@ roff_expand(struct roff *r, struct buf *buf, int ln, int pos, char ec)
roff_expand_patch(buf, iendarg, "}", iend);
roff_expand_patch(buf, iesc, "${", iarg);
continue;
+ case 'g':
+ break;
case 'n':
if (iendarg > iarg)
(void)snprintf(ubuf, sizeof(ubuf), "%d",