diff options
| author | wl <wl> | 2008-03-24 20:01:36 +0000 |
|---|---|---|
| committer | wl <wl> | 2008-03-24 20:01:36 +0000 |
| commit | 87e985a9163cca07e8034f4ba9318248498ff8a6 (patch) | |
| tree | 233c72a0148a8a9ab7f3ddc405eb0c882d27a814 | |
| parent | d6753a8b4def4643db43c5767374962b72276d4d (diff) | |
| download | groff-87e985a9163cca07e8034f4ba9318248498ff8a6.tar.gz | |
* tmac/trace.tmac (so, mso): Added.
* tmac/www.tmac (PIMG): Replace `.ie' (without `.el') with `.if'.
If used with -mtrace, and this clause was active, the macro was
executed twice.
* tmac/pspic.tmac (PSPIC): Accept option `-C' for orthogonality.
This makes `.PIMG -C <file>' (from www.tmac) work on non-HTML
devices.
* man/groff_tmac.man: Document it.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | man/groff_tmac.man | 14 | ||||
| -rw-r--r-- | tmac/pspic.tmac | 8 | ||||
| -rw-r--r-- | tmac/trace.tmac | 26 | ||||
| -rw-r--r-- | tmac/www.tmac | 2 |
5 files changed, 56 insertions, 7 deletions
@@ -1,3 +1,16 @@ +2008-03-24 Werner LEMBERG <wl@gnu.org> + + * tmac/trace.tmac (so, mso): Added. + + * tmac/www.tmac (PIMG): Replace `.ie' (without `.el') with `.if'. + If used with -mtrace, and this clause was active, the macro was + executed twice. + + * tmac/pspic.tmac (PSPIC): Accept option `-C' for orthogonality. + This makes `.PIMG -C <file>' (from www.tmac) work on non-HTML + devices. + * man/groff_tmac.man: Document it. + 2008-02-26 Werner LEMBERG <wl@gnu.org> * src/roff/troff/input.cpp: s/safer_flag/unsafe_flag/. diff --git a/man/groff_tmac.man b/man/groff_tmac.man index 9f6e5a62..a02b0ecf 100644 --- a/man/groff_tmac.man +++ b/man/groff_tmac.man @@ -378,7 +378,11 @@ so it isn't necessary to call it explicitly. Syntax: .RS .IP -\&\fB.PSPIC\fP [\fB\-L\fP\||\|\fB\-R\fP\||\|\fB\-I\fP\ \fIn\fP] \ +\&\fB.PSPIC\fP \ +[\fB\-L\fP\|\ +|\|\fB\-R\fP\|\ +|\|\fB\-C\fP\|\ +|\|\fB\-I\fP\ \fIn\fP] \ \fI\|file\fP [\fIwidth\fP [\fIheight\fP]] .RE . @@ -414,12 +418,14 @@ and .I height high. . -By default, the graphic is horizontally centered. +Option +.B \-C +centers the graphic horizontally, which is the default. . The -.BI \-L +.B \-L and -.BI \-R +.B \-R options cause the graphic to be left-aligned and right-aligned, respectively. . diff --git a/tmac/pspic.tmac b/tmac/pspic.tmac index edaa2ec8..43665033 100644 --- a/tmac/pspic.tmac +++ b/tmac/pspic.tmac @@ -7,7 +7,7 @@ .\" .\" Usage: .\" -.\" .PSPIC [-L|-R|-I <indent>] <file> [<width> [<height>]] +.\" .PSPIC [-L|-R|-C|-I <indent>] <file> [<width> [<height>]] . .do if d PSPIC .nx . @@ -37,8 +37,12 @@ . shift 2 . HTML-DO-IMAGE \\$1 i . \} -. el \ +. el \{\ +. \" centered is the default +. if '\\$1'-C' \ +. shift . HTML-DO-IMAGE \\$1 c +. \} . \} . \} . diff --git a/tmac/trace.tmac b/tmac/trace.tmac index 69220255..21e25e7f 100644 --- a/tmac/trace.tmac +++ b/tmac/trace.tmac @@ -11,6 +11,32 @@ . .eo . +.rn so !!so +. +.de so +. do ecs +. ec +. do tm1 "\*[!!!sp]*** .so \$* { +. do !!as !!!sp " \" +. do !!so \$* +. do !!substring !!!sp 1 +. do tm1 "\*[!!!sp]*** } +. do ecr +.. +. +.rn mso !!mso +. +.de mso +. do ecs +. ec +. do tm1 "\*[!!!sp]*** .mso \$* { +. do !!as !!!sp " \" +. do !!mso \$* +. do !!substring !!!sp 1 +. do tm1 "\*[!!!sp]*** } +. do ecr +.. +. .rn nr !!nr . .de nr diff --git a/tmac/www.tmac b/tmac/www.tmac index c1743193..cd6feadf 100644 --- a/tmac/www.tmac +++ b/tmac/www.tmac @@ -536,7 +536,7 @@ HTML always denotes XHTML also. . shift . \} . el \{\ -. ie '\\$1'-L' \{\ +. if '\\$1'-L' \{\ . ds www-pic-align -L\" . shift . \} |