* 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.

3 files changed, 33 insertions, 3 deletions

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
 .    \}