From f9f4c363c58d629451c4b9a44815112814c91e0e Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Tue, 30 May 2017 16:22:03 +0000
Subject: Macro argument quoting does not prevent recognition of punctuation
 and of called macros.

This bug affects almost all macros, and fixing it simplifies the
code.  It is amazing that the bogus ARGS_QWORD feature got implemented
in the first place, and then carrier along for more than eight years
without anybody ever noticing that it was pointless.

Reported by Leah Neukirchen <leah at vuxu dot org>, found on Void Linux.
---
 regress/mdoc/Oo/punct.in           | 6 +++---
 regress/mdoc/Oo/punct.out_ascii    | 2 +-
 regress/mdoc/Oo/punct.out_markdown | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'regress/mdoc/Oo')

diff --git a/regress/mdoc/Oo/punct.in b/regress/mdoc/Oo/punct.in
index c9e9d732..59ea4bb7 100644
--- a/regress/mdoc/Oo/punct.in
+++ b/regress/mdoc/Oo/punct.in
@@ -6,13 +6,13 @@
 .Nd punctuation handling by the Oo macro
 .Sh DESCRIPTION
 at the beginning:
-.Oo ( z
+.Oo "(" z
 .Oo | z
 .Oo . z
-.Oc Oc Oc
+.Oc Oc "Sy" bold Oc
 .Pp
 in the middle:
-.Oo a ( z
+.Oo a "(" z
 .Oo a | z
 .Oo a . z
 .Oc Oc Oc
diff --git a/regress/mdoc/Oo/punct.out_ascii b/regress/mdoc/Oo/punct.out_ascii
index ca487cf6..68addf8d 100644
--- a/regress/mdoc/Oo/punct.out_ascii
+++ b/regress/mdoc/Oo/punct.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
      OOoo--ppuunncctt - punctuation handling by the Oo macro
 
 DDEESSCCRRIIPPTTIIOONN
-     at the beginning: ([z [| z [. z]]]
+     at the beginning: ([z [| z [. z]] bboolldd]
 
      in the middle: [a (z [a | z [a. z]]]
 
diff --git a/regress/mdoc/Oo/punct.out_markdown b/regress/mdoc/Oo/punct.out_markdown
index befa71f3..e6525b1d 100644
--- a/regress/mdoc/Oo/punct.out_markdown
+++ b/regress/mdoc/Oo/punct.out_markdown
@@ -9,7 +9,7 @@ OO-PUNCT(1) - General Commands Manual
 at the beginning:
 (\[z
 \[| z
-\[. z]]]
+\[. z]] **bold**]
 
 in the middle:
 \[a (z
-- 
cgit