diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | src/devices/grohtml/post-html.cc | 7 | ||||
-rw-r--r-- | tmac/html.tmac | 8 |
3 files changed, 24 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2002-06-15 Gaius Mulley <gaius@glam.ac.uk> + + * src/devices/grohtml/post-html.cc (html_printer::emit_raw, + html_printer::do_linelength, html_printer::do_pageoffset, + html_printer::do_indentation, html_printer::do_tempindent, + html_printer::do_break, html_printer::begin_page): Clear indented + text. + * tmac/html.tmac: Disable hyphenation. + 2002-06-15 Werner LEMBERG <wl@gnu.org> Don't produce HTML files if utility programs are missing. diff --git a/src/devices/grohtml/post-html.cc b/src/devices/grohtml/post-html.cc index 85a556eb..854bd372 100644 --- a/src/devices/grohtml/post-html.cc +++ b/src/devices/grohtml/post-html.cc @@ -1367,6 +1367,7 @@ void html_printer::emit_raw (text_glob *g) if (in_table) { current_paragraph->do_indent(NULL, 0, pageoffset, linelength); current_paragraph->do_indent(page_contents->buffer.add_string(indent.text), indentation, pageoffset, linelength); + indent.text.clear(); } #endif } @@ -1742,6 +1743,7 @@ void html_printer::do_linelength (char *arg) if (fill_on) { linelength = atoi(arg); current_paragraph->do_indent(page_contents->buffer.add_string(indent.text), indentation, pageoffset, linelength); + indent.text.clear(); } #endif } @@ -1756,6 +1758,7 @@ void html_printer::do_pageoffset (char *arg) pageoffset = atoi(arg); if (fill_on) { current_paragraph->do_indent(page_contents->buffer.add_string(indent.text), indentation, pageoffset, linelength); + indent.text.clear(); } #endif } @@ -1770,6 +1773,7 @@ void html_printer::do_indentation (char *arg) if (fill_on) { indentation = atoi(arg); current_paragraph->do_indent(page_contents->buffer.add_string(indent.text), indentation, pageoffset, linelength); + indent.text.clear(); } #endif } @@ -1786,6 +1790,7 @@ void html_printer::do_tempindent (char *arg) prev_indent = indentation; indentation = atoi(arg); current_paragraph->do_indent(page_contents->buffer.add_string(indent.text), indentation, pageoffset, linelength); + indent.text.clear(); } #endif } @@ -1954,6 +1959,7 @@ void html_printer::do_break (void) if (end_tempindent == 0) { indentation = prev_indent; current_paragraph->do_indent(page_contents->buffer.add_string(indent.text), indentation, pageoffset, linelength); + indent.text.clear(); } } #endif @@ -2674,6 +2680,7 @@ void html_printer::begin_page(int n) current_paragraph = new html_text(&html); #if defined(INDENTATION) current_paragraph->do_indent(page_contents->buffer.add_string(indent.text), indentation, pageoffset, linelength); + indent.text.clear(); #endif current_paragraph->do_para(""); } diff --git a/tmac/html.tmac b/tmac/html.tmac index f016330d..79868e1c 100644 --- a/tmac/html.tmac +++ b/tmac/html.tmac @@ -31,6 +31,14 @@ .fchar \[bq] , .fchar \[aq] ' . +.\" +.\" remove hyphenation +.\" +.de hy +.. +.de nh +.. +. .\" Now set any characters defined in devps/S but not in devhtml/S to nul -- .\" these are generated by eqn but not used by grohtml. grops generated .\" images during the alternative pass. |