diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2018-12-21 17:15:18 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-12-21 17:15:18 +0000 |
commit | aa202260e540ec4a7df78e75b104f0a1c7d0c197 (patch) | |
tree | 7026ff0235f04dfac31019e6937889dc71cbf161 /regress/mdoc/Li | |
parent | beeeef576df2a17cc8bdf0191709fa80bd2f524c (diff) | |
download | mandoc-aa202260e540ec4a7df78e75b104f0a1c7d0c197.tar.gz |
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')
-rw-r--r-- | regress/mdoc/Li/Makefile | 4 | ||||
-rw-r--r-- | regress/mdoc/Li/arg.in | 20 | ||||
-rw-r--r-- | regress/mdoc/Li/arg.out_ascii | 15 | ||||
-rw-r--r-- | regress/mdoc/Li/arg.out_markdown | 21 |
4 files changed, 58 insertions, 2 deletions
diff --git a/regress/mdoc/Li/Makefile b/regress/mdoc/Li/Makefile index f5afd199..7b2a3313 100644 --- a/regress/mdoc/Li/Makefile +++ b/regress/mdoc/Li/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2014/07/02 20:18:42 schwarze Exp $ +# $OpenBSD: Makefile,v 1.7 2018/12/21 16:58:49 schwarze Exp $ -REGRESS_TARGETS = punct font +REGRESS_TARGETS = arg punct font LINT_TARGETS = punct .include <bsd.regress.mk> diff --git a/regress/mdoc/Li/arg.in b/regress/mdoc/Li/arg.in new file mode 100644 index 00000000..199a1210 --- /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$ +.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" diff --git a/regress/mdoc/Li/arg.out_ascii b/regress/mdoc/Li/arg.out_ascii new file mode 100644 index 00000000..f0a69f18 --- /dev/null +++ b/regress/mdoc/Li/arg.out_ascii @@ -0,0 +1,15 @@ +LI-ARG(1) General Commands Manual LI-ARG(1) + +NNAAMMEE + LLii--aarrgg - escape sequences in arguments of in-line macros + +DDEESSCCRRIIPPTTIIOONN + unquoted unescaped: @ + + quoted unescaped: @ + + unquoted escaped: @ + + quoted escaped: @ + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Li/arg.out_markdown b/regress/mdoc/Li/arg.out_markdown new file mode 100644 index 00000000..1b0ba54e --- /dev/null +++ b/regress/mdoc/Li/arg.out_markdown @@ -0,0 +1,21 @@ +LI-ARG(1) - General Commands Manual + +# NAME + +**Li-arg** - escape sequences in arguments of in-line macros + +# DESCRIPTION + +unquoted unescaped: +`@` + +quoted unescaped: +`@` + +unquoted escaped: +`@` + +quoted escaped: +`@` + +OpenBSD - December 21, 2018 |