[Groff-commit] groff ./ChangeLog doc/webpage.ms src/devices/gr...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 04/11/24 14:18:21

Modified files:
        .              : ChangeLog 
        doc            : webpage.ms 
        src/devices/grohtml: post-html.cpp 
        tmac           : www.tmac 

Log message:
        First fixes to get produce HTML.
        
        * src/devices/grohtml/post-html.cpp (generate_img_src): Add `alt'
        attribute.
        
        * tmac/www.tmac (IMG, PIMG, MPIMG): Add `alt' attribute.
        
        * doc/webpage.ms: Minor updates.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.763&tr2=1.764&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/webpage.ms.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.763 groff/ChangeLog:1.764
--- groff/ChangeLog:1.763       Tue Nov 23 23:42:02 2004
+++ groff/ChangeLog     Wed Nov 24 14:18:21 2004
@@ -1,3 +1,14 @@
+2004-11-24  Werner LEMBERG  <address@hidden>
+
+       First fixes to get produce HTML.
+
+       * src/devices/grohtml/post-html.cpp (generate_img_src): Add `alt'
+       attribute.
+
+       * tmac/www.tmac (IMG, PIMG, MPIMG): Add `alt' attribute.
+
+       * doc/webpage.ms: Minor updates.
+
 2004-11-23  Larry Kollar  <address@hidden>
 
        Add option -S grohtml to determine the file split level.
Index: groff/doc/webpage.ms
diff -u groff/doc/webpage.ms:1.16 groff/doc/webpage.ms:1.17
--- groff/doc/webpage.ms:1.16   Tue Nov 16 12:48:50 2004
+++ groff/doc/webpage.ms        Wed Nov 24 14:18:21 2004
@@ -10,8 +10,8 @@
 .if '\*[.T]'html' .nr LL 10i
 .if r ps4html .nr LL 10i
 .
-.HEAD "<link rel=""stylesheet"" type=""text/css"" href=""groff.css"" />"
-.\" .HEAD "<link rel=""icon"" type=""image/png"" 
href=""http://www.gnu.org/graphics/gnu-mini.png""; />"
+.HEAD "<link rel=""stylesheet"" type=""text/css"" href=""groff.css"" >"
+.\" .HEAD "<link rel=""icon"" type=""image/png"" 
href=""http://www.gnu.org/graphics/gnu-mini.png""; >"
 .
 .mso www.tmac
 .
@@ -44,15 +44,15 @@
 .  nop \v'-0.66i'\h'2.0i'\s[60]\*[GNU] Troff\s0
 .HTML-IMAGE-END
 .
-.HnS 1
 .HR
+.HnS 1
 GNU Troff (\c
 .URL http://\:groff.ffii.org/ Groff )
 \[em] a
 .URL http://\:www.gnu.org/ GNU
 project.
-.HR
 .HnE
+.HR
 .LK
 .
 .LP
@@ -312,7 +312,7 @@
 New key character `x' to make tbl call a user-defined macro on a table
 cell.
 Patch by
-.MTO address@hidden:surfeu.de "Heinz-Jürgen Oertel" .
+.MTO address@hidden:surfeu.de "Heinz-J\[:u]rgen Oertel" .
 .ULE
 .
 .
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.14 
groff/src/devices/grohtml/post-html.cpp:1.15
--- groff/src/devices/grohtml/post-html.cpp:1.14        Tue Nov 23 23:42:02 2004
+++ groff/src/devices/grohtml/post-html.cpp     Wed Nov 24 14:18:21 2004
@@ -2276,7 +2276,8 @@
     filename++;
   }
   if (exists(filename))
-    *s += string("<img src=\"") + filename + "\">";
+    *s += string("<img src=\"") + filename + "\" "
+         + "alt=\"Image " + filename + "\">";
   return *s;
 }
 
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.34 groff/tmac/www.tmac:1.35
--- groff/tmac/www.tmac:1.34    Sat Nov 20 09:27:57 2004
+++ groff/tmac/www.tmac Wed Nov 24 14:18:21 2004
@@ -398,7 +398,8 @@
 .    nr www-height \\n[www-width]
 .    if !'\\$4'' \
 .      nr www-height \\$4
-.    HTML <img src="\\$1" width=\\n[www-width] height=\\n[www-height]>
+.    HTML <img src="\\$1" alt="Image \\$1" \
+           width=\\n[www-width] height=\\n[www-height]>
 .  \}
 .  el \
 .    nop \[la]\f[C]\\$1\f[]\[ra]
@@ -461,15 +462,16 @@
 .      nr www-height (\\$4 * 100 / 240)
 .    ie (\\n[www-width] == 0) \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$2">
+.        HTML <img src="\\$2" alt="Image \\$2">
 .      el \
-.        HTML <img src="\\$1" height=\\n[www-height]>
+.        HTML <img src="\\$1" alt="Image \\$2" height=\\n[www-height]>
 .    \}
 .    el \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$2" width=\\n[www-width]>
+.        HTML <img src="\\$2" alt="Image \\$2" width=\\n[www-width]>
 .      el \
-.        HTML <img src="\\$2" width=\\n[www-width] height=\\n[www-height]>
+.        HTML <img src="\\$2" alt="Image \\$2" width=\\n[www-width] \
+               height=\\n[www-height]>
 .    \}
 .  \}
 .  el \{\
@@ -582,10 +584,10 @@
 .
 .  ie \\n[www-html] \{\
 .    ie !\\n[www-image-just] \
-.      HTML <img src="\\$1" hspace=\\n[www-htmlimage-gap] \
+.      HTML <img src="\\$1" alt="Image \\$1" hspace=\\n[www-htmlimage-gap] \
              align=right width=\\n[www-width] height=\\n[www-height]>
 .    el \
-.      HTML <img src="\\$1" hspace=\\n[www-htmlimage-gap] \
+.      HTML <img src="\\$1" alt="Image \\$1" hspace=\\n[www-htmlimage-gap] \
              align=left width=\\n[www-width] height=\\n[www-height]>
 .  \}
 .  el \{\