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/Bl | |
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/Bl')
-rw-r--r-- | regress/mdoc/Bl/Makefile | 4 | ||||
-rw-r--r-- | regress/mdoc/Bl/esc.in | 19 | ||||
-rw-r--r-- | regress/mdoc/Bl/esc.out_ascii | 15 | ||||
-rw-r--r-- | regress/mdoc/Bl/esc.out_markdown | 25 |
4 files changed, 61 insertions, 2 deletions
diff --git a/regress/mdoc/Bl/Makefile b/regress/mdoc/Bl/Makefile index aeb6bd56..8fde5d9e 100644 --- a/regress/mdoc/Bl/Makefile +++ b/regress/mdoc/Bl/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.31 2016/10/17 19:00:16 schwarze Exp $ +# $OpenBSD: Makefile,v 1.40 2018/12/21 16:58:49 schwarze Exp $ REGRESS_TARGETS = item inset diag ohang bullet dash enum hang tag REGRESS_TARGETS += column column_nogroff colNoIt -REGRESS_TARGETS += extend nested offset secstart +REGRESS_TARGETS += esc extend nested offset secstart REGRESS_TARGETS += notype multitype badargs REGRESS_TARGETS += empty noIt emptyhead emptytag emptyitem multitag diff --git a/regress/mdoc/Bl/esc.in b/regress/mdoc/Bl/esc.in new file mode 100644 index 00000000..60eb8a30 --- /dev/null +++ b/regress/mdoc/Bl/esc.in @@ -0,0 +1,19 @@ +.\" $OpenBSD: esc.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate$ +.Dt BL-ESC 1 +.Os +.Sh NAME +.Nm Bl-esc +.Nd escape sequences in full block macro heads +.Sh DESCRIPTION +.ds a \(at +.Bl -tag -width 2n +.It \*a +unquoted unescaped +.It "\*a" +quoted unescaped +.It \\*a +unquoted escaped +.It "\\*a" +quoted escaped +.El diff --git a/regress/mdoc/Bl/esc.out_ascii b/regress/mdoc/Bl/esc.out_ascii new file mode 100644 index 00000000..e73c929f --- /dev/null +++ b/regress/mdoc/Bl/esc.out_ascii @@ -0,0 +1,15 @@ +BL-ESC(1) General Commands Manual BL-ESC(1) + +NNAAMMEE + BBll--eesscc - escape sequences in full block macro heads + +DDEESSCCRRIIPPTTIIOONN + @ unquoted unescaped + + @ quoted unescaped + + @ unquoted escaped + + @ quoted escaped + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Bl/esc.out_markdown b/regress/mdoc/Bl/esc.out_markdown new file mode 100644 index 00000000..780a61b8 --- /dev/null +++ b/regress/mdoc/Bl/esc.out_markdown @@ -0,0 +1,25 @@ +BL-ESC(1) - General Commands Manual + +# NAME + +**Bl-esc** - escape sequences in full block macro heads + +# DESCRIPTION + +@ + +> unquoted unescaped + +@ + +> quoted unescaped + +@ + +> unquoted escaped + +@ + +> quoted escaped + +OpenBSD - December 21, 2018 |