svn commit: r202570 - in stable/8: contrib/groff/font/devutf8
contrib/groff/tmac gnu/usr.bin/groff/tmac
Ruslan Ermilov
ru at FreeBSD.org
Mon Jan 18 13:11:38 UTC 2010
Author: ru
Date: Mon Jan 18 13:11:37 2010
New Revision: 202570
URL: http://svn.freebsd.org/changeset/base/202570
Log:
MFC: Sync Groff with trunk except libulog addition.
Modified:
stable/8/contrib/groff/font/devutf8/R.proto
stable/8/contrib/groff/tmac/an-old.tmac
stable/8/contrib/groff/tmac/doc-common
stable/8/contrib/groff/tmac/doc-old.tmac
stable/8/contrib/groff/tmac/doc-syms
stable/8/contrib/groff/tmac/doc.tmac
stable/8/contrib/groff/tmac/groff_mdoc.man
stable/8/gnu/usr.bin/groff/tmac/mdoc.local
Directory Properties:
stable/8/contrib/groff/ (props changed)
stable/8/gnu/usr.bin/groff/ (props changed)
Modified: stable/8/contrib/groff/font/devutf8/R.proto
==============================================================================
--- stable/8/contrib/groff/font/devutf8/R.proto Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/contrib/groff/font/devutf8/R.proto Mon Jan 18 13:11:37 2010 (r202570)
@@ -726,7 +726,7 @@ st 24 0 0x220B
product 24 0 0x220F
coproduct 24 0 0x2210
sum 24 0 0x2211
-\- 24 0 0x002D
+\- 24 0 0x2212
mi "
-+ 24 0 0x2213
** 24 0 0x2217
Modified: stable/8/contrib/groff/tmac/an-old.tmac
==============================================================================
--- stable/8/contrib/groff/tmac/an-old.tmac Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/contrib/groff/tmac/an-old.tmac Mon Jan 18 13:11:37 2010 (r202570)
@@ -630,6 +630,18 @@
. hy \n[HY]
.\}
.
+.\" For UTF-8, map some characters conservatively for the sake
+.\" of easy cut and paste.
+.
+.if '\*[.T]'utf8' \{\
+. rchar \- - ' `
+.
+. char \- \N'45'
+. char - \N'45'
+. char ' \N'39'
+. char ` \N'96'
+.\}
+.
.\" Load local modifications.
.mso man.local
.
Modified: stable/8/contrib/groff/tmac/doc-common
==============================================================================
--- stable/8/contrib/groff/tmac/doc-common Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/contrib/groff/tmac/doc-common Mon Jan 18 13:11:37 2010 (r202570)
@@ -46,6 +46,7 @@
.nr %Q 1
.nr %R 1
.nr %T 1
+.nr %U 1
.nr %V 1
.nr Ac 3
.nr Ad 12n
@@ -77,6 +78,7 @@
.nr Dq 12n
.nr Ds 6n\" many manpages still use this as a -width value
.nr Dv 12n
+.nr Dx 1
.nr Ec 3
.nr Ef 8n\" ?
.nr Ek 8n\" ?
@@ -219,6 +221,7 @@
.\" NS doc-document-title
.\" NS doc-section
.\" NS doc-volume
+.\" NS doc-command-name
.\" NS
.\" NS local variables:
.\" NS doc-volume-as-XXX
@@ -319,6 +322,7 @@
. ds doc-document-title UNTITLED
. ds doc-volume LOCAL
. ds doc-section Null
+. ds doc-command-name
.
. if !"\$1"" \
. ds doc-document-title "\$1
@@ -357,6 +361,12 @@
. if !"\$3"" \
. if "\*[doc-volume]"LOCAL" \
. ds doc-volume \$3
+.
+. if !\n[cR] \
+. if \n[nl] \{\
+ . doc-setup-header
+. bp
+. \}
..
.
.
@@ -379,6 +389,7 @@
.\" NS
.\" NS modifies:
.\" NS doc-operating-system
+.\" NS doc-command-name
.\" NS
.\" NS local variables:
.\" NS doc-operating-system-XXX-XXX
@@ -435,9 +446,14 @@
.ds doc-operating-system-NetBSD-2.0 2.0
.ds doc-operating-system-NetBSD-2.0.1 2.0.1
.ds doc-operating-system-NetBSD-2.0.2 2.0.2
+.ds doc-operating-system-NetBSD-2.0.3 2.0.3
.ds doc-operating-system-NetBSD-2.1 2.1
.ds doc-operating-system-NetBSD-3.0 3.0
+.ds doc-operating-system-NetBSD-3.0.1 3.0.1
+.ds doc-operating-system-NetBSD-3.0.2 3.0.2
+.ds doc-operating-system-NetBSD-3.1 3.1
.ds doc-operating-system-NetBSD-4.0 4.0
+.ds doc-operating-system-NetBSD-4.0.1 4.0.1
.
.ds doc-operating-system-FreeBSD-1.0 1.0
.ds doc-operating-system-FreeBSD-1.1 1.1
@@ -486,23 +502,48 @@
.ds doc-operating-system-FreeBSD-6.0 6.0
.ds doc-operating-system-FreeBSD-6.1 6.1
.ds doc-operating-system-FreeBSD-6.2 6.2
+.ds doc-operating-system-FreeBSD-6.3 6.3
+.ds doc-operating-system-FreeBSD-6.4 6.4
.ds doc-operating-system-FreeBSD-7.0 7.0
+.ds doc-operating-system-FreeBSD-7.1 7.1
.
-.ds doc-operating-system-Darwin-8.0.0 8.0.0
-.ds doc-operating-system-Darwin-8.1.0 8.1.0
-.ds doc-operating-system-Darwin-8.2.0 8.2.0
-.ds doc-operating-system-Darwin-8.3.0 8.3.0
-.ds doc-operating-system-Darwin-8.4.0 8.4.0
-.ds doc-operating-system-Darwin-8.5.0 8.5.0
-.
-.ds doc-operating-system-DragonFly-1.0 1.0
-.ds doc-operating-system-DragonFly-1.1 1.1
-.ds doc-operating-system-DragonFly-1.2 1.2
-.ds doc-operating-system-DragonFly-1.3 1.3
-.ds doc-operating-system-DragonFly-1.4 1.4
-.ds doc-operating-system-DragonFly-1.5 1.5
+.ds doc-operating-system-Darwin-8.0.0 8.0.0
+.ds doc-operating-system-Darwin-8.1.0 8.1.0
+.ds doc-operating-system-Darwin-8.2.0 8.2.0
+.ds doc-operating-system-Darwin-8.3.0 8.3.0
+.ds doc-operating-system-Darwin-8.4.0 8.4.0
+.ds doc-operating-system-Darwin-8.5.0 8.5.0
+.ds doc-operating-system-Darwin-8.6.0 8.6.0
+.ds doc-operating-system-Darwin-8.7.0 8.7.0
+.ds doc-operating-system-Darwin-8.8.0 8.8.0
+.ds doc-operating-system-Darwin-8.9.0 8.9.0
+.ds doc-operating-system-Darwin-8.10.0 8.10.0
+.ds doc-operating-system-Darwin-8.11.0 8.11.0
+.ds doc-operating-system-Darwin-9.0.0 9.0.0
+.ds doc-operating-system-Darwin-9.1.0 9.1.0
+.ds doc-operating-system-Darwin-9.2.0 9.2.0
+.ds doc-operating-system-Darwin-9.3.0 9.3.0
+.ds doc-operating-system-Darwin-9.4.0 9.4.0
+.ds doc-operating-system-Darwin-9.5.0 9.5.0
+.ds doc-operating-system-Darwin-9.6.0 9.6.0
+.
+.ds doc-operating-system-DragonFly-1.0 1.0
+.ds doc-operating-system-DragonFly-1.1 1.1
+.ds doc-operating-system-DragonFly-1.2 1.2
+.ds doc-operating-system-DragonFly-1.3 1.3
+.ds doc-operating-system-DragonFly-1.4 1.4
+.ds doc-operating-system-DragonFly-1.5 1.5
+.ds doc-operating-system-DragonFly-1.6 1.6
+.ds doc-operating-system-DragonFly-1.8 1.8
+.ds doc-operating-system-DragonFly-1.8.1 1.8.1
+.ds doc-operating-system-DragonFly-1.10 1.10
+.ds doc-operating-system-DragonFly-1.12 1.12
+.ds doc-operating-system-DragonFly-1.12.2 1.12.2
+.ds doc-operating-system-DragonFly-2.0 2.0
.
.de Os
+. ds doc-command-name
+.
. ie "\$1"" \
. ds doc-operating-system "\*[doc-default-operating-system]
. el \{ .ie "\$1"ATT" \{\
@@ -563,6 +604,7 @@
.\" NS
.\" NS modifies:
.\" NS doc-date-string
+.\" NS doc-command-name
.\" NS
.\" NS local variables:
.\" NS doc-date-XXX
@@ -583,6 +625,8 @@
.ds doc-date-12 December
.
.de Dd
+. ds doc-command-name
+.
. ie \n[.$] \{\
. ie (\n[.$] == 3) \
. ds doc-date-string \$1\~\$2 \$3
@@ -1128,6 +1172,8 @@
. tm doc-reference-title-count == \n[doc-reference-title-count]
. tm doc-reference-title-name == `\*[doc-reference-title-name]'
. tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]'
+. tm doc-url-count == \n[doc-url-count]
+. tm doc-url-name == `\*[doc-url-name]'
. tm doc-volume-count == \n[doc-volume-count]
. tm doc-volume-name == `\*[doc-volume-name]'
. tm doc-have-author == \n[doc-have-author]
Modified: stable/8/contrib/groff/tmac/doc-old.tmac
==============================================================================
--- stable/8/contrib/groff/tmac/doc-old.tmac Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/contrib/groff/tmac/doc-old.tmac Mon Jan 18 13:11:37 2010 (r202570)
@@ -40,7 +40,7 @@
.ds aD \fI
.\" Argument Reference Style
.ds aR \f(CO
-.\" Interactive Comand Modifier (flag)
+.\" Interactive Command Modifier (flag)
.ds cM \f(CB
.\" Emphasis (in the English sense - usually italics)
.ds eM \fI
Modified: stable/8/contrib/groff/tmac/doc-syms
==============================================================================
--- stable/8/contrib/groff/tmac/doc-syms Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/contrib/groff/tmac/doc-syms Mon Jan 18 13:11:37 2010 (r202570)
@@ -651,6 +651,8 @@
.\" X/Open
.ds doc-str-St--susv2 Version\~2 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification
.as doc-str-St--susv2 " (\*[Lq]\*[doc-Tn-font-size]SUSv2\*[doc-str-St]\*[Rq])
+.ds doc-str-St--susv3 Version\~3 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification
+.as doc-str-St--susv3 " (\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq])
.ds doc-str-St--svid4 System\~V Interface Definition, Fourth Edition
.as doc-str-St--svid4 " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq])
.ds doc-str-St--xbd5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interface Definitions Issue\~5
Modified: stable/8/contrib/groff/tmac/doc.tmac
==============================================================================
--- stable/8/contrib/groff/tmac/doc.tmac Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/contrib/groff/tmac/doc.tmac Mon Jan 18 13:11:37 2010 (r202570)
@@ -356,10 +356,10 @@
. ds doc-macro-name Fl
. doc-parse-args \$@
.
-. if !\n[.$] \{\
-. \" no arguments
+. \" no arguments
+. if !\n[.$] \
. nop \|\-\|\f[]\s[0]
-. \}\}
+. \}
.
. if !\n[doc-arg-limit] \
. return
@@ -481,8 +481,8 @@
. el \{\
. nr doc-reg-dpr \n[doc-arg-ptr]
.
+. \" the `\%' prevents hyphenation on a dash (`-')
. ie (\n[doc-reg-dpr1] == 2) \
-. \" the `\%' prevents hyphenation on a dash (`-')
. nop \%\*[doc-str-dpr]\&\c
. el \{\
. \" punctuation character
@@ -595,10 +595,10 @@
. ds doc-macro-name Ar
. doc-parse-args \$@
.
-. if !\n[.$] \{\
-. \" no argument
+. \" no argument
+. if !\n[.$] \
. nop \)\*[doc-str-Ar-default]\&\f[]\s[0]
-. \}\}
+. \}
.
. if !\n[doc-arg-limit] \
. return
@@ -1034,10 +1034,10 @@
. ds doc-macro-name Pa
. doc-parse-args \$@
.
-. if !\n[.$] \{\
-. \" default value
+. \" default value
+. if !\n[.$] \
. nop \*[doc-Pa-font]~\f[]\s[0]
-. \}\}
+. \}
.
. if !\n[doc-arg-limit] \
. return
@@ -3430,6 +3430,8 @@
. nr doc-reference-title-count-saved \n[doc-reference-title-count]
. ds doc-reference-title-name-saved "\*[doc-reference-title-name]
. ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book]
+. nr doc-url-count-saved \n[doc-url-count]
+. ds doc-url-name-saved "\*[doc-url-name]
. nr doc-volume-count-saved \n[doc-volume-count]
. ds doc-volume-name-saved "\*[doc-volume-name]
. nr doc-have-author-saved \n[doc-have-author]
@@ -3570,6 +3572,8 @@
. nr doc-reference-title-count \n[doc-reference-title-count-saved]
. ds doc-reference-title-name "\*[doc-reference-title-name-saved]
. ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved]
+. nr doc-url-count \n[doc-url-count-saved]
+. ds doc-url-name "\*[doc-url-name-saved]
. nr doc-volume-count \n[doc-volume-count-saved]
. ds doc-volume-name "\*[doc-volume-name-saved]
. nr doc-have-author \n[doc-have-author-saved]
@@ -5194,6 +5198,8 @@
.\" NS doc-reference-title-name-for-book
.\" NS doc-report-count
.\" NS doc-report-name
+.\" NS doc-url-count
+.\" NS doc-url-name
.\" NS doc-volume-count
.\" NS doc-volume-name
.
@@ -5208,6 +5214,7 @@
. nr doc-corporate-count 0
. nr doc-report-count 0
. nr doc-reference-title-count 0
+. nr doc-url-count 0
. nr doc-volume-count 0
. nr doc-date-count 0
. nr doc-page-number-count 0
@@ -5222,6 +5229,7 @@
. ds doc-report-name
. ds doc-reference-title-name
. ds doc-reference-title-name-for-book
+. ds doc-url-name
. ds doc-volume-name
. ds doc-date
. ds doc-page-number-string
@@ -5316,6 +5324,13 @@
. doc-finish-reference \n[doc-volume-count]
. \}
.
+. if \n[doc-url-count] \{\
+. unformat doc-url-name
+. chop doc-url-name
+. nop \*[doc-url-name]\c
+. doc-finish-reference \n[doc-url-count]
+. \}
+.
. if \n[doc-page-number-count] \{\
. unformat doc-page-number-string
. chop doc-page-number-string
@@ -6019,6 +6034,18 @@
..
.
.
+.\" NS doc-url-count global register
+.\" NS counter of hypertext references
+.
+.nr doc-url-count 0
+.
+.
+.\" NS doc-url-name global box
+.\" NS string of collected hypertext references
+.
+.ds doc-url-name
+.
+.
.\" NS doc-volume-count global register
.\" NS counter of reference title references
.
@@ -6031,6 +6058,48 @@
.ds doc-volume-name
.
.
+.\" NS %U user macro
+.\" NS hypertext reference
+.\" NS
+.\" NS modifies:
+.\" NS doc-arg-ptr
+.\" NS doc-curr-font
+.\" NS doc-curr-size
+.\" NS doc-macro-name
+.\" NS doc-reference-count
+.\" NS doc-url-count
+.\" NS
+.\" NS local variables:
+.\" NS doc-env-%U
+.\" NS
+.\" NS width register `%U' set in doc-common
+.
+.de %U
+. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+. tm Usage: .%U URL ... (#\n[.c])
+. return
+. \}
+.
+. nr doc-url-count +1
+. nr doc-reference-count +1
+.
+. ds doc-macro-name %U
+. doc-parse-args \$@
+.
+. nr doc-arg-ptr +1
+. nr doc-curr-font \n[.f]
+. nr doc-curr-size \n[.ps]
+.
+. \" append to reference box
+. boxa doc-url-name
+. ev doc-env-%U
+. evc 0
+. in 0
+. nf
+. doc-do-references
+..
+.
+.
.\" NS %V user macro
.\" NS reference volume
.\" NS
@@ -6039,7 +6108,7 @@
.\" NS doc-curr-font
.\" NS doc-curr-size
.\" NS doc-macro-name
-.\" NS doc-reference-title-count
+.\" NS doc-reference-count
.\" NS doc-volume-count
.\" NS
.\" NS local variables:
@@ -6428,6 +6497,19 @@
.ec
.
.
+.\" For UTF-8, map some characters conservatively for the sake
+.\" of easy cut and paste.
+.
+.if '\*[.T]'utf8' \{\
+. rchar \- - ' `
+.
+. char \- \N'45'
+. char - \N'45'
+. char ' \N'39'
+. char ` \N'96'
+.\}
+.
+.
.\" load local modifications
.mso mdoc.local
.
Modified: stable/8/contrib/groff/tmac/groff_mdoc.man
==============================================================================
--- stable/8/contrib/groff/tmac/groff_mdoc.man Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/contrib/groff/tmac/groff_mdoc.man Mon Jan 18 13:11:37 2010 (r202570)
@@ -864,16 +864,18 @@ the release ID.
.It NetBSD
0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e,
1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1,
-1.6.2, 2.0, 2.0.1, 2.0.2, 2.1, 3.0
+1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0,
+4.0.1
.It FreeBSD
1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
-5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0
+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1
.It DragonFly
-1.0, 1.1, 1.2, 1.3, 1.4, 1.5
+1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0
.It Darwin
-8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0
+8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0,
+8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0
.El
.Ed
.Pp
@@ -1995,6 +1997,8 @@ X/Open
.Pp
.It Li \-susv2
.St -susv2
+.It Li \-susv3
+.St -susv3
.It Li \-svid4
.St -svid4
.It Li \-xbd5
@@ -2552,6 +2556,8 @@ Corporate or foreign author.
Report name.
.It Li .%T
Title of article.
+.It Li .%U
+Optional hypertext reference.
.It Li .%V
Volume.
.El
@@ -4086,11 +4092,12 @@ Definitions used for all other devices.
.It Pa mdoc.local
Local additions and customizations.
.It Pa andoc.tmac
-This file checks whether the
+Use this file if you don't know whether the
.Nm \-mdoc
or the
.Nm \-man
package should be used.
+Multiple man pages (in either format) can be handled.
.El
.
.
Modified: stable/8/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- stable/8/gnu/usr.bin/groff/tmac/mdoc.local Mon Jan 18 12:52:42 2010 (r202569)
+++ stable/8/gnu/usr.bin/groff/tmac/mdoc.local Mon Jan 18 13:11:37 2010 (r202570)
@@ -69,12 +69,10 @@
.ds doc-default-operating-system FreeBSD\~8.0
.
.\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-6.3 6.3
-.ds doc-operating-system-FreeBSD-6.4 6.4
-.ds doc-operating-system-FreeBSD-7.1 7.1
.ds doc-operating-system-FreeBSD-7.2 7.2
.ds doc-operating-system-FreeBSD-7.3 7.3
.ds doc-operating-system-FreeBSD-8.0 8.0
+.ds doc-operating-system-FreeBSD-9.0 9.0
.
.\" Definitions not (yet) in doc-syms
.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
More information about the svn-src-stable
mailing list