summaryrefslogtreecommitdiff
path: root/tmac
diff options
context:
space:
mode:
authorwlemb <wlemb>2002-10-07 09:14:44 +0000
committerwlemb <wlemb>2002-10-07 09:14:44 +0000
commit6b518ebc7930c1594c7987e2c0390cf72c47c806 (patch)
tree41d097d24b8a42764d1d1428ecdc28928814f11c /tmac
parent0a718093b72d36a306d8954d4df78d507828d023 (diff)
downloadgroff-6b518ebc7930c1594c7987e2c0390cf72c47c806.tar.gz
* tmac/doc-common (Ss): Add final `.ns' (similar to `.Sh') to
suppress additional whitespace after the header. * tmac/doc-ditroff, tmac/doc-nroff (Am): New string to be in sync with NetBSD. * src/preproc/grn/grn.man, tmac/groff_mdoc.man, NEWS: Updated. * tmac/doc-common(doc-volume-operating-system-ateol): New flag. (Dt): Use it to improve language localization (especially Russian and French). * src/preproc/grn/gprint.h (BSPLINE, BEZIER): New macros. * src/preproc/grn/hdb.cc (DBGetType): Parse spline and bezier drawing commands. * src/preproc/grn/hgraph.cc (drawwig): Add parameter to control curve type. Call `picurve' for BSPLINE. (HGPrintElt): Handle BSPLINE. * src/preproc/grn/README: Document it.
Diffstat (limited to 'tmac')
-rw-r--r--tmac/doc-common23
-rw-r--r--tmac/doc-ditroff1
-rw-r--r--tmac/doc-nroff1
-rw-r--r--tmac/groff_mdoc.man3
4 files changed, 20 insertions, 8 deletions
diff --git a/tmac/doc-common b/tmac/doc-common
index 10dc9dca..7310d191 100644
--- a/tmac/doc-common
+++ b/tmac/doc-common
@@ -231,6 +231,7 @@
.\" an alternative, more detailed scheme for naming the manual sections
.\"
.ds doc-volume-operating-system BSD
+.nr doc-volume-operating-system-ateol 0
.ds doc-volume-ds-1 General Commands Manual
.ds doc-volume-ds-2 System Calls Manual
.ds doc-volume-ds-3 Library Functions Manual
@@ -305,13 +306,20 @@
. ds doc-section \$2
. ie \B\$2 \{\
. if ((\$2 >= 1) & (\$2 <= 9)) \{\
-. ds doc-volume "\*[doc-volume-operating-system]
-. if \A\$3 \{\
-. if d doc-volume-as-\$3 \
-. as doc-volume "/\*[doc-volume-as-\$3]
-. \}
-. as doc-volume " \*[doc-volume-ds-\$2]
-. \}\}
+. ie \n[doc-volume-operating-system-ateol] \{\
+. ds doc-volume "\*[doc-volume-ds-\$2] \*[doc-volume-operating-system]
+. if \A\$3 \{\
+. if d doc-volume-as-\$3 \
+. as doc-volume "/\*[doc-volume-as-\$3]
+. \}\}
+. el \{\
+. ds doc-volume "\*[doc-volume-operating-system]
+. if \A\$3 \{\
+. if d doc-volume-as-\$3 \
+. as doc-volume "/\*[doc-volume-as-\$3]
+. \}
+. as doc-volume " \*[doc-volume-ds-\$2]
+. \}\}\}
. el \{\
. ie "\$2"unass" .ds doc-volume DRAFT
. el \{ .ie "\$2"draft" .ds doc-volume DRAFT
@@ -884,6 +892,7 @@
. if !\n[cR] \
. ne 2
. br
+. ns
. \}
..
.
diff --git a/tmac/doc-ditroff b/tmac/doc-ditroff
index 8b8bd00a..94f7e504 100644
--- a/tmac/doc-ditroff
+++ b/tmac/doc-ditroff
@@ -187,6 +187,7 @@
.ds If \[if]
.ds Na \f[I]NaN\f[]
.ds Ba \f[R]|\f[]
+.ds Am &
.
.nr gX 0
.
diff --git a/tmac/doc-nroff b/tmac/doc-nroff
index 250163c1..9c5f3075 100644
--- a/tmac/doc-nroff
+++ b/tmac/doc-nroff
@@ -165,6 +165,7 @@
.ds Pm \[+-]
.ds Na \f[I]NaN\f[]
.ds Ba \f[R]|\f[]
+.ds Am &
.
.\" Unicode TTYs have all glyph forms; for other TTY character sets we need
.\" character representations which are different from GNU troff's standard
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index 3ffe00d8..5033cb57 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -46,7 +46,7 @@
.\" for an already extremely slow package.
.\"
.
-.Dd July 20, 2001
+.Dd October 07, 2002
.Os
.Dt GROFF_MDOC 7
.
@@ -3843,6 +3843,7 @@ The following strings are predefined:
.It Li Gt Ta > Ta \*[Gt] Ta "greater than"
.It Li Pm Ta +\- Ta \*[Pm] Ta "plus minus"
.It Li If Ta infinity Ta \*[If] Ta "infinity"
+.It Li Am Ta \*[Am] Ta \*[Am] Ta "ampersand"
.It Li Na Ta \*[Na] Ta \*[Na] Ta "not a number"
.It Li Ba Ta \*[Ba] Ta \*[Ba] Ta "vertical bar"
.El