From 936bd73ab202b10efa35669b909b8f8ce17c241a Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Fri, 14 Apr 2000 04:04:15 +0000 Subject: [PATCH] * doc/groff.texinfo: More conversions to @Deffn. * tmac/tmac.psfig: Fix incorrect use of `&' operator by replacing it with `:'. * src/roff/nroff/nroff.man: Add note about tmac.tty-char. --- ChangeLog | 11 ++++++++ doc/groff.texinfo | 73 ++++++++++++++++++++++++++++-------------------- src/roff/nroff/nroff.man | 9 +++++- tmac/tmac.pspic | 2 +- 4 files changed, 63 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index b68021aa..64a4950c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-04-14 Werner LEMBERG + + * doc/groff.texinfo: More conversions to @Deffn. + +2000-04-12 Werner LEMBERG + + * tmac/tmac.psfig: Fix incorrect use of `&' operator by replacing it + with `:'. + + * src/roff/nroff/nroff.man: Add note about tmac.tty-char. + 2000-04-10 Werner LEMBERG * doc/groff.texinfo: More conversions to @Deffn. diff --git a/doc/groff.texinfo b/doc/groff.texinfo index bb275c83..5105fa38 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -3688,50 +3688,63 @@ The current hyphenation language is available in the read-only register @cindex manipulating spacing @cindex spacing, manipulating -@findex sp -The @code{sp} request will cause @code{gtroff} to space downwards the -distance specified as the first argument. With no argument it will -advance 1@w{ }line. A negative argument will cause @code{gtroff} to -move up the page the specified distance. If the argument is preceded by -a @samp{|} @code{gtroff} will move that distance from the top of the -page. This request causes a line break. +@Deffn{Request, sp, [@var{distance}]} +Space downwards @var{distance}. With no argument it will advance 1@w{ +}line. A negative argument will cause @code{gtroff} to move up the page +the specified distance. If the argument is preceded by a @samp{|} +@code{gtroff} will move that distance from the top of the page. This +request causes a line break. +@end_Deffn @cindex double-spacing -@findex ls +@Deffn{Request, ls, [@var{nnn}]} +Output @var{nnn}-1 blank lines after each line of text. With no +argument @code{gtroff} will go back to single spacing. For example, +@w{@samp{.ls 2}} causes double-spaced output. + @vindex .L -For double or triple spaced output use @code{ls}. This request causes -@code{troff} to output @var{n}-1 blank lines after each line of text, -where @var{n} is the argument given to the @code{ls} request. With no -argument @code{gtroff} will go back to single spacing. The number -register @code{.L} contains the current line spacing setting. +The number register @code{.L} contains the current line spacing setting. +@end_Deffn -@findex \x -@vindex .a -Sometimes, extra vertical spacing is only needed occasionally, i.e.@: to +@Deffn{Escape, \\x, spacing} +Sometimes, extra vertical spacing is only needed occasionally, e.g.@: to allow space for a tall construct (like an equation). The @code{\x} -escape will do this. The escape is given a numerical argument (like -@samp{\x'3p'}). If this number is positive extra vertical space will be -inserted below the current line. A negative number will add space -above. If this escape is used multiple times on the same line, the -maximum of the values is used. The @code{.a} number register contains -the most recent (nonnegative) extra vertical line space. +escape will do this. The escape is given a numerical argument, usually +enclosed in quotes (like @samp{\x'3p'}). If this number is positive +extra vertical space will be inserted below the current line. A +negative number will add space above. If this escape is used multiple +times on the same line, the maximum of the values is used. + +@vindex .a +The @code{.a} number register contains the most recent (nonnegative) +extra vertical line space. @c XXX @example ... example of inline equation ... @end example +@end_Deffn -@findex ns -@findex rs +@findex sp @cindex no-space mode @cindex mode, no-space -Spacing (either via @code{sp} or via blank lines) can be disabled with -the @code{ns} request. This will enable @dfn{no-space mode}. This mode -will end when actual text is output or the @code{rs} request is -encountered. No-space mode will also prevent requests to advance to the -next page unless they are accompanied by a page number (@pxref{Page -Control}, for more information). +@cindex blank lines +@cindex lines, blank +@Deffn{Request, ns, } +Enable @dfn{no-space mode}. In this mode, spacing (either via @code{sp} +or via blank lines) is disabled. The @code{bp} request to advance to +the next page is also disabled, except if it is accompanied by a page +number (@pxref{Page Control}, for more information). This mode will end +when actual text is output or the @code{rs} request is encountered. + +This request is useful for macros which want to avoid that subsequent +macros inadvertently insert some vertical space before the text starts +(for example, to set up the first paragraph after a section header). +@end_Deffn +@Deffn{Request, rs, } +Disable no-space mode. +@end_Deffn @node Tabs and Fields, Character Translations, Manipulating Spacing, Programming Tutorial @section Tabs and Fields diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.man index a8e97fc0..d4877871 100644 --- a/src/roff/nroff/nroff.man +++ b/src/roff/nroff/nroff.man @@ -81,9 +81,16 @@ Options .B \-S (safer) and .B \-U -(unsafe) are passed to groff. +(unsafe) are passed to +.BR groff . .B \-S is passed by default. +.SH NOTES +This shell script is basically intended for use with +.BR man (1), +so warnings are suppressed. +nroff-style character definitions (in the file tmac.tty-char) are also +loaded to emulate unrepresentable glyphs. .SH "SEE ALSO" .BR groff (@MAN1EXT@), .BR @g@troff (@MAN1EXT@), diff --git a/tmac/tmac.pspic b/tmac/tmac.pspic index ef4186f6..55e51b36 100755 --- a/tmac/tmac.pspic +++ b/tmac/tmac.pspic @@ -18,7 +18,7 @@ .\} .br .psbb \\$1 -.if (\\n[llx] & \\n[lly] & \\n[urx] & \\n[ury]) \{\ +.if (\\n[llx] : \\n[lly] : \\n[urx] : \\n[ury]) \{\ . nr ps-wid (\\n[urx]-\\n[llx]) . nr ps-ht (\\n[ury]-\\n[lly]) . if \\n[ps-wid]<0 .nr ps-wid 0-\\n[ps-wid] -- 2.11.4.GIT