[Groff-commit] groff ./ChangeLog tmac/www.tmac

[Gaius Mulley]

CVSROOT:        /sources/groff
Module name:    groff
Branch:         
Changes by:     Gaius Mulley <address@hidden>   06/05/02 15:55:48

Modified files:
        .              : ChangeLog 
        tmac           : www.tmac 

Log message:
        * tmac/www.tmac: fixed the PIMG implementation so that it
        correctly defaults to -C if the alignment option is missing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.953&tr2=1.954&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.47&tr2=1.48&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.953 groff/ChangeLog:1.954
--- groff/ChangeLog:1.953       Mon May  1 08:37:13 2006
+++ groff/ChangeLog     Tue May  2 15:55:48 2006
@@ -1,3 +1,8 @@
+2006-05-02  Larry Kollar  <address@hidden>
+
+       * tmac/www.tmac: fixed the PIMG implementation so that it
+         correctly defaults to -C if the alignment option is missing.
+
 2006-04-30  Michail Vidiassov  <address@hidden>
 
        * src/utils/afmtodit/afmtodit.pl: New option `-c' to add font
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.47 groff/tmac/www.tmac:1.48
--- groff/tmac/www.tmac:1.47    Wed Jan 18 08:24:40 2006
+++ groff/tmac/www.tmac Tue May  2 15:55:48 2006
@@ -499,40 +499,44 @@
 .  ie \\n[www-html] \{\
 .    ie '\\$1'-R' \
 .      DEVTAG ".right-image"
+.      ds www-pic-align -R
+.      shift
 .    el \{\
 .      ie '\\$1'-L' \
 .        DEVTAG ".left-image"
+.        ds www-pic-align -L
+.        shift
 .      el \
 .        DEVTAG ".centered-image"
+.        ds www-pic-align -C
 .    \}
+.    if '\\$1'-C' shift
 .    nr www-width 0
 .    nr www-height 0
-.    if !'\\$3'' \
+.    if !'\\$2'' \
 .      nr www-width (\\$3 * 100 / 240)
-.    if !'\\$4'' \
+.    if !'\\$3'' \
 .      nr www-height (\\$4 * 100 / 240)
 .    ie (\\n[www-width] == 0) \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$2" alt="Image \\$2">
+.        HTML <img src="\\$1" alt="Image \\$1">
 .      el \
-.        HTML <img src="\\$1" alt="Image \\$2" height=\\n[www-height]>
+.        HTML <img src="\\$1" alt="Image \\$1" height=\\n[www-height]>
 .    \}
 .    el \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$2" alt="Image \\$2" width=\\n[www-width]>
+.        HTML <img src="\\$1" alt="Image \\$1" width=\\n[www-width]>
 .      el \
-.        HTML <img src="\\$2" alt="Image \\$2" width=\\n[www-width] \
+.        HTML <img src="\\$1" alt="Image \\$1" width=\\n[www-width] \
                height=\\n[www-height]>
 .    \}
 .  \}
 .  el \{\
 .    if !r ps4html \{\
 .      www-make-unique-name
-.      sy pngtopnm \\$2 | pnmcrop -white | @PNMTOPS_NOSETPAGE@ -noturn > 
\\*[www-unique-name].eps
-.      ie '\\$1'-C' \
-.        PSPIC \\*[www-unique-name].eps \\$3 \\$4
-.      el \
-.        PSPIC \\$1 \\*[www-unique-name].eps \\$3 \\$4
+.      sy pngtopnm \\$1 | pnmcrop -white | @PNMTOPS_NOSETPAGE@ -noturn > 
\\*[www-unique-name].eps
+.      shift
+.      PSPIC \\*[www-pic-align] \\*[www-unique-name].eps \\$*
 .    \}
 .  \}
 ..