Don't use hardcoded *roff font change requests. Do it

via mdoc macros instead.

7 files changed, 56 insertions, 18 deletions

diff --git a/lib/libc/locale/ctype.3 b/lib/libc/locale/ctype.3
index 528df27d3cf3..1493cc3bbe12 100644
--- a/lib/libc/locale/ctype.3
+++ b/lib/libc/locale/ctype.3
@@ -54,22 +54,35 @@
 .Nd character classification macros
 .Sh SYNOPSIS
 .Fd #include <ctype.h>
-.Fa int c
-.br
+.Ft int
 .Fn isalnum "int c"
+.Ft int
 .Fn isalpha "int c"
+.Ft int
 .Fn isascii "int c"
+.Ft int
 .Fn iscntrl "int c"
+.Ft int
 .Fn isdigit "int c"
+.Ft int
 .Fn isgraph "int c"
+.Ft int
 .Fn islower "int c"
+.Ft int
 .Fn isprint "int c"
+.Ft int
 .Fn ispunct "int c"
+.Ft int
 .Fn isspace "int c"
+.Ft int
 .Fn isupper "int c"
+.Ft int
 .Fn isxdigit "int c"
+.Ft int
 .Fn toascii "int c"
+.Ft int
 .Fn tolower "int c"
+.Ft int
 .Fn toupper "int c"
 .Sh DESCRIPTION
 The above functions perform character tests and conversions on the integer
diff --git a/lib/libc/locale/euc.4 b/lib/libc/locale/euc.4
index 58b07f96da2c..2e68154d3270 100644
--- a/lib/libc/locale/euc.4
+++ b/lib/libc/locale/euc.4
@@ -41,9 +41,19 @@
 .Nm euc
 .Nd EUC encoding of runes
 .Sh SYNOPSIS
-\fBENCODING "EUC"\fP
-.br
-\fBVARIABLE \fP\fIlen1 mask1 len2 mask2 len3 mask3 len4 mask4 mask\fP
+.Nm ENCODING 
+.Qq EUC
+.Pp
+.Nm VARIABLE
+.Ar len1 
+.Ar mask1 
+.Ar len2 
+.Ar mask2 
+.Ar len3 
+.Ar mask3 
+.Ar len4 
+.Ar mask4 
+.Ar mask
 .Sh DESCRIPTION
 The
 .Nm EUC
diff --git a/lib/libc/locale/euc.5 b/lib/libc/locale/euc.5
index 58b07f96da2c..2e68154d3270 100644
--- a/lib/libc/locale/euc.5
+++ b/lib/libc/locale/euc.5
@@ -41,9 +41,19 @@
 .Nm euc
 .Nd EUC encoding of runes
 .Sh SYNOPSIS
-\fBENCODING "EUC"\fP
-.br
-\fBVARIABLE \fP\fIlen1 mask1 len2 mask2 len3 mask3 len4 mask4 mask\fP
+.Nm ENCODING 
+.Qq EUC
+.Pp
+.Nm VARIABLE
+.Ar len1 
+.Ar mask1 
+.Ar len2 
+.Ar mask2 
+.Ar len3 
+.Ar mask3 
+.Ar len4 
+.Ar mask4 
+.Ar mask
 .Sh DESCRIPTION
 The
 .Nm EUC
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index c90015908907..d36dd3a168d1 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -67,7 +67,7 @@ The
 .Fn setrunelocale
 controls the type of encoding used to represent runes as multibyte strings
 as well as the properties of the runes as defined in
-\fB<ctype.h>\fP.
+.Aq Pa ctype.h .
 The
 .Fa locale
 argument indicates which locale to load.
@@ -233,9 +233,10 @@ function returns the number of bytes needed to store
 as a multibyte string.
 .Sh FILES
 .Bl -tag -width /usr/share/locale/locale/LC_CTYPE -compact
-.It Pa $PATH_LOCALE/\fIlocale\fP/LC_CTYPE
-.It Pa /usr/share/locale/\fIlocale\fP/LC_CTYPE
-binary LC_CTYPE file for the locale \fIlocale\fP.
+.It Pa $PATH_LOCALE/ Ns Em locale Ns /LC_CTYPE
+.It Pa /usr/share/locale/ Ns Em locale Ns /LC_CTYPE
+binary LC_CTYPE file for the locale 
+.Em locale .
 .El
 .Sh "SEE ALSO
 .Xr mbrune 3 ,
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index 244c0be66f9e..18ee80b90842 100644
--- a/lib/libc/locale/setlocale.3
+++ b/lib/libc/locale/setlocale.3
@@ -271,10 +271,12 @@ or
 .Fn localeconv .
 .Sh FILES
 .Bl -tag -width /usr/share/locale/locale/category -compact
-.It Pa $PATH_LOCALE/\fIlocale\fP/\fIcategory\fP
-.It Pa /usr/share/locale/\fIlocale\fP/\fIcategory\fP
-locale file for the locale \fIlocale\fP
-and the category \fIcategory\fP.
+.It Pa $PATH_LOCALE/ Ns Em locale/category
+.It Pa /usr/share/locale/ Ns Em locale/category
+locale file for the locale 
+.Em locale
+and the category 
+.Em category .
 .El
 .Sh "SEE ALSO
 .Xr colldef 1 ,
diff --git a/lib/libc/locale/utf2.4 b/lib/libc/locale/utf2.4
index b8c1e0cb34c5..fd1b6fb4b09d 100644
--- a/lib/libc/locale/utf2.4
+++ b/lib/libc/locale/utf2.4
@@ -41,7 +41,8 @@
 .Nm utf2
 .Nd "Universal character set Transformation Format encoding of runes
 .Sh SYNOPSIS
-\fBENCODING "UTF2"\fP
+.Nm ENCODING
+.Qq UTF2
 .Sh DESCRIPTION
 The
 .Nm UTF2
diff --git a/lib/libc/locale/utf2.5 b/lib/libc/locale/utf2.5
index b8c1e0cb34c5..fd1b6fb4b09d 100644
--- a/lib/libc/locale/utf2.5
+++ b/lib/libc/locale/utf2.5
@@ -41,7 +41,8 @@
 .Nm utf2
 .Nd "Universal character set Transformation Format encoding of runes
 .Sh SYNOPSIS
-\fBENCODING "UTF2"\fP
+.Nm ENCODING
+.Qq UTF2
 .Sh DESCRIPTION
 The
 .Nm UTF2