Virgin import of FSF groff v1.15

2 files changed, 6 insertions, 2 deletions

diff --git a/contrib/groff/eqn/list.cc b/contrib/groff/eqn/list.cc
index 68d96db..1118fa1 100644
--- a/contrib/groff/eqn/list.cc
+++ b/contrib/groff/eqn/list.cc
@@ -159,7 +159,7 @@ int list_box::compute_metrics(int style)
     have_simple = list.p[i]->is_simple();
   if (have_simple) {
     printf(".nr " WIDTH_FORMAT " +\\w" DELIMITER_CHAR, uid);
-    for (int i = 0; i < list.len; i++)
+    for (i = 0; i < list.len; i++)
       if (list.p[i]->is_simple())
 	list.p[i]->output();
     printf(DELIMITER_CHAR "\n");
@@ -187,7 +187,7 @@ void list_box::compute_sublist_width(int n)
     have_simple = list.p[i]->is_simple();
   if (have_simple) {
     printf("+\\w" DELIMITER_CHAR);
-    for (int i = 0; i < n; i++)
+    for (i = 0; i < n; i++)
       if (list.p[i]->is_simple())
 	list.p[i]->output();
     printf(DELIMITER_CHAR);
diff --git a/contrib/groff/eqn/main.cc b/contrib/groff/eqn/main.cc
index 60a4e8d..986c282 100644
--- a/contrib/groff/eqn/main.cc
+++ b/contrib/groff/eqn/main.cc
@@ -78,6 +78,7 @@ void do_file(FILE *fp, const char *filename)
 	     && linebuf[2] == 'Q'
 	     && (linebuf[3] == ' ' || linebuf[3] == '\n' || compatible_flag)) {
       put_string(linebuf, stdout);
+      put_string(".if '\\*(.T'html' \\X(graphic-start(\\c\n", stdout);
       int start_lineno = current_lineno + 1;
       str.clear();
       for (;;) {
@@ -107,6 +108,7 @@ void do_file(FILE *fp, const char *filename)
       }
       restore_compatibility();
       printf(".lf %d\n", current_lineno);
+      put_string(".if '\\*(.T'html' \\X(graphic-end(\\c\n", stdout);
       put_string(linebuf, stdout);
     }
     else if (start_delim != '\0' && linebuf.search(start_delim) >= 0
@@ -163,6 +165,7 @@ static int inline_equation(FILE *fp, string &linebuf, string &str)
       ptr = &linebuf[0];
     }
     str += '\0';
+    put_string(".if '\\*(.T'html' \\X(graphic-start(\\c\n", stdout);
     init_lex(str.contents(), current_filename, start_lineno);
     yyparse();
     start = delim_search(ptr, start_delim);
@@ -177,6 +180,7 @@ static int inline_equation(FILE *fp, string &linebuf, string &str)
   printf(".lf %d\n", current_lineno);
   output_string();
   restore_compatibility();
+  put_string(".if '\\*(.T'html' \\X(graphic-end(\\c\n", stdout);
   printf(".lf %d\n", current_lineno + 1);
   return 1;
 }