* LI Daobing <[email protected]>, 2006-07-18, 21:14:
@@ -255,8 +255,8 @@
.
They include
.BR \e\e ,
-.BR \e' ,
-.BR \e` ,
+.BR \e\(aq ,
+.BR \e\` ,
.BR \e- ,
.BR \e. ,
and
@@ -359,7 +359,7 @@
the ISO Latin-1 `Apostrophe' (code\ 39) prints as ', a right single
quotation mark; the corresponding ISO Latin-1 characters can be obtained
with
-.B \e`
+.B \e\(aq
and
.BR \e(aq .
(The last hunk looks incorrect to me, but it no longer applies cleanly
anyway, so never mind...)
There are many other similar bugs in groff manpages. :(
I believe that the attached patch fixes all ' vs \' vs \(aq, ` vs \`,
and - vs \- mistakes. (It also includes fix for #551111.)
--
Jakub Wilk
diff --git a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@
extratmacdirs.patch
papersize-config.patch
load-desc-failure.patch
+manpage-update
diff --git a/man/ditroff.man b/man/ditroff.man
--- a/man/ditroff.man
+++ b/man/ditroff.man
@@ -119,7 +119,7 @@
and
.IR "Brian Kernighan" ,
see
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
Bell Labs CSTR\~#54
.UE .
.
@@ -131,7 +131,7 @@
is the original documentation of the first multi-device troff
.RI ( ditroff ),
see
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz
Bell Labs CSTR\~#97
.UE .
.
@@ -177,7 +177,7 @@
the GNU roff distribution.
.
It was written by
-.MT groff-bernd.warken-72@\:web.de
+.MT groff\-bernd.warken\-72@\:web.de
Bernd Warken
.ME
and is maintained by
diff --git a/man/groff.man b/man/groff.man
--- a/man/groff.man
+++ b/man/groff.man
@@ -1036,7 +1036,7 @@
register.
.
If the expression starts with a
-.squoted_char -
+.squoted_char \-
the value of the expression is subtracted from the request value.
.
.P
@@ -1182,7 +1182,7 @@
Embolden
.I font
by
-.IR N \\-1
+.IR N \-1
units.
.
.TPx
@@ -1906,7 +1906,7 @@
Set additional intra-line skip value to
.IR N ,
i.e.,
-.IR N \\-1
+.IR N \-1
blank lines are inserted after each text output line.
.
.TPx
@@ -2745,19 +2745,19 @@
to be independent from the current escape character.
.
.TP
-.ESC \[cq]
+.ESC \[aq]
The acute accent \[aa]; same as
.esc (aa .
Unescaped: apostrophe, right quotation mark, single quote (ASCII 0x27).
.
.TP
-.ESC `
+.ESC \`
The grave accent \[ga]; same as
.esc (ga .
Unescaped: left quote, backquote (ASCII 0x60).
.
.TP
-.ESC -
+.ESC \-
The \- (minus) sign in the current font.
.
.TP
@@ -3379,13 +3379,13 @@
.ESC (!=
Not equal
.TP
-.ESC (->
+.ESC (\->
Right arrow
.TP
-.ESC (<-
+.ESC (<\-
Left arrow
.TP
-.ESC (+-
+.ESC (+\-
Plus-minus sign
.PD
.RE
@@ -4070,7 +4070,7 @@
.\" --------------------------------------------------------------------
.
Report bugs to the
-.MT [email protected]
+.MT bug\[email protected]
groff bug mailing list
.ME .
Include a complete, self-contained example that will allow the bug to
@@ -4100,7 +4100,7 @@
the GNU roff distribution.
.
It was written by
-.MT [email protected]
+.MT groff\-bernd.warken\[email protected]
Bernd Warken
.ME ;
it is maintained by
@@ -4148,7 +4148,7 @@
.
.TP
.I [CSTR\~#54]
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
Nroff/\:Troff User's Manual by Ossanna & Kernighan
.UE
\[em] the bible for classical troff.
diff --git a/man/groff_char.man b/man/groff_char.man
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -124,7 +124,7 @@
also produce single glyphs; these exist for historical reasons or
are printable versions of syntactical characters.
.
-They include `\f(CW\e\e\fP', `\f(CW\e\'\fP', `\f(CW\e`\fP', `\f(CW\e-\fP',
+They include `\f(CW\e\e\fP', `\f(CW\e\(aq\fP', `\f(CW\e\`\fP', `\f(CW\e\-\fP',
`\f(CW\e.\fP', and `\f(CW\ee\fP'; see
.BR groff (@MAN7EXT@).
.
@@ -225,7 +225,7 @@
.TP
.B \`
the ISO \%latin1 `Grave Accent' (code\ 96) prints as `, a left single
-quotation mark; the original character can be obtained with `\f(CW\e`\fP'.
+quotation mark; the original character can be obtained with `\f(CW\e\`\fP'.
.
.
.TP
@@ -235,9 +235,9 @@
.
.
.TP
-.B -
+.B \-
the ISO \%latin1 `Hyphen, Minus Sign' (code\ 45) prints as a hyphen; a
-minus sign can be obtained with `\f(CW\e-\fP'.
+minus sign can be obtained with `\f(CW\e\-\fP'.
.
.
.TP
@@ -467,8 +467,8 @@
The latter is internally mapped to glyph name `\e\fIc\fP'.
.
By default, groff defines a single glyph name starting with a backslash,
-namely \%`\e-', which can be either accessed as `\f(CW\e\-\fP' or
-`\f(CW\e[-]\fP'.
+namely \%`\e\-', which can be either accessed as `\f(CW\e\-\fP' or
+`\f(CW\e[\-]\fP'.
.
.TP
\f(CW\e[\fP\,\fIbase_glyph composite_1 composite_2 .\|.\|.\/\fP\f(CW]\fP
@@ -508,7 +508,7 @@
l l l l l.
Output Input PostScript Unicode Notes
_
-\[-D] \e[-D] Eth u00D0 uppercase eth
+\[-D] \e[\-D] Eth u00D0 uppercase eth
\[Sd] \e[Sd] eth u00F0 lowercase eth
\[TP] \e[TP] Thorn u00DE uppercase thorn
\[Tp] \e[Tp] thorn u00FE lowercase thorn
@@ -548,20 +548,20 @@
l l l l l.
Output Input PostScript Unicode Notes
_
-\['A] \e['A] Aacute u0041_0301
-\['C] \e['C] Cacute u0043_0301
-\['E] \e['E] Eacute u0045_0301
-\['I] \e['I] Iacute u0049_0301
-\['O] \e['O] Oacute u004F_0301
-\['U] \e['U] Uacute u0055_0301
-\['Y] \e['Y] Yacute u0059_0301
-\['a] \e['a] aacute u0061_0301
-\['c] \e['c] cacute u0063_0301
-\['e] \e['e] eacute u0065_0301
-\['i] \e['i] iacute u0069_0301
-\['o] \e['o] oacute u006F_0301
-\['u] \e['u] uacute u0075_0301
-\['y] \e['y] yacute u0079_0301
+\['A] \e[\(aqA] Aacute u0041_0301
+\['C] \e[\(aqC] Cacute u0043_0301
+\['E] \e[\(aqE] Eacute u0045_0301
+\['I] \e[\(aqI] Iacute u0049_0301
+\['O] \e[\(aqO] Oacute u004F_0301
+\['U] \e[\(aqU] Uacute u0055_0301
+\['Y] \e[\(aqY] Yacute u0059_0301
+\['a] \e[\(aqa] aacute u0061_0301
+\['c] \e[\(aqc] cacute u0063_0301
+\['e] \e[\(aqe] eacute u0065_0301
+\['i] \e[\(aqi] iacute u0069_0301
+\['o] \e[\(aqo] oacute u006F_0301
+\['u] \e[\(aqu] uacute u0075_0301
+\['y] \e[\(aqy] yacute u0079_0301
\[:A] \e[:A] Adieresis u0041_0308 A with umlaut
\[:E] \e[:E] Edieresis u0045_0308
\[:I] \e[:I] Idieresis u0049_0308
@@ -584,16 +584,16 @@
\[^i] \e[^i] icircumflex u0069_0302
\[^o] \e[^o] ocircumflex u006F_0302
\[^u] \e[^u] ucircumflex u0075_0302
-\[`A] \e[`A] Agrave u0041_0300
-\[`E] \e[`E] Egrave u0045_0300
-\[`I] \e[`I] Igrave u0049_0300
-\[`O] \e[`O] Ograve u004F_0300
-\[`U] \e[`U] Ugrave u0055_0300
-\[`a] \e[`a] agrave u0061_0300
-\[`e] \e[`e] egrave u0065_0300
-\[`i] \e[`i] igrave u0069_0300
-\[`o] \e[`o] ograve u006F_0300
-\[`u] \e[`u] ugrave u0075_0300
+\[`A] \e[\`A] Agrave u0041_0300
+\[`E] \e[\`E] Egrave u0045_0300
+\[`I] \e[\`I] Igrave u0049_0300
+\[`O] \e[\`O] Ograve u004F_0300
+\[`U] \e[\`U] Ugrave u0055_0300
+\[`a] \e[\`a] agrave u0061_0300
+\[`e] \e[\`e] egrave u0065_0300
+\[`i] \e[\`i] igrave u0069_0300
+\[`o] \e[\`o] ograve u006F_0300
+\[`u] \e[\`u] ugrave u0075_0300
\[~A] \e[~A] Atilde u0041_0303
\[~N] \e[~N] Ntilde u004E_0303
\[~O] \e[~O] Otilde u004F_0303
@@ -624,7 +624,7 @@
Output Input PostScript Unicode Notes
_
\[a"] \e[a"] hungarumlaut u030B (u02DD) (Hungarian)
-\[a-] \e[a-] macron u0304 (u00AF)
+\[a-] \e[a\-] macron u0304 (u00AF)
\[a.] \e[a.] dotaccent u0307 (u02D9)
\[a^] \e[a^] circumfle u0302 (u005E)
\[aa] \e[aa] acute u0301 (u00B4) +
@@ -702,25 +702,25 @@
\&.\e" The first argument is placed at the top.
\&.\e" The pile is returned in string `pile'
\&.eo
-\&.de pile-make
-\&. nr pile-wd 0
-\&. nr pile-ht 0
-\&. ds pile-args
+\&.de pile\-make
+\&. nr pile\-wd 0
+\&. nr pile\-ht 0
+\&. ds pile\-args
\&.
-\&. nr pile-# \en[.$]
-\&. while \en[pile-#] \e{\e
-\&. nr pile-wd (\en[pile-wd] >? \ew'\e$[\en[pile-#]]')
-\&. nr pile-ht +(\en[rst] - \en[rsb])
-\&. as pile-args \ev'\en[rsb]u'\e"
-\&. as pile-args \eZ'\e$[\en[pile-#]]'\e"
-\&. as pile-args \ev'-\en[rst]u'\e"
-\&. nr pile-# -1
+\&. nr pile\-# \en[.$]
+\&. while \en[pile\-#] \e{\e
+\&. nr pile\-wd (\en[pile\-wd] >? \ew\(aq\e$[\en[pile\-#]]\(aq)
+\&. nr pile\-ht +(\en[rst] \- \en[rsb])
+\&. as pile\-args \ev\(aq\en[rsb]u\(aq\e"
+\&. as pile\-args \eZ\(aq\e$[\en[pile\-#]]\(aq(\e"
+\&. as pile\-args \ev\aq(\-\en[rst]u\(aq\e"
+\&. nr pile\-# \-1
\&. \e}
\&.
-\&. ds pile \ev'(-0.5m + (\en[pile-ht]u / 2u))'\e"
-\&. as pile \e*[pile-args]\e"
-\&. as pile \ev'((\en[pile-ht]u / 2u) + 0.5m)'\e"
-\&. as pile \eh'\en[pile-wd]u'\e"
+\&. ds pile \ev\(aq(\-0.5m + (\en[pile\-ht]u / 2u))\(aq\e"
+\&. as pile \e*[pile\-args]\e"
+\&. as pile \ev\(aq((\en[pile\-ht]u / 2u) + 0.5m)\(aq\e"
+\&. as pile \eh\(aq\en[pile\-wd]u\(aq\e"
\&..
\&.ec
.ft
@@ -797,8 +797,8 @@
l l l l l.
Output Input PostScript Unicode Notes
_
-\[<-] \e[<-] arrowleft u2190 +
-\[->] \e[->] arrowright u2192 +
+\[<-] \e[<\-] arrowleft u2190 +
+\[->] \e[\->] arrowright u2192 +
\[<>] \e[<>] arrowboth u2194 (horizontal)
\[da] \e[da] arrowdown u2193 +
\[ua] \e[ua] arrowup u2191 +
@@ -963,9 +963,9 @@
\[pl] \e[pl] plus u002B plus in special font +
\[mi] \e[mi] minus u2212 minus in special font +
-\[-+] \e[-+] uni2213 u2213
-\[+-] \e[+-] plusminus u00B1 +
-\[t+-] \e[t+-] plusminus u00B1 text variant of `+\-'
+\[-+] \e[\-+] uni2213 u2213
+\[+-] \e[+\-] plusminus u00B1 +
+\[t+-] \e[t+\-] plusminus u00B1 text variant of `+\-'
\[pc] \e[pc] periodcentered u00B7
\[md] \e[md] dotmath u22C5 multiplication dot
\[mu] \e[mu] multiply u00D7 +
@@ -1028,7 +1028,7 @@
\[Re] \e[Re] Rfraktur u211C Gothic R, real
\[wp] \e[wp] weierstrass u2118 Weierstrass p
\[pd] \e[pd] partialdiff u2202 partial differentiation +
-\[-h] \e[-h] uni210F u210F Planck constant / 2pi
+\[-h] \e[\-h] uni210F u210F Planck constant / 2pi
\[hbar] \e[hbar] uni210F u210F
.TE
.
@@ -1168,7 +1168,7 @@
Werner Lemberg
.ME
and
-.MT [email protected]
+.MT groff\-bernd.warken\[email protected]
Bernd Warken
.ME .
.
diff --git a/man/groff_diff.man b/man/groff_diff.man
--- a/man/groff_diff.man
+++ b/man/groff_diff.man
@@ -290,7 +290,7 @@
.\" --------------------------------------------------------------------
.
.TP
-.BI \[rs]A' anything '
+.BI \[rs]A\[aq] anything \[aq]
This expands to
.B 1
or\~\c
@@ -309,7 +309,7 @@
associative table.
.
.TP
-.BI \[rs]B' anything '
+.BI \[rs]B\[aq] anything \[aq]
This expands to
.B 1
or\~\c
@@ -325,7 +325,7 @@
is empty.
.
.TP
-.BI \[rs]C' xxx '
+.BI \[rs]C\[aq] xxx \[aq]
Typeset glyph named
.IR xxx .
Normally it is more convenient to use
@@ -347,8 +347,8 @@
.RS
.IP
.EX
-\&.ds { \[rs]v'\-.3m'\[rs]s'\[rs]En[.s]*6u/10u'
-\&.ds } \[rs]s0\[rs]v'.3m'
+\&.ds { \[rs]v\[aq]\-.3m\[aq]\[rs]s\[aq]\[rs]En[.s]*6u/10u\[aq]
+\&.ds } \[rs]s0\[rs]v\[aq].3m\[aq]
.EE
.RE
.
@@ -395,13 +395,13 @@
.TQ
.BI \[rs]M[ xxx ]
Set background color for filled objects drawn with the
-.BI \[rs]D' .\|.\|. '
+.BI \[rs]D\[aq] .\|.\|. \[aq]
commands.
.B \[rs]M[]
switches back to the previous color.
.
.TP
-.BI \[rs]N' n '
+.BI \[rs]N\[aq] n \[aq]
Typeset the glyph with index\~\c
.I n
in the current font.
@@ -424,7 +424,7 @@
.RS
.IP
.EX
-\&.char \[rs][phone] \[rs]f(ZD\[rs]N'37'
+\&.char \[rs][phone] \[rs]f(ZD\[rs]N\[aq]37\[aq]
.EE
.RE
.
@@ -543,7 +543,7 @@
.RE
.
.TP
-.BI \[rs]R' name\ \[+-]n '
+.BI \[rs]R\[aq] name\ \[+-]n \[aq]
This has the same effect as
.
.RS
@@ -566,9 +566,9 @@
.TQ
.BI \[rs]s\[+-][ n ]
.TQ
-.BI \[rs]s'\[+-] n '
+.BI \[rs]s\[aq]\[+-] n \[aq]
.TQ
-.BI \[rs]s\[+-]' n '
+.BI \[rs]s\[+-]\[aq] n \[aq]
Set the point size to
.I n
scaled points;
@@ -596,7 +596,7 @@
.TQ
.BI \[rs]Y[ xxx ]
This is approximately equivalent to
-.BI \[rs]X'\[rs]*[ xxx ]'\f[R].
+.BI \[rs]X\[aq]\[rs]*[ xxx ]\[aq]\f[R].
However the contents of the string or macro
.I xxx
are not interpreted; also it is permitted for
@@ -611,7 +611,7 @@
extension.
.
.TP
-.BI \[rs]Z' anything '
+.BI \[rs]Z\[aq] anything \[aq]
Print anything and then restore the horizontal and vertical position;
.I anything
may not contain tabs or leaders.
@@ -1131,7 +1131,7 @@
so that they can be referred to from other requests easily (currently
.B .cflags
only).
-Character ranges (indicated by an intermediate `-') and nested classes
+Character ranges (indicated by an intermediate `\-') and nested classes
are possible also.
This is useful to assign properties to a large set of characters.
.
@@ -1527,8 +1527,8 @@
A hyphenation code must be a single input character (not a special
character) other than a digit or a space.
.
-Initially each lower-case letter \%a-z has a hyphenation code, which is
-itself, and each upper-case letter \%A-Z has a hyphenation code which is
+Initially each lower-case letter \%a\-z has a hyphenation code, which is
+itself, and each upper-case letter \%A\-Z has a hyphenation code which is
the lower-case version of itself.
.
See also the
@@ -2662,7 +2662,7 @@
\&.de bp
\&.tm before bp
\&.ie \[rs]\[rs]n[.br] .bp*orig
-\&.el 'bp*orig
+\&.el \[aq]bp*orig
\&.tm after bp
\&..
.EE
@@ -3218,7 +3218,7 @@
is either an
.SM ASCII
character or a glyph (special character)
-.BI \[rs]N' xxx '\f[R],
+.BI \[rs]N\[aq] xxx \[aq]\f[R],
.BI \[rs]( xx
or
.BI \[rs][ xxx ]\f[R];
@@ -3449,7 +3449,7 @@
.
.IP
The corresponding
-.BI \[rs]D'f .\|.\|. '
+.BI \[rs]D\[aq]f .\|.\|. \[aq]
command shouldn't be used since its argument is always rounded to an
integer multiple of the horizontal resolution which can lead to
surprising results.
@@ -3477,7 +3477,7 @@
.IR i -th
vertex at the current position
.
-$+ sum from j=1 to i-1 ( dx sub j , dy sub j )$.
+$+ sum from j=1 to i\-1 ( dx sub j , dy sub j )$.
.
At the moment, GNU pic only uses this command to generate triangles
and rectangles.
@@ -3515,7 +3515,7 @@
.
Given a drawing command of the form
.IP
-\f[B]\[rs]D'\f[I]c\f[R] $x sub 1$ $y sub 1$ $x sub 2$ $y sub 2$ $...$ $x sub n$ $y sub n$\f[B]'\f[R]
+\f[B]\[rs]D\[qa]\f[I]c\f[R] $x sub 1$ $y sub 1$ $x sub 2$ $y sub 2$ $...$ $x sub n$ $y sub n$\f[B]\[aq]\f[R]
.
.P
where
@@ -3713,9 +3713,9 @@
(closing brace),
.RB ` \[rs]\ '
(space),
-.B \[rs]'
+.B \[rs]\[aq]
(single quote),
-.B \[rs]`
+.B \[rs]\`
(backquote),
.B \[rs]\-
(minus),
@@ -3895,7 +3895,7 @@
Werner Lemberg
.ME
and
-.MT [email protected]
+.MT groff\-bernd.warken\[email protected]
Bernd Warken
.ME .
.
@@ -3963,7 +3963,7 @@
of 1976 in the revision of
.I Brian Kernighan
of 1992, being the
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
classical troff documentation
.UE .
.
diff --git a/man/groff_out.man b/man/groff_out.man
--- a/man/groff_out.man
+++ b/man/groff_out.man
@@ -139,7 +139,7 @@
The
.B groff
program provides the option
-.B -Z
+.B \-Z
to inhibit postprocessing, such that the produced
.I intermediate output
is sent to standard output just like calling
@@ -1001,7 +1001,7 @@
These commands are generated by the
.I groff
escape sequences
-.BR \*[@backslash]D'F\ .\|.\|. '
+.BR \*[@backslash]D\[aq]F\ .\|.\|. \[aq]
and
.B \*[@backslash]M
(with no other corresponding graphics commands).
@@ -1052,7 +1052,7 @@
.D-command f n
The argument
.I n
-must be an integer in the range -32767 to 32767.
+must be an integer in the range \-32767 to 32767.
.
.RS
.TP
@@ -1074,7 +1074,7 @@
.IP
.EX
mg 0 0 \n[@maxcolor]
-Df -1
+Df \-1
.EE
.RE
.
@@ -1464,10 +1464,10 @@
.BR groff ,
this is only used for the devices
.BR X75 ,
-.BR X75-12 ,
+.BR X75\-12 ,
.BR X100 ,
and
-.BR X100-12 .
+.BR X100\-12 .
.
For other devices,
the commands
@@ -1531,7 +1531,7 @@
.RS
.P
.EX
-\fBshell>\fP echo "hell world" | groff -Z -T ps
+\fBshell>\fP echo "hell world" | groff \-Z \-T ps
.EE
.
.
@@ -1587,7 +1587,7 @@
.
.P
.EX
-\fBshell>\fP "hell world" | groff -Z -T latin1
+\fBshell>\fP "hell world" | groff \-Z \-T latin1
.EE
.
.
@@ -1653,7 +1653,7 @@
.
.P
.EX
-\fBshell>\fP "hell world" | groff -Z -T X100
+\fBshell>\fP "hell world" | groff \-Z \-T X100
.EE
.
.
@@ -1877,7 +1877,7 @@
.TP
.BR groff (@MAN1EXT@)
option
-.B -Z
+.B \-Z
and further readings on groff.
.
.
@@ -1952,7 +1952,7 @@
The
.I classical troff output language
is described in two AT&T Bell Labs CSTR documents available on-line at
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr.html
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr.html
Bell Labs CSTR site
.UE .
.
@@ -1964,7 +1964,7 @@
.I Brian Kernighan
is the original and most comprehensive documentation on the output
language; see
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz
CSTR\~#97
.UE .
.
@@ -1980,7 +1980,7 @@
isn't as comprehensive as
.I [CSTR\~#97]
regarding the output language; see
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
CSTR\~#54
.UE .
.
@@ -2017,7 +2017,7 @@
extensions of the output language.
.
It was rewritten in 2002 by
-.MT [email protected]
+.MT groff\-bernd.warken\[email protected]
Bernd Warken and is
maintained by
.MT [email protected]
diff --git a/man/groff_tmac.man b/man/groff_tmac.man
--- a/man/groff_tmac.man
+++ b/man/groff_tmac.man
@@ -216,7 +216,7 @@
.RS
.IP
.EX
-\fIsh#\fP groff -ms -mfr foo.ms > foo.ps
+\fIsh#\fP groff \-ms \-mfr foo.ms > foo.ps
.EE
.RE
.
@@ -280,7 +280,7 @@
.
.P
.EX
-groff -Tlatin1 -mlatin9 ...
+groff \-Tlatin1 \-mlatin9 ...
.EE
.
.P
@@ -334,7 +334,7 @@
values in the DESC file (only lowercase; see
.BR groff_font (@MAN5EXT@)
for more) except
-.BR a7 - d7 .
+.BR a7 \- d7 .
.
An appended
.B l
@@ -472,7 +472,7 @@
.EX
\&.am PSPIC
\&.\ \ vpt 0
-\&\[rs]h'(\[rs]\[rs]n[ps-offset]u + \[rs]\[rs]n[ps-deswid]u)'
+\&\[rs]h\[aq](\[rs]\[rs]n[ps-offset]u + \[rs]\[rs]n[ps-deswid]u)\[aq]
\&.\ \ sp -1
\&.\ \ vpt 1
\&..
@@ -503,7 +503,7 @@
.
.
.TP
-.B tty-char
+.B tty\-char
Overrides the definition of standard troff characters and some groff
characters for TTY devices.
.
@@ -1220,7 +1220,7 @@
the GNU roff distribution.
.
It was written by
-.MT [email protected]
+.MT groff\-bernd.warken\[email protected]
Bernd Warken
.ME ;
it is maintained by
diff --git a/man/roff.man b/man/roff.man
--- a/man/roff.man
+++ b/man/roff.man
@@ -891,7 +891,7 @@
.RS
.P
.EX
-LESSOPEN='|lesspipe %s'
+LESSOPEN=\(aq|lesspipe %s\(aq
.EE
.RE
.
@@ -960,7 +960,7 @@
.RS
.IP
.EX
-\&.\[rs]" \%-*-\ nroff\ -*-
+\&.\[rs]" \%\-*\-\ nroff\ \-*\-
.EE
.RE
.
@@ -1094,13 +1094,13 @@
.I troff
and its documentation) that were made public by Caldera since 2001,
e.g.\& of the famous Unix version\~7 for PDP-11 at the
-.UR http://\:www.tuhs.org/\:Archive/\:PDP-11/\:Trees/\:V7
+.UR http://\:www.tuhs.org/\:Archive/\:PDP\-11/\:Trees/\:V7
Unix V7 site
.UE .
.
.TP
Developers at AT&T Bell Labs
-.UR http://\:www.bell-labs.com/
+.UR http://\:www.bell\-labs.com/
Bell Labs Computing and Mathematical Sciences Research
.UE
.
@@ -1109,7 +1109,7 @@
.
.TP
Plan 9
-.UR http://\:plan9.bell-labs.com
+.UR http://\:plan9.bell\-labs.com
The Plan\~9 operating system
.UE
.
@@ -1125,7 +1125,7 @@
.
.TP
CSTR Papers
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr.html
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr.html
The Bell Labs CSTR site
.UE
.
@@ -1162,7 +1162,7 @@
.TP
[CSTR\~#54]
J. F. Ossanna,
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
.I "Nroff/\:Troff User's Manual"
.UE ;
.
@@ -1171,7 +1171,7 @@
.TP
[CSTR\~#97]
Brian Kernighan,
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz
.I "A Typesetter-independent TROFF"
.UE ,
.
@@ -1185,7 +1185,7 @@
.TP
[CSTR\~#114]
Jon L. Bentley and Brian W. Kernighan,
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:114.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:114.ps.gz
.I "GRAP \[en] A Language for Typesetting Graphs"
.UE ;
.
@@ -1194,7 +1194,7 @@
.TP
[CSTR\~#116]
Brian W. Kernighan,
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:116.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:116.ps.gz
.I "PIC \[en] A Graphics Language for Typesetting"
.UE ;
.
@@ -1203,7 +1203,7 @@
.TP
[CSTR\~#122]
J. L. Bentley, L. W. Jelinski, and B. W. Kernighan,
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:122.ps.gz
+.UR http://\:cm.bell\-labs.com/\:cm/\:cs/\:cstr/\:122.ps.gz
.I "CHEM \[en] A Program for Typesetting Chemical Structure Diagrams,"
.I "Computers and Chemistry"
.UE ;
@@ -1264,7 +1264,7 @@
distribution.
.
It was written by
-.MT [email protected]
+.MT groff\-bernd.warken\[email protected]
Bernd Warken
.ME ;
it is maintained by