diff options
author | 2018-12-21 17:15:18 +0000 | |
---|---|---|
committer | 2018-12-21 17:15:18 +0000 | |
commit | a90a19d8ea1fd9c75174c833a56f4c68dae450c4 (patch) | |
tree | 6040fbeff2ceb01c795fcdc0bf917f24038e4b44 /regress/mdoc/Li/arg.in | |
parent | 3cfd064738dd1ac7b31bfbb5b6eab47b4ea99b2c (diff) | |
download | mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.tar.gz mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.tar.zst mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.zip |
Rename mandoc_getarg() to roff_getarg() and pass it the roff parser
struct as an argument such that after copy-in, it can call roff_expand()
once again, which used to be called roff_res() before this. This
fixes a subtle low-level roff(7) parsing bug reported by Fabio
Scotoni <fabio at esse dot ch> in the 4.4BSD-Lite2 mdoc.samples(7)
manual page, because that page used an escaped escape sequence in
a macro argument.
To expand escaped escape sequences in quoted mdoc(7) arguments, too,
stop bypassing the call to roff_getarg() in mdoc_argv.c, function args()
for this case. This does not solve the case of escaped escape sequences
in quoted .Bl -column phrases yet.
Because roff_expand() can make the string longer, roff_getarg() can no
longer operate in-place but needs to malloc(3) the returned string.
In the high-level parsers, free(3) that string after processing it.
Diffstat (limited to 'regress/mdoc/Li/arg.in')
-rw-r--r-- | regress/mdoc/Li/arg.in | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/regress/mdoc/Li/arg.in b/regress/mdoc/Li/arg.in new file mode 100644 index 00000000..d6c80672 --- /dev/null +++ b/regress/mdoc/Li/arg.in @@ -0,0 +1,20 @@ +.\" $OpenBSD: arg.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt LI-ARG 1 +.Os +.Sh NAME +.Nm Li-arg +.Nd escape sequences in arguments of in-line macros +.Sh DESCRIPTION +.ds a \(at +unquoted unescaped: +.Li \*a +.Pp +quoted unescaped: +.Li "\*a" +.Pp +unquoted escaped: +.Li \\*a +.Pp +quoted escaped: +.Li "\\*a" |