From 3e8eabd28a44b2ce61689ae2fbd0c002404fc26c Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 14 Mar 2010 12:55:11 +0100 Subject: [PATCH] Adjust some more to the recent groff 1.20.1 import. * Dx is now a built in macro, so remove our local definition. But the version supplied with groff still doesn't work correctly due to a missing register declaration in doc-common. Fix that locally for now (patch sent upstream). * Sync various definitions (standards, operating systems) with doc-common and doc-syms, i.e. remove our local definitions where they are part of groff now. --- contrib/groff/tmac/doc-common | 1 + gnu/usr.bin/groff/tmac/mdoc.local | 40 ------------ .../groff/tmac/patches/doc-syms.no_obj.patch | 75 ---------------------- 3 files changed, 1 insertion(+), 115 deletions(-) delete mode 100644 gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common index 8b1afa5674..d36a47e491 100644 --- a/contrib/groff/tmac/doc-common +++ b/contrib/groff/tmac/doc-common @@ -77,6 +77,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\" ? diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index 640404ba93..e950a8ead6 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -23,14 +23,9 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.2.2.19 2003/03/25 10:20:12 murray Exp $ -.\" $DragonFly: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.27 2008/09/30 13:26:17 swildner Exp $ .\" .\" %beginstrip% . -.\" Macro identifier for the DragonFly OS. -.nr Dx 1 -. -. .eo . . @@ -64,39 +59,15 @@ .ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) . . -.\" Standards names not in groff. -.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995 -.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq]) -.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994 -.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq]) -.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995 -.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq]) -.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994 -.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[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]) -. -. .\" Default .Os value .ds doc-default-operating-system DragonFly\~2.5 . . .\" DragonFly releases not found in doc-common -.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.7 1.7 -.ds doc-operating-system-DragonFly-1.8 1.8 .ds doc-operating-system-DragonFly-1.9 1.9 -.ds doc-operating-system-DragonFly-1.10 1.10 .ds doc-operating-system-DragonFly-1.11 1.11 -.ds doc-operating-system-DragonFly-1.12 1.12 .ds doc-operating-system-DragonFly-1.13 1.13 -.ds doc-operating-system-DragonFly-2.0 2.0 .ds doc-operating-system-DragonFly-2.1 2.1 .ds doc-operating-system-DragonFly-2.2 2.2 .ds doc-operating-system-DragonFly-2.3 2.3 @@ -104,20 +75,9 @@ .ds doc-operating-system-DragonFly-2.5 2.5 . .\" FreeBSD releases not found in doc-common. -.ds doc-operating-system-FreeBSD-4.11 4.11 -.ds doc-operating-system-FreeBSD-5.4 5.4 -.ds doc-operating-system-FreeBSD-5.5 5.5 -.ds doc-operating-system-FreeBSD-6.0 6.0 -.ds doc-operating-system-FreeBSD-6.1 6.1 -.ds doc-operating-system-FreeBSD-6.3 6.3 -.ds doc-operating-system-FreeBSD-7.0 7.0 -.ds doc-operating-system-FreeBSD-7.1 7.1 .ds doc-operating-system-FreeBSD-8.0 8.0 . .\" NetBSD releases not found in doc-common. -.ds doc-operating-system-NetBSD-1.6.3 1.6.3 -.ds doc-operating-system-NetBSD-3.0 3.0 -.ds doc-operating-system-NetBSD-4.0 4.0 .ds doc-operating-system-NetBSD-5.0 5.0 .ds doc-operating-system-NetBSD-6.0 6.0 . diff --git a/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch deleted file mode 100644 index 564373c068..0000000000 --- a/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch +++ /dev/null @@ -1,75 +0,0 @@ -$DragonFly: src/gnu/usr.bin/groff/tmac/patches/doc-syms.no_obj.patch,v 1.1 2005/09/08 10:58:16 asmodai Exp $ - ---- doc-syms 2005-09-08 12:50:26.000000000 +0200 -+++ doc-syms 2005-09-08 12:52:04.000000000 +0200 -@@ -324,6 +262,70 @@ - .. - . - . -+.\" NS Dx user macro -+.\" NS print DragonFly -+.\" NS -+.\" NS modifies: -+.\" NS doc-arg-ptr -+.\" NS doc-curr-font -+.\" NS doc-curr-size -+.\" NS doc-macro-name -+.\" NS -+.\" NS local variable: -+.\" NS doc-str-Dx -+.\" NS doc-str-Dx1 -+.\" NS -+.\" NS width register `Dx' defined in doc-common -+. -+.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common -+. -+.de Dx -+. nr doc-curr-font \n[.f] -+. nr doc-curr-size \n[.ps] -+. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] -+. -+. \" default value if no argument -+. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx] -+. -+. if !\n[doc-arg-limit] \ -+. if \n[.$] \{\ -+. ds doc-macro-name Dx -+. doc-parse-args \$@ -+. \} -+. -+. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ -+. nr doc-arg-ptr +1 -+. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ -+. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ -+. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \ -+. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]] -+. el \{\ -+. tmc mdoc warning: .Dx: Unknown DragonFly version -+. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) -+. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] -+. \}\} -+. el \ -+. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] -+. \} -+. el \ -+. nr doc-arg-ptr -1 -+. \} -+. -+. \" replace current argument with result -+. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1] -+. nr doc-type\n[doc-arg-ptr] 2 -+. ds doc-space\n[doc-arg-ptr] "\*[doc-space] -+. -+. \" recompute space vector for remaining arguments -+. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) -+. nr doc-arg-limit \n[doc-arg-ptr] -+. if \n[doc-num-args] \ -+. doc-parse-space-vector -+. -+. doc-print-recursive -+.. -+. -+. - .\" NS Fx user macro - .\" NS print FreeBSD - .\" NS -- 2.11.4.GIT