diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | tmac/doc-common | 36 | ||||
| -rw-r--r-- | tmac/doc-syms | 4 | ||||
| -rw-r--r-- | tmac/doc.tmac | 2 | ||||
| -rw-r--r-- | tmac/groff_mdoc.man | 9 |
6 files changed, 62 insertions, 10 deletions
@@ -1,3 +1,21 @@ +2003-09-15 Ruslan Ermilov <ru@FreeBSD.org> + + Support multiple calls of .Lb in LIBRARY section. + + * tmac/doc-common (doc-in-library-section): New register. + (doc-section-library): New string. + (Sh): Set `doc-in-library-section'. + (Rd): Updated. + * tmac/doc-syms (Lb): Insert breaks before and after arguments + if in LIBRARY section. + * tmac/doc.tmac (doc-save-global-vars): Updated. + * NEWS, tmac/groff_mdoc.man: Updated. + +2003-09-14 Ruslan Ermilov <ru@FreeBSD.org> + + * tmac/doc-common (doc-default-operating-system): New variable. + (Os): Use it. + 2003-09-08 Werner LEMBERG <wl@gnu.org> * tmac/doc.tmac (doc-reset-reference): Handle data for `%I' also. @@ -43,6 +43,9 @@ Macro Packages o www.tmac: New macro `JOBNAME' to split output into multiple files. +o In mdoc, multiple calls to `.Lb' are now supported in the LIBRARY + section. + VERSION 1.19 ============ diff --git a/tmac/doc-common b/tmac/doc-common index 30f16bce..0d819ced 100644 --- a/tmac/doc-common +++ b/tmac/doc-common @@ -339,12 +339,18 @@ .. . . -.\" NS doc-operating-system global string -.\" NS the exact version of the operating system +.\" NS doc-default-operating-system global string +.\" NS the exact (default) version of the operating system .\" NS .\" NS override this in `mdoc.local', if necessary . -.ds doc-operating-system BSD +.ds doc-default-operating-system BSD +. +. +.\" NS doc-operating-system global string +.\" NS the exact version of the operating system +. +.ds doc-operating-system . . .\" NS Os user macro (not parsed, not callable) @@ -434,10 +440,9 @@ .ds doc-operating-system-FreeBSD-5.0 5.0 . .de Os -. if "\$1"" \ -. return -. -. ie "\$1"ATT" \{\ +. ie "\$1"" \ +. ds doc-operating-system "\*[doc-default-operating-system] +. el \{ .ie "\$1"ATT" \{\ . ds doc-operating-system AT&T . if \A\$2 \{\ . ie d doc-operating-system-ATT-\$2 \ @@ -472,7 +477,7 @@ . ds doc-operating-system \$1 . if !"\$2"" \ . as doc-operating-system " \$2 -. \}\}\}\} +. \}\}\}\}\} .. . . @@ -696,6 +701,12 @@ .nr doc-in-synopsis-section 0 . . +.\" NS doc-in-library-section global register (bool) +.\" NS whether we are in the `library' section +. +.nr doc-in-library-section 0 +. +. .\" NS doc-in-see-also-section global register (bool) .\" NS whether we are in the `see also' section . @@ -733,6 +744,7 @@ .\" NS doc-func-count .\" NS doc-in-authors-section .\" NS doc-in-files-section +.\" NS doc-in-library-section .\" NS doc-in-see-also-section .\" NS doc-in-synopsis-section .\" NS doc-indent-synopsis @@ -749,6 +761,7 @@ . .ds doc-section-name NAME .ds doc-section-synopsis SYNOPSIS +.ds doc-section-library LIBRARY .ds doc-section-description DESCRIPTION .ds doc-section-see-also SEE .ds doc-section-files FILES @@ -795,6 +808,7 @@ . \} . el \{\ . nr doc-in-synopsis-section 0 +. nr doc-in-library-section 0 . nr doc-in-see-also-section 0 . nr doc-in-files-section 0 . nr doc-in-authors-section 0 @@ -806,6 +820,9 @@ . nr doc-indent-synopsis 0 . nr doc-indent-synopsis-active 0 . \} +. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-library]" \{\ +. nr doc-in-library-section 1 +. \} . el \{ .ie "\*[doc-str-dfp]"\*[doc-section-description]" \{\ . nr doc-is-func 0 . nr doc-func-count 0 @@ -821,7 +838,7 @@ . nr doc-in-files-section 1 . el .if "\*[doc-str-dfp]"\*[doc-section-authors]" \ . nr doc-in-authors-section 1 -. \}\}\} +. \}\}\}\} . . in 0 . nr doc-have-author 0 @@ -1058,6 +1075,7 @@ . tm doc-display-vertical == \n[doc-display-vertical] . tm doc-header-string == `\*[doc-header-string]' . tm doc-in-synopsis-section == \n[doc-in-synopsis-section] +. tm doc-in-library-section == \n[doc-in-library-section] . tm doc-in-see-also-section == \n[doc-in-see-also-section] . tm doc-in-files-section == \n[doc-in-files-section] . tm doc-in-authors-section == \n[doc-in-authors-section] diff --git a/tmac/doc-syms b/tmac/doc-syms index f4d3d6e7..2c4d56b2 100644 --- a/tmac/doc-syms +++ b/tmac/doc-syms @@ -716,7 +716,11 @@ . \" replacing argument with result . ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Lb] . +. if \n[doc-in-library-section] \ +. br . doc-print-recursive +. if \n[doc-in-library-section] \ +. br . \} . el \{\ . tm Usage: .Lb library_name ... (#\n[.c]) diff --git a/tmac/doc.tmac b/tmac/doc.tmac index 5ce8df98..b5783075 100644 --- a/tmac/doc.tmac +++ b/tmac/doc.tmac @@ -3321,6 +3321,7 @@ . nr doc-curr-font-saved \n[doc-curr-font] . nr doc-curr-size-saved \n[doc-curr-size] . nr doc-in-synopsis-section-saved \n[doc-in-synopsis-section] +. nr doc-in-library-section-saved \n[doc-in-library-section] . nr doc-indent-synopsis-saved \n[doc-indent-synopsis] . nr doc-indent-synopsis-active-saved \n[doc-indent-synopsis-active] . nr doc-have-decl-saved \n[doc-have-decl] @@ -3460,6 +3461,7 @@ . nr doc-curr-font \n[doc-curr-font-saved] . nr doc-curr-size \n[doc-curr-size-saved] . nr doc-in-synopsis-section \n[doc-in-synopsis-section-saved] +. nr doc-in-library-section \n[doc-in-library-section-saved] . nr doc-indent-synopsis \n[doc-indent-synopsis-saved] . nr doc-indent-synopsis-active \n[doc-indent-synopsis-active-saved] . nr doc-have-decl \n[doc-have-decl-saved] diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man index b27f2a82..7af59146 100644 --- a/tmac/groff_mdoc.man +++ b/tmac/groff_mdoc.man @@ -786,7 +786,7 @@ In the following examples, the left (which is identical to the right) and the middle part of the manual page header strings are shown. Note how .Ql \e& -prevents the digit\~1 from being a valid numeric expression. +prevents the digit\~7 from being a valid numeric expression. . .Bd -ragged .Bl -tag -width ".Li .Dt\ FOO\ 2\ i386" -compact -offset indent @@ -1702,6 +1702,13 @@ look for strings named then denotes the keyword to be used with the .Ql .Lb macro. +.Pp +In the +.Sx LIBRARY +section an +.Ql .Lb +command causes a line break before and after its arguments are printed. +.Pp . .Ss Literals . |