From a90a19d8ea1fd9c75174c833a56f4c68dae450c4 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 21 Dec 2018 17:15:18 +0000 Subject: 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 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. --- regress/mdoc/Ns/Makefile | 4 ++-- regress/mdoc/Ns/arg.in | 13 +++++++++++++ regress/mdoc/Ns/arg.out_ascii | 10 ++++++++++ regress/mdoc/Ns/arg.out_markdown | 14 ++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 regress/mdoc/Ns/arg.in create mode 100644 regress/mdoc/Ns/arg.out_ascii create mode 100644 regress/mdoc/Ns/arg.out_markdown (limited to 'regress/mdoc/Ns') diff --git a/regress/mdoc/Ns/Makefile b/regress/mdoc/Ns/Makefile index 45db66cc..b2c409ab 100644 --- a/regress/mdoc/Ns/Makefile +++ b/regress/mdoc/Ns/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.5 2014/07/02 11:42:56 schwarze Exp $ +# $OpenBSD: Makefile,v 1.8 2018/12/21 16:58:49 schwarze Exp $ -REGRESS_TARGETS = position punct +REGRESS_TARGETS = arg position punct LINT_TARGETS = position .include diff --git a/regress/mdoc/Ns/arg.in b/regress/mdoc/Ns/arg.in new file mode 100644 index 00000000..b83a1f4a --- /dev/null +++ b/regress/mdoc/Ns/arg.in @@ -0,0 +1,13 @@ +.\" $OpenBSD: arg.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt NS-ARG 1 +.Os +.Sh NAME +.Nm Ns-arg +.Nd escape sequences in the arguments of in-line macros with an argument limit +.Sh DESCRIPTION +.ds a \(at +.No unquoted unescaped Ns \*a +.No quoted unescaped Ns "\*a" +.No unquoted escaped Ns \\*a +.No quoted escaped Ns "\\*a" diff --git a/regress/mdoc/Ns/arg.out_ascii b/regress/mdoc/Ns/arg.out_ascii new file mode 100644 index 00000000..2b8a5104 --- /dev/null +++ b/regress/mdoc/Ns/arg.out_ascii @@ -0,0 +1,10 @@ +NS-ARG(1) General Commands Manual NS-ARG(1) + +NNAAMMEE + NNss--aarrgg - escape sequences in the arguments of in-line macros with an + argument limit + +DDEESSCCRRIIPPTTIIOONN + unquoted unescaped@ quoted unescaped@ unquoted escaped@ quoted escaped@ + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Ns/arg.out_markdown b/regress/mdoc/Ns/arg.out_markdown new file mode 100644 index 00000000..7d600590 --- /dev/null +++ b/regress/mdoc/Ns/arg.out_markdown @@ -0,0 +1,14 @@ +NS-ARG(1) - General Commands Manual + +# NAME + +**Ns-arg** - escape sequences in the arguments of in-line macros with an argument limit + +# DESCRIPTION + +unquoted unescaped@ +quoted unescaped@ +unquoted escaped@ +quoted escaped@ + +OpenBSD - December 21, 2018 -- cgit v1.2.3