*** empty log message ***

diff --git a/src/html.c b/src/html.c
index 5b79219affdb16c45e4460d603c665841321865d..cc10a58ffa061ed16fcb5a8f4f649d7d6fa27e6d 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
 
 /*
  * $Log$

+ * Revision 1.6  2008/02/20 23:42:05  staffcvs
+ * *** empty log message ***
+ *

  * Revision 1.5  2008/02/20 23:31:48  staffcvs
  * *** empty log message ***
  *
  * Revision 1.5  2008/02/20 23:31:48  staffcvs
  * *** empty log message ***
  *


@@ -92,15 +95,13 @@ html_render (FILE * f, CRT_CA c)
       if (c.attr & CRT_ATTR_BOLD)
         fg |= CRT_COLOR_INTENSITY;
     }
       if (c.attr & CRT_ATTR_BOLD)
         fg |= CRT_COLOR_INTENSITY;
     }

-#if 1
+#ifdef CSS
+  fprintf (f, "<span style='color: #%06x; background-color: #%06x'>",
+           colormap[fg], colormap[bg]);
+#else

   fprintf (f, "<td bgcolor='#%06x'><font color='#%06x'>", colormap[bg],
            colormap[fg]);
   fprintf (f, "<td bgcolor='#%06x'><font color='#%06x'>", colormap[bg],
            colormap[fg]);

-#endif
-

   fprintf (f, "<tt>");
   fprintf (f, "<tt>");

-#if 0
-  fprintf (f, "<span style='color: #%06x; background-color: #%06x'>",
-           colormap[fg], colormap[bg]);

 #endif
 
   if (c.attr & CRT_ATTR_UNDERLINE)
 #endif
 
   if (c.attr & CRT_ATTR_UNDERLINE)


@@ -123,13 +124,12 @@ html_render (FILE * f, CRT_CA c)
     {
       fprintf (f, "</font>");
     }
     {
       fprintf (f, "</font>");
     }

+#ifdef CSS
+  fprintf (f, "</span>");
+#else

   fprintf (f, "</tt>");
   fprintf (f, "</tt>");

-#if 1

   fprintf (f, "</td>");
 #endif
   fprintf (f, "</td>");
 #endif

-#if 0
-  fprintf (f, "</span>");
-#endif

 }
 
 static void
 }
 
 static void


@@ -138,21 +138,32 @@ html_draw (FILE * f, CRT * c)
   CRT_Pos p;
   int o;
 
   CRT_Pos p;
   int o;
 

-// fprintf (f, "<pre>");
+#ifdef CSS
+  fprintf (f, "<pre>");
+#else

   fprintf (f, "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n");
   fprintf (f, "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n");

+#endif

   for (p.y = 0; p.y < CRT_ROWS; ++p.y)
     {
       o = CRT_ADDR (p.y, 0);
   for (p.y = 0; p.y < CRT_ROWS; ++p.y)
     {
       o = CRT_ADDR (p.y, 0);

+#ifndef CSS

       fprintf (f, "<tr>");
       fprintf (f, "<tr>");

+#endif

       for (p.x = 0; p.x < CRT_COLS; ++p.x, ++o)
         {
           html_render (f, c->screen[o]);
         }
       for (p.x = 0; p.x < CRT_COLS; ++p.x, ++o)
         {
           html_render (f, c->screen[o]);
         }

+#ifdef CSS
+      fprintf (f, "\n");
+#else

       fprintf (f, "</tr>\n");
       fprintf (f, "</tr>\n");

-// fprintf(f,"\n");
+#endif

     }
     }

+#ifdef CSS
+  fprintf (f, "</pre>\n");
+#else

   fprintf (f, "</table>");
   fprintf (f, "</table>");

-//  fprintf (f, "</pre>\n");
+#endif

 }
 
 
 }
 
 

diff --git a/version-md5sums b/version-md5sums
index 3a0cf05d058777ce823d000758d2ff7e47d9f127..6259056e83c3432d6c67bf55c354861d785317b4 100644 (file)
--- a/version-md5sums
+++ b/version-md5sums
@@ -1 +1,2 @@
 6488eda7d5c4d46ce3f587f5dc745dfa       1.0.1
 6488eda7d5c4d46ce3f587f5dc745dfa       1.0.1

+ca1ac5a7fc122af620b0cf7296c324c3       1.0.2

diff --git a/version-micro b/version-micro
index d00491fd7e5bb6fa28c517a0bb32b8b506539d4d..0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 100644 (file)
--- a/version-micro
+++ b/version-micro
@@ -1 +1 @@
-1
+2