Change .Fx macro to always display "FreeBSD" and its argument, whether

 the argument is a known FreeBSD version or not.
Output an nroff error if .Fx is used with an unknown FreeBSD version.
Change .Nx and .Ox macros to always display the argument, whether
 the argument is a known version or not.  This eliminates much of the
 need to syncrhonize .Nx and .Ox with their source OS's -- only the
 exceptions (like ".Nx 1.2a" -> "NetBSD 1.2A") where the argument is
 not directly copied to the output need to be added.

1 files changed, 40 insertions, 89 deletions

diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index f41eb53d5510..c3cd7c50bd7c 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -150,109 +150,60 @@
 .nr cF \\n(.f
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
-.if \\n(.$==2 \{\
-.	if "\\$1"1.0"  \&\\*(tNFreeBSD\\*(aa 1.0\\*(aa\\$2
-.	if "\\$1"1.1"  \&\\*(tNFreeBSD\\*(aa 1.1\\*(aa\\$2
-.	if "\\$1"1.1.5"  \&\\*(tNFreeBSD\\*(aa 1.1.5\\*(aa\\$2
-.	if "\\$1"1.1.5.1"  \&\\*(tNFreeBSD\\*(aa 1.1.5.1\\*(aa\\$2
-.	if "\\$1"2.0"  \&\\*(tNFreeBSD\\*(aa 2.0\\*(aa\\$2
-.	if "\\$1"2.0.5"  \&\\*(tNFreeBSD\\*(aa 2.0.5\\*(aa\\$2
-.	if "\\$1"2.1"  \&\\*(tNFreeBSD\\*(aa 2.1\\*(aa\\$2
-.	if "\\$1"2.1.5"  \&\\*(tNFreeBSD\\*(aa 2.1.5\\*(aa\\$2
-.	if "\\$1"2.1.6"  \&\\*(tNFreeBSD\\*(aa 2.1.6\\*(aa\\$2
-.	if "\\$1"2.1.7"  \&\\*(tNFreeBSD\\*(aa 2.1.7\\*(aa\\$2
-.	if "\\$1"2.2"  \&\\*(tNFreeBSD\\*(aa 2.2\\*(aa\\$2
-.	if "\\$1"2.2.1"  \&\\*(tNFreeBSD\\*(aa 2.2.1\\*(aa\\$2
-.	if "\\$1"2.2.2"  \&\\*(tNFreeBSD\\*(aa 2.2.2\\*(aa\\$2
-.	if "\\$1"2.2.5"  \&\\*(tNFreeBSD\\*(aa 2.2.5\\*(aa\\$2
-.	if "\\$1"2.2.6"  \&\\*(tNFreeBSD\\*(aa 2.2.6\\*(aa\\$2
-.	if "\\$1"2.2.7"  \&\\*(tNFreeBSD\\*(aa 2.2.7\\*(aa\\$2
-.	if "\\$1"2.2.8"  \&\\*(tNFreeBSD\\*(aa 2.2.8\\*(aa\\$2
-.	if "\\$1"3.0"  \&\\*(tNFreeBSD\\*(aa 3.0\\*(aa\\$2
-.	if "\\$1"3.1"  \&\\*(tNFreeBSD\\*(aa 3.1\\*(aa\\$2
-.	if "\\$1"4.0"  \&\\*(tNFreeBSD\\*(aa 4.0\\*(aa\\$2
-.\}
-.if \\n(.$==1 \{\
-.	if "\\$1"1.0"  \&\\*(tNFreeBSD\\*(aa 1.0\\*(aa
-.	if "\\$1"1.1"  \&\\*(tNFreeBSD\\*(aa 1.1\\*(aa
-.	if "\\$1"1.1.5"  \&\\*(tNFreeBSD\\*(aa 1.1.5\\*(aa
-.	if "\\$1"1.1.5.1"  \&\\*(tNFreeBSD\\*(aa 1.1.5.1\\*(aa
-.	if "\\$1"2.0"  \&\\*(tNFreeBSD\\*(aa 2.0\\*(aa
-.	if "\\$1"2.0.5"  \&\\*(tNFreeBSD\\*(aa 2.0.5\\*(aa
-.	if "\\$1"2.1"  \&\\*(tNFreeBSD\\*(aa 2.1\\*(aa
-.	if "\\$1"2.1.5"  \&\\*(tNFreeBSD\\*(aa 2.1.5\\*(aa
-.	if "\\$1"2.1.6"  \&\\*(tNFreeBSD\\*(aa 2.1.6\\*(aa
-.	if "\\$1"2.1.7"  \&\\*(tNFreeBSD\\*(aa 2.1.7\\*(aa
-.	if "\\$1"2.2"  \&\\*(tNFreeBSD\\*(aa 2.2\\*(aa
-.	if "\\$1"2.2.1"  \&\\*(tNFreeBSD\\*(aa 2.2.1\\*(aa
-.	if "\\$1"2.2.2"  \&\\*(tNFreeBSD\\*(aa 2.2.2\\*(aa
-.	if "\\$1"2.2.5"  \&\\*(tNFreeBSD\\*(aa 2.2.5\\*(aa
-.	if "\\$1"2.2.6"  \&\\*(tNFreeBSD\\*(aa 2.2.6\\*(aa
-.	if "\\$1"2.2.7"  \&\\*(tNFreeBSD\\*(aa 2.2.7\\*(aa
-.	if "\\$1"2.2.8"  \&\\*(tNFreeBSD\\*(aa 2.2.8\\*(aa
-.	if "\\$1"3.0"  \&\\*(tNFreeBSD\\*(aa 3.0\\*(aa
-.	if "\\$1"3.1"  \&\\*(tNFreeBSD\\*(aa 3.1\\*(aa
-.	if "\\$1"4.0"  \&\\*(tNFreeBSD\\*(aa 4.0\\*(aa
-.\}
+.ds ab \& \&
+.    ie \\n(.$==0       .rm ab
+.el .ie "\\$1"1.0"      \c
+.el .ie "\\$1"1.1"      \c
+.el .ie "\\$1"1.1.5"    \c
+.el .ie "\\$1"1.1.5.1"  \c
+.el .ie "\\$1"2.0"      \c
+.el .ie "\\$1"2.0.5"    \c
+.el .ie "\\$1"2.1"      \c
+.el .ie "\\$1"2.1.5"    \c
+.el .ie "\\$1"2.1.6"    \c
+.el .ie "\\$1"2.1.7"    \c
+.el .ie "\\$1"2.2"      \c
+.el .ie "\\$1"2.2.1"    \c
+.el .ie "\\$1"2.2.2"    \c
+.el .ie "\\$1"2.2.5"    \c
+.el .ie "\\$1"2.2.6"    \c
+.el .ie "\\$1"2.2.7"    \c
+.el .ie "\\$1"2.2.8"    \c
+.el .ie "\\$1"3.0"      \c
+.el .ie "\\$1"3.1"      \c
+.el .ie "\\$1"4.0"      \c
+.el .ie "\\$1","        .rm ab \" Allow ".Fx ,"
+.el .ie "\\$1"."        .rm ab \" Allow ".Fx ."
+.el .tm Unknown FreeBSD version ``\\$1'' at line \\n(c.
+\&\\*(tNFreeBSD\\*(aa\\*(ab\\$1\\$2
 ..
 .\" Ns Nx macro - NetBSD
 .\"
-.\" Please try to keep this macro in sync with NetBSD!
+.\" Please try to keep the exceptions in this macro in sync with NetBSD!
 .de Nx
 .nr cF \\n(.f
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
-.if \\n(.$==2 \{\
-.	if "\\$1"0.8"  \&\\*(tNNetBSD 0.8\\*(aa\\$2
-.	if "\\$1"0.8a" \&\\*(tNNetBSD 0.8A\\*(aa\\$2
-.	if "\\$1"0.9"  \&\\*(tNNetBSD 0.9\\*(aa\\$2
-.	if "\\$1"0.9a" \&\\*(tNNetBSD 0.9A\\*(aa\\$2
-.	if "\\$1"1.0"  \&\\*(tNNetBSD 1.0\\*(aa\\$2
-.	if "\\$1"1.0a" \&\\*(tNNetBSD 1.0A\\*(aa\\$2
-.	if "\\$1"1.1"  \&\\*(tNNetBSD 1.1\\*(aa\\$2
-.	if "\\$1"1.2"  \&\\*(tNNetBSD 1.2\\*(aa\\$2
-.	if "\\$1"1.2a" \&\\*(tNNetBSD 1.2A\\*(aa\\$2
-.	if "\\$1"1.2b" \&\\*(tNNetBSD 1.2B\\*(aa\\$2
-.	if "\\$1"1.3"  \&\\*(tNNetBSD 1.3\\*(aa\\$2
-.\}
-.if \\n(.$==1 \{\
-.	if "\\$1"0.8"  \&\\*(tNNetBSD 0.8\\*(aa
-.	if "\\$1"0.8a" \&\\*(tNNetBSD 0.8A\\*(aa
-.	if "\\$1"0.9"  \&\\*(tNNetBSD 0.9\\*(aa
-.	if "\\$1"0.9a" \&\\*(tNNetBSD 0.9A\\*(aa
-.	if "\\$1"1.0"  \&\\*(tNNetBSD 1.0\\*(aa
-.	if "\\$1"1.0a" \&\\*(tNNetBSD 1.0A\\*(aa
-.	if "\\$1"1.1"  \&\\*(tNNetBSD 1.1\\*(aa
-.	if "\\$1"1.2"  \&\\*(tNNetBSD 1.2\\*(aa
-.	if "\\$1"1.2a" \&\\*(tNNetBSD 1.2A\\*(aa
-.	if "\\$1"1.2b" \&\\*(tNNetBSD 1.2B\\*(aa
-.	if "\\$1"1.3"  \&\\*(tNNetBSD 1.3\\*(aa
-.	if "\\$1"." \&\\*(tNNetBSD\\$1\\*(aa
-.	if "\\$1"," \&\\*(tNNetBSD\\$1\\*(aa
-.\}
-.if \\n(.$==0   \&\\*(tNNetBSD\\*(aa
+.ds ab \& \&
+.ds ac \\$1
+.    ie \\n(.$==0   .rm ab
+.el .ie "\\$1"0.8a" .ds ac 0.8A
+.el .ie "\\$1"0.9a" .ds ac 0.9A
+.el .ie "\\$1"1.0a" .ds ac 1.0A
+.el .ie "\\$1"1.2a" .ds ac 1.2A
+.el .ie "\\$1"1.2b" .ds ac 1.2B
+.el .ie "\\$1"."    .rm ab
+.el .if "\\$1","    .rm ab
+\&\\*(tNNetBSD\\*(ab\\*(ac\\*(aa\\$2
 ..
 .\" Ns Ox macro - OpenBSD
 .\"
-.\" Please try to keep this macro in sync with OpenBSD!
+.\" Please try to keep any exceptions in this macro in sync with OpenBSD!
 .de Ox
 .nr cF \\n(.f
 .nr cZ \\n(.s
 .ds aa \&\f\\n(cF\s\\n(cZ
-.if \\n(.$==2 \{\
-.	if "\\$1"1.2"  \&\\*(tNOpenBSD\\*(aa 1.2\\*(aa\\$2
-.	if "\\$1"2.0"  \&\\*(tNOpenBSD\\*(aa 2.0\\*(aa\\$2
-.	if "\\$1"2.1"  \&\\*(tNOpenBSD\\*(aa 2.1\\*(aa\\$2
-.	if "\\$1"2.2"  \&\\*(tNOpenBSD\\*(aa 2.2\\*(aa\\$2
-.	if "\\$1"2.3"  \&\\*(tNOpenBSD\\*(aa 2.3\\*(aa\\$2
-.\}
-.if \\n(.$==1 \{\
-.	if "\\$1"1.2"  \&\\*(tNOpenBSD\\*(aa 1.2\\*(aa
-.	if "\\$1"2.0"  \&\\*(tNOpenBSD\\*(aa 2.0\\*(aa
-.	if "\\$1"2.1"  \&\\*(tNOpenBSD\\*(aa 2.1\\*(aa
-.	if "\\$1"2.2"  \&\\*(tNOpenBSD\\*(aa 2.2\\*(aa
-.	if "\\$1"2.3"  \&\\*(tNOpenBSD\\*(aa 2.3\\*(aa
-.\}
+\&\\*(tNOpenBSD\\*(aa \\$1\\$2
 ..
 .\" The Bt macro should go away now
 .\" Ns Bt macro - prints "is currently in beta test." (HISTORY section)