[Groff-commit] groff ./ChangeLog src/devices/grohtml/post-html...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/05/05 21:03:50

Modified files:
        .              : ChangeLog 
        src/devices/grohtml: post-html.cpp 

Log message:
        * src/devices/grohtml/post-html.cpp (page::add_and_encode): Don't
        swallow character immediately after `\[...]'.
        Simplify code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.955&tr2=1.956&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.955 groff/ChangeLog:1.956
--- groff/ChangeLog:1.955       Tue May  2 19:45:32 2006
+++ groff/ChangeLog     Fri May  5 21:03:50 2006
@@ -1,12 +1,18 @@
+2006-05-05  Werner LEMBERG  <address@hidden>
+
+       * src/devices/grohtml/post-html.cpp (page::add_and_encode): Don't
+       swallow character immediately after `\[...]'.
+       Simplify code.
+
 2006-05-02  Gaius Mulley  <address@hidden>
 
-       * tmac/www.tmac: fixed the HTML device specific components of
-         of the PIMG macro.
+       * tmac/www.tmac: Fix 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
-         correctly defaults to -C if the alignment option is missing.
+       * tmac/www.tmac: Fix the PIMG implementation so that it correctly
+       defaults to `-C' if the alignment option is missing.
 
 2006-04-30  Michail Vidiassov  <address@hidden>
 
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.37 
groff/src/devices/grohtml/post-html.cpp:1.38
--- groff/src/devices/grohtml/post-html.cpp:1.37        Wed Apr 26 07:16:36 2006
+++ groff/src/devices/grohtml/post-html.cpp     Fri May  5 21:03:50 2006
@@ -1394,25 +1394,20 @@
 {
   string html_string;
   const char *html_glyph;
-  int i=0;
+  int i = 0;
+  const int len = str.length();
 
   if (s->f == NULL)
     return;
-  while (i < str.length()) {
-    if ((i+1<str.length()) && (str.substring(i, 2) == string("\\["))) {
+  while (i < len) {
+    if ((i + 1 < len) && (str.substring(i, 2) == string("\\["))) {
       // start of escape
       i += 2; // move over \[
       int a = i;
-      while ((i<str.length()) && (str.substring(i, 1) != string("]"))) {
-       i++;
-      }
-      int n = i;
-      if ((i<str.length()) && (str.substring(i, 1) == string("]")))
+      while ((i < len) && (str[i] != ']'))
        i++;
-      else
-       n = -1;
-      if (n > 0) {
-       string troff_charname = str.substring(a, n-a);
+      if (i > 0) {
+       string troff_charname = str.substring(a, i - a);
        html_glyph = get_html_translation(s->f, troff_charname);
        if (html_glyph)
          html_string += html_glyph;
@@ -1422,7 +1417,8 @@
            html_string += s->f->get_code(g);
        }
       }
-    } else
+    }
+    else
       html_string += str[i];
     i++;
   }