Fix two minibugs reported by Thomas Klausner <wiz at NetBSD>:

1. The first argument of .Fn is not supposed to be parsed.
2. The .Fn macro is not supposed to reopen its scope after punctuation.

7 files changed, 28 insertions, 10 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Ad/font.in b/regress/usr.bin/mandoc/mdoc/Ad/font.in
index 9b6e71d07d5..104bc194789 100644
--- a/regress/usr.bin/mandoc/mdoc/Ad/font.in
+++ b/regress/usr.bin/mandoc/mdoc/Ad/font.in
@@ -1,4 +1,4 @@
-.Dd July 9, 2012
+.Dd November 20, 2014
 .Dt AD-FONT 1
 .Os OpenBSD
 .Sh NAME
@@ -6,5 +6,5 @@
 .Nd changing fonts inside the address macro
 .Sh DESCRIPTION
 normal text
-.Ad emphasis\\fBbold\\fPback
+.Ad emphasis\\fBbold\\fPback | after : punctuation
 trailing text
diff --git a/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii
index 810107bc93b..e829efbd6e7 100644
--- a/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii
@@ -4,6 +4,6 @@ NNAAMMEE
      AAdd--ffoonntt - changing fonts inside the address macro
 
 DDEESSCCRRIIPPTTIIOONN
-     normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
+     normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k | _a_f_t_e_r: _p_u_n_c_t_u_a_t_i_o_n trailing text
 
-OpenBSD                          July 9, 2012                          OpenBSD
+OpenBSD                        November 20, 2014                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/Makefile b/regress/usr.bin/mandoc/mdoc/Fo/Makefile
index 6a2ac068a77..6a3c6bb5fa9 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Fo/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.10 2014/10/11 21:14:11 schwarze Exp $
+# $OpenBSD: Makefile,v 1.11 2014/11/20 00:30:34 schwarze Exp $
 
-REGRESS_TARGETS = basic break eos font noarg obsolete section warn
+REGRESS_TARGETS = basic break eos font noarg obsolete punct section warn
 LINT_TARGETS	= noarg obsolete warn
 
 # groff does not handle .nr nS
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/punct.in b/regress/usr.bin/mandoc/mdoc/Fo/punct.in
new file mode 100644
index 00000000000..0b407ffb55e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Fo/punct.in
@@ -0,0 +1,9 @@
+.Dd November 20, 2014
+.Dt FO-PUNCT 1
+.Os OpenBSD
+.Sh NAME
+.Nm Fo-punct
+.Nd punctuation on function name input lines
+.Sh DESCRIPTION
+.Ft double
+.Fn sin , cos
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_ascii
new file mode 100644
index 00000000000..4e8b1abe5d1
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Fo/punct.out_ascii
@@ -0,0 +1,9 @@
+FO-PUNCT(1)                 General Commands Manual                FO-PUNCT(1)
+
+NNAAMMEE
+     FFoo--ppuunncctt - punctuation on function name input lines
+
+DDEESSCCRRIIPPTTIIOONN
+     _d_o_u_b_l_e ssiinn(), cos
+
+OpenBSD                        November 20, 2014                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Ms/font.in b/regress/usr.bin/mandoc/mdoc/Ms/font.in
index 9eb9d8eff11..dc841740e7c 100644
--- a/regress/usr.bin/mandoc/mdoc/Ms/font.in
+++ b/regress/usr.bin/mandoc/mdoc/Ms/font.in
@@ -1,4 +1,4 @@
-.Dd July 9, 2012
+.Dd November 20, 2014
 .Dt MS-FONT 1
 .Os OpenBSD
 .Sh NAME
@@ -6,5 +6,5 @@
 .Nd changing fonts inside the mathematical symbol macro
 .Sh DESCRIPTION
 normal text
-.Ms bold\\fIemphasis\\fPback
+.Ms bold\\fIemphasis\\fPback | after : punctuation
 trailing text
diff --git a/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii
index ae647b836e2..280aa4071f8 100644
--- a/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii
@@ -4,6 +4,6 @@ NNAAMMEE
      MMss--ffoonntt - changing fonts inside the mathematical symbol macro
 
 DDEESSCCRRIIPPTTIIOONN
-     normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk trailing text
+     normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk | aafftteerr: ppuunnccttuuaattiioonn trailing text
 
-OpenBSD                          July 9, 2012                          OpenBSD
+OpenBSD                        November 20, 2014                       OpenBSD