Up to version 1.22.4, groff_mdoc(7) only considered the first word

when comparing section headers.  For example, ".Sh SEE ELSEWHERE"
and ".Sh SEE Em ALSO" were considered instances of a SEE ALSO
section.  In groff-current, exact matches with no sub-macros are
required.  Adjust mandoc behaviour.

While here, also fix a very minor mandoc bug, even though no
detrimental effect of the bug on formatting is known.  While using
sub-macros in the .Sh HEAD is bad style, the parsers accept it, so
setting the section attribute on the HEAD needs to act recursively.

4 files changed, 9 insertions, 14 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Rs/break.in b/regress/usr.bin/mandoc/mdoc/Rs/break.in
index 63425a862ee..b2455f688e6 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/break.in
+++ b/regress/usr.bin/mandoc/mdoc/Rs/break.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: break.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
-.Dd $Mdocdate: July 4 2017 $
+.\" $OpenBSD: break.in,v 1.6 2022/08/19 12:49:36 schwarze Exp $
+.Dd $Mdocdate: August 19 2022 $
 .Dt RS-BREAK 1
 .Os
 .Sh NAME
@@ -20,7 +20,7 @@ reference after a blank line:
 .%N 42
 .Re
 .Sh SEE Em ALSO
-reference after a blank line:
+reference on the same line:
 .Rs
 .%A author
 .%J journal
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii
index 0c9625837e4..8426cef16af 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii
@@ -12,8 +12,6 @@ SSEEEE AALLSSOO
      author, _j_o_u_r_n_a_l, 42.
 
 SSEEEE _A_L_S_O
-     reference after a blank line:
-
-     author, _j_o_u_r_n_a_l, 42.
+     reference on the same line: author, _j_o_u_r_n_a_l, 42.
 
-OpenBSD                          July 4, 2017                          OpenBSD
+OpenBSD                         August 19, 2022                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/break.out_markdown b/regress/usr.bin/mandoc/mdoc/Rs/break.out_markdown
index ad6adfb3c3c..00b7d01bc76 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/break.out_markdown
+++ b/regress/usr.bin/mandoc/mdoc/Rs/break.out_markdown
@@ -21,10 +21,9 @@ author,
 
 # SEE *ALSO*
 
-reference after a blank line:
-
+reference on the same line:
 author,
 *journal*,
 42\.
 
-OpenBSD - July 4, 2017
+OpenBSD - August 19, 2022
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/break.out_utf8 b/regress/usr.bin/mandoc/mdoc/Rs/break.out_utf8
index 9cd3bb59d1d..63400749fec 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/break.out_utf8
+++ b/regress/usr.bin/mandoc/mdoc/Rs/break.out_utf8
@@ -12,8 +12,6 @@ SSEEEE AALLSSOO
      author, _j_o_u_r_n_a_l, 42.
 
 SSEEEE _A_L_S_O
-     reference after a blank line:
-
-     author, _j_o_u_r_n_a_l, 42.
+     reference on the same line: author, _j_o_u_r_n_a_l, 42.
 
-OpenBSD                          July 4, 2017                          OpenBSD
+OpenBSD                         August 19, 2022                        OpenBSD