[Groff-commit] groff ChangeLog man/groff_tmac.man tmac/pspic.t...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     08/03/24 20:01:37

Modified files:
        .              : ChangeLog 
        man            : groff_tmac.man 
        tmac           : pspic.tmac trace.tmac www.tmac 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1127&r2=1.1128
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff_tmac.man?cvsroot=groff&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/pspic.tmac?cvsroot=groff&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/trace.tmac?cvsroot=groff&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/www.tmac?cvsroot=groff&r1=1.52&r2=1.53

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1127
retrieving revision 1.1128
diff -u -b -r1.1127 -r1.1128
--- ChangeLog   26 Feb 2008 19:41:15 -0000      1.1127
+++ ChangeLog   24 Mar 2008 20:01:36 -0000      1.1128
@@ -1,3 +1,16 @@
+2008-03-24  Werner LEMBERG  <address@hidden>
+
+       * 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  <address@hidden>
 
        * src/roff/troff/input.cpp: s/safer_flag/unsafe_flag/.

Index: man/groff_tmac.man
===================================================================
RCS file: /cvsroot/groff/groff/man/groff_tmac.man,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- man/groff_tmac.man  19 Jan 2008 20:50:33 -0000      1.31
+++ man/groff_tmac.man  24 Mar 2008 20:01:37 -0000      1.32
@@ -378,7 +378,11 @@
 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 @@
 .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.
 .

Index: tmac/pspic.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/pspic.tmac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tmac/pspic.tmac     19 Jan 2008 20:50:34 -0000      1.8
+++ tmac/pspic.tmac     24 Mar 2008 20:01:37 -0000      1.9
@@ -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,10 +37,14 @@
 .        shift 2
 .        HTML-DO-IMAGE \\$1 i
 .      \}
-.      el \
+.      el \{\
+.        \" centered is the default
+.        if '\\$1'-C' \
+.          shift
 .        HTML-DO-IMAGE \\$1 c
 .    \}
 .  \}
+.  \}
 .
 .  br
 .

Index: tmac/trace.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/trace.tmac,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tmac/trace.tmac     21 Mar 2007 13:30:59 -0000      1.14
+++ tmac/trace.tmac     24 Mar 2008 20:01:37 -0000      1.15
@@ -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

Index: tmac/www.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/www.tmac,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- tmac/www.tmac       19 Jan 2008 20:50:34 -0000      1.52
+++ tmac/www.tmac       24 Mar 2008 20:01:37 -0000      1.53
@@ -536,7 +536,7 @@
 .    shift
 .  \}
 .  el \{\
-.    ie '\\$1'-L' \{\
+.    if '\\$1'-L' \{\
 .      ds www-pic-align -L\"
 .      shift
 .    \}