* tmac/doc-ditroff: Remove useless switch/variable -rC.

(doc-setup-header): Don't set page register `%'.
* tmac/doc-nroff: Remove variable `C'.
(doc-setup-page-layout): Set doc-header-space to .5i unconditionally.
(doc-setup-header): Don't set page register `%'.
Don't call `bp'.
* tmac/doc-common (doc-header): Call `ns'.
(doc-paragraph): Protect .sp with .br so that it survives the
implicit new-page trap.
* tmac/doc.tmac (Bp, Bl, doc-set-vertical-and-indent): Ditto.

* tmac/doc*:Replace ' with . for consistency in all mdoc-related
files if no effect.

1 files changed, 12 insertions, 10 deletions

diff --git a/tmac/doc-common b/tmac/doc-common
index 7310d191..8eafa0e1 100644
--- a/tmac/doc-common
+++ b/tmac/doc-common
@@ -542,7 +542,7 @@
 .  ev doc-env-dh
 .  doc-setup-page-layout
 .  if !\n[cR] \
-'    sp \n[doc-header-space]u
+.    sp \n[doc-header-space]u
 .  nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\f[]'
 .  nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[]'
 .  if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
@@ -553,8 +553,9 @@
 .    as doc-header-string "\|.\|.\|.
 .  \}
 .  tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[]
-'  sp \n[doc-header-space]u
+.  sp \n[doc-header-space]u
 .  ev
+.  ns
 ..
 .
 .
@@ -563,11 +564,11 @@
 .
 .de doc-footer
 .  ie \n[cR] \
-'    br
+.    br
 .  el \{\
 .    ev doc-caption-enviroment
 .    doc-setup-page-layout
-'    sp \n[doc-footer-space]u
+.    sp \n[doc-footer-space]u
 .    ie \n[D] \{\
 .      ie o \
 .        tl %\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[]
@@ -576,7 +577,7 @@
 .    \}
 .    el \
 .      tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]%
-'    bp
+.    bp
 .    ev
 .  \}
 ..
@@ -602,7 +603,7 @@
 .    tm mdoc warning: list open at EOF!  A .Bl directive has no matching .El
 .
 .  if \n[cR] \{\
-'    sp
+.    sp
 .    tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[]
 .    \" suppress empty lines after the footer
 .    pl \n[nl]u
@@ -614,6 +615,7 @@
 .\" NS   insert a paragraph
 .
 .de doc-paragraph
+.  br
 .  sp \n[doc-paragraph-space]u
 .  if !\n[cR] \
 .    ne 2
@@ -761,14 +763,14 @@
 .    doc-parse-args \$@
 .
 .    if t \
-'      ad
+.      ad
 .
 .    \" this resolves e.g. `.Sh "SEE ALSO"'
 .    doc-first-parameter \$*
 .
 .    ie "\*[doc-str-dfp]"\*[doc-section-name]" \{\
 .      doc-setup-header
-'      in 0
+.      in 0
 .    \}
 .    el \{\
 .      nr doc-in-synopsis-section 0
@@ -805,12 +807,12 @@
 .    \}
 .
 .    doc-setup-page-layout
-'    sp
+.    sp
 .    ns
 .    ta T .5i
 .    if !\n[cR] \
 .      ne 3
-'    fi
+.    fi
 .
 .    if t \{\
 .      nr doc-reg-Sh \n[.ss]