From a20be95dec7797c55257792a32b6b39bdbdfe595 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/Fo/font.in            |  2 +-
 regress/mdoc/Fo/font.out_ascii     |  2 +-
 regress/mdoc/Fo/font.out_markdown  |  2 +-
 regress/mdoc/Fo/punct.in           | 10 +++++++---
 regress/mdoc/Fo/punct.out_ascii    | 10 +++++++---
 regress/mdoc/Fo/punct.out_markdown | 10 +++++++---
 6 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'regress/mdoc/Fo')

diff --git a/regress/mdoc/Fo/font.in b/regress/mdoc/Fo/font.in
index 894a86aa..6e2c7d86 100644
--- a/regress/mdoc/Fo/font.in
+++ b/regress/mdoc/Fo/font.in
@@ -15,5 +15,5 @@ trailing text
 .Pp
 .Fo function
 .Fa prefix\\fBbold\\fPsuffix
-.Fc
+.Fc "Sy" bold
 trailing text
diff --git a/regress/mdoc/Fo/font.out_ascii b/regress/mdoc/Fo/font.out_ascii
index 3490ad8a..698a7683 100644
--- a/regress/mdoc/Fo/font.out_ascii
+++ b/regress/mdoc/Fo/font.out_ascii
@@ -8,6 +8,6 @@ DDEESSCCRRIIPPTTIIOONN
 
      pprreeffiixx_n_a_m_essuuffffiixx(_t_y_p_e _a_r_g) trailing text
 
-     ffuunnccttiioonn(_p_r_e_f_i_xbboolldd_s_u_f_f_i_x) trailing text
+     ffuunnccttiioonn(_p_r_e_f_i_xbboolldd_s_u_f_f_i_x) bboolldd trailing text
 
 OpenBSD                          July 9, 2012                          OpenBSD
diff --git a/regress/mdoc/Fo/font.out_markdown b/regress/mdoc/Fo/font.out_markdown
index d36e0b8a..84393910 100644
--- a/regress/mdoc/Fo/font.out_markdown
+++ b/regress/mdoc/Fo/font.out_markdown
@@ -12,7 +12,7 @@ trailing text
 **prefix*name*suffix**(*type arg*)
 trailing text
 
-**function**(*prefix**bold**suffix*)
+**function**(*prefix**bold**suffix*) **bold**
 trailing text
 
 OpenBSD - July 9, 2012
diff --git a/regress/mdoc/Fo/punct.in b/regress/mdoc/Fo/punct.in
index 0b407ffb..e1657ec7 100644
--- a/regress/mdoc/Fo/punct.in
+++ b/regress/mdoc/Fo/punct.in
@@ -1,9 +1,13 @@
-.Dd November 20, 2014
+.Dd May 20, 2017
 .Dt FO-PUNCT 1
 .Os OpenBSD
 .Sh NAME
 .Nm Fo-punct
-.Nd punctuation on function name input lines
+.Nd punctuation on function input lines
 .Sh DESCRIPTION
 .Ft double
-.Fn sin , cos
+.Fn sin "," cos "Em" italic
+.Pp
+.Fa x "," y "Sy" bold
+.Pp
+.Ft int "," float "Sy" bold
diff --git a/regress/mdoc/Fo/punct.out_ascii b/regress/mdoc/Fo/punct.out_ascii
index 4e8b1abe..febf646e 100644
--- a/regress/mdoc/Fo/punct.out_ascii
+++ b/regress/mdoc/Fo/punct.out_ascii
@@ -1,9 +1,13 @@
 FO-PUNCT(1)                 General Commands Manual                FO-PUNCT(1)
 
 NNAAMMEE
-     FFoo--ppuunncctt - punctuation on function name input lines
+     FFoo--ppuunncctt - punctuation on function input lines
 
 DDEESSCCRRIIPPTTIIOONN
-     _d_o_u_b_l_e ssiinn(), cos
+     _d_o_u_b_l_e ssiinn(), cos _i_t_a_l_i_c
 
-OpenBSD                        November 20, 2014                       OpenBSD
+     _x, _y bboolldd
+
+     _i_n_t, _f_l_o_a_t bboolldd
+
+OpenBSD                          May 20, 2017                          OpenBSD
diff --git a/regress/mdoc/Fo/punct.out_markdown b/regress/mdoc/Fo/punct.out_markdown
index 3128aeef..88524f6f 100644
--- a/regress/mdoc/Fo/punct.out_markdown
+++ b/regress/mdoc/Fo/punct.out_markdown
@@ -2,11 +2,15 @@ FO-PUNCT(1) - General Commands Manual
 
 # NAME
 
-**Fo-punct** - punctuation on function name input lines
+**Fo-punct** - punctuation on function input lines
 
 # DESCRIPTION
 
 *double*
-**sin**(), cos
+**sin**(), cos *italic*
 
-OpenBSD - November 20, 2014
+*x*, *y* **bold**
+
+*int*, *float* **bold**
+
+OpenBSD - May 20, 2017
-- 
cgit v1.2.3-56-ge451