[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 19:45:32

Modified files:
        .              : ChangeLog 
        tmac           : www.tmac 

Log message:
        * tmac/www.tmac: fixed the HTML device specific components of
        of the PIMG macro.

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

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.954 groff/ChangeLog:1.955
--- groff/ChangeLog:1.954       Tue May  2 15:55:48 2006
+++ groff/ChangeLog     Tue May  2 19:45:32 2006
@@ -1,3 +1,8 @@
+2006-05-02  Gaius Mulley  <address@hidden>
+
+       * tmac/www.tmac: fixed the HTML device specific components of
+         of the PIMG macro.
+
 2006-05-02  Larry Kollar  <address@hidden>
 
        * tmac/www.tmac: fixed the PIMG implementation so that it
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.48 groff/tmac/www.tmac:1.49
--- groff/tmac/www.tmac:1.48    Tue May  2 15:55:48 2006
+++ groff/tmac/www.tmac Tue May  2 19:45:32 2006
@@ -496,21 +496,25 @@
 .\"       is then converted to the EPS format using netpbm utilities.
 .\"
 .de PIMG
-.  ie \\n[www-html] \{\
-.    ie '\\$1'-R' \
-.      DEVTAG ".right-image"
-.      ds www-pic-align -R
+.  ds www-pic-align "
+.  ie '\\$1'-R' \{\
+.    ds www-pic-align -R
+.    shift
+.  \}
+.  el \{\
+.    ie '\\$1'-L' \{\
+.      ds www-pic-align -L
 .      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
+.  \}
+.  if '\\$1'-C' .shift
+.
+.  tm options are \\$* and align is \\*[www-pic-align]
+.
+.  ie \\n[www-html] \{\
+.    if '\\*[www-pic-align]'-R'  .ds www-htmlalign align=right
+.    if '\\*[www-pic-align]'-L'  .ds www-htmlalign align=left
+.    if '\\*[www-pic-align]''    .ds www-htmlalign align=center
 .    nr www-width 0
 .    nr www-height 0
 .    if !'\\$2'' \
@@ -519,16 +523,19 @@
 .      nr www-height (\\$4 * 100 / 240)
 .    ie (\\n[www-width] == 0) \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$1" alt="Image \\$1">
+.        HTML</p> "<p \\*[www-htmlalign]><img src="\\$1" \
+                   alt="Image \\$1"></p>
 .      el \
-.        HTML <img src="\\$1" alt="Image \\$1" height=\\n[www-height]>
+.        HTML</p> "<p \\*[www-htmlalign]><img src="\\$1" \
+                   alt="Image \\$1" height=\\n[www-height]></p>
 .    \}
 .    el \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$1" alt="Image \\$1" width=\\n[www-width]>
+.        HTML</p> <p \\*[www-htmlalign]><img src="\\$1" \
+                   alt="Image \\$1" width=\\n[www-width]></p>
 .      el \
-.        HTML <img src="\\$1" alt="Image \\$1" width=\\n[www-width] \
-               height=\\n[www-height]>
+.        HTML</p> <p \\*[www-htmlalign]> <img src="\\$1" alt="Image \\$1" \
+                   width=\\n[www-width] height=\\n[www-height]></p>
 .    \}
 .  \}
 .  el \{\