* tmac/doc.tmac (Cd): Simplify code.

* tmac/groff_mdoc.man: Document some behaviour of `Cd' request.

3 files changed, 20 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 9053961d..855181ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-06  Ruslan Ermilov  <ru@freebsd.org>
+
+	* tmac/doc.tmac (Cd): Simplify code.
+	* tmac/groff_mdoc.man: Document some behaviour of `Cd' request.
+
 2001-04-06  Werner Lemberg  <wl@gnu.org>
 
 	Implement continuous underlining for nroff mode.  To do that, a new
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 861c74b4..17669bf1 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -663,13 +663,9 @@
 .\" NS   doc-arg-ptr
 .\" NS   doc-curr-font
 .\" NS   doc-curr-size
-.\" NS   doc-in-synopsis-count
-.\" NS   doc-indent-synopsis
 .\" NS   doc-macro-name
 .\" NS
 .\" NS width register `Cd' set in doc-common
-.\"
-.\" needs work - not very translatable
 .
 .de Cd
 .  if !\n[doc-arg-limit] \{\
@@ -681,8 +677,6 @@
 .      tm Usage: .Cd configuration_file_declaration ... (#\n[.c])
 .  \}
 .
-.  br
-.
 .  if !\n[doc-arg-limit] \
 .    return
 .
@@ -690,29 +684,14 @@
 .  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
 .    nr doc-curr-font \n[.f]
 .    nr doc-curr-size \n[.ps]
+.    nop \*[doc-Nm-font]\c
 .
-.    ie \n[doc-in-synopsis-count] \{\
-.      if "\*[doc-macro-name]"Cd" \{\
-.        rs
-.        ie (\n[doc-in-synopsis-count] > 1) \
-.          br
-.        el \{\
-.          if !\n[doc-indent-synopsis] \
-.            nr doc-indent-synopsis \n[doc-display-indent]u
-.        \}
-.        in +\n[doc-indent-synopsis]u
-.        ti -\n[doc-indent-synopsis]u
-.        nr doc-in-synopsis-count +1
-.      \}
-.
-.      nop \*[doc-Nm-font]\c
-.      doc-print-recursive
-.      in -\n[doc-indent-synopsis]u
-.    \}
-.    el \{\
-.      nop \*[doc-Nm-font]\c
-.      doc-print-recursive
-.  \}\}
+.    if \n[doc-in-synopsis-count] \
+.      br
+.    doc-print-recursive
+.    if \n[doc-in-synopsis-count] \
+.      br
+.  \}
 .  el \{\
 .    tm Usage: .Cd configuration_file_declaration ... (#\n[.c])
 .    doc-reset-args
@@ -928,7 +907,7 @@
 .\" NS   doc-curr-font
 .\" NS   doc-curr-size
 .\" NS   doc-in-synopsis-count
-.\" NS   doc-indent-synopsis,
+.\" NS   doc-indent-synopsis
 .\" NS   doc-macro-name
 .\" NS
 .\" NS width register `Nm' set in doc-common
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index ff8460fc..4c0f6f24 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -1198,10 +1198,15 @@ declaration for a device interface in a section four manual.
 .Pp
 .Bl -tag -xwidth ".Li .Cd\ Xdevice\ le0\ at\ scode?X" -offset 15n
 .It Li ".Cd \*[q]device le0 at scode?\*[q]"
-\# since .Cd causes a break we use .Nm
-.Nm "device le0 at scode?"
+.Cd "device le0 at scode?"
 .El
 .Pp
+In the
+.Sx SYNOPSIS
+section a
+.Ql .Cd
+request causes a line break before and after its arguments are printed.
+.Pp
 .
 The default width is 12n.
 .