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

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/02/27 06:26:15

Modified files:
        .              : ChangeLog 
        src/devices/grohtml: html-text.cpp post-html.cpp 
        src/roff/troff : env.cpp node.cpp 

Log message:
        * src/devices/grohtml/html-text.cpp (html_text::do_pre): Preserve
        paragraph spacing.
        (html_text::done_para): Unset `start_space'.
        (html_text::remove_para_align): Call `retrieve_para_space' for the
        spacing.
        
        * src/devices/grohtml/post-html.cpp (html_printer::emit_raw): Unset
        `seen_space'.
        (html_printer::do_check_center): Emit vertical space if necessary.
        
        * src/roff/troff/env.cpp (environment_switch): Preserve
        `seen_space', `seen_eol', and `suppress_next_eol' while switching
        environments.
        
        * src/roff/troff/node.cpp (suppress_node::suppress_node): Set
        `is_special'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.791&tr2=1.792&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/html-text.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/env.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/node.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.791 groff/ChangeLog:1.792
--- groff/ChangeLog:1.791       Sun Feb 20 10:38:36 2005
+++ groff/ChangeLog     Sun Feb 27 06:26:14 2005
@@ -1,3 +1,22 @@
+2005-02-27  Gaius Mulley  <address@hidden>
+
+       * src/devices/grohtml/html-text.cpp (html_text::do_pre): Preserve
+       paragraph spacing.
+       (html_text::done_para): Unset `start_space'.
+       (html_text::remove_para_align): Call `retrieve_para_space' for the
+       spacing.
+
+       * src/devices/grohtml/post-html.cpp (html_printer::emit_raw): Unset
+       `seen_space'.
+       (html_printer::do_check_center): Emit vertical space if necessary.
+
+       * src/roff/troff/env.cpp (environment_switch): Preserve
+       `seen_space', `seen_eol', and `suppress_next_eol' while switching
+       environments.
+
+       * src/roff/troff/node.cpp (suppress_node::suppress_node): Set
+       `is_special'.
+
 2005-02-20  Werner LEMBERG  <address@hidden>
 
        * src/preproc/eqn/eqn.man, NEWS: Document various extensions of
Index: groff/src/devices/grohtml/html-text.cpp
diff -u groff/src/devices/grohtml/html-text.cpp:1.6 
groff/src/devices/grohtml/html-text.cpp:1.7
--- groff/src/devices/grohtml/html-text.cpp:1.6 Wed Feb 16 14:07:24 2005
+++ groff/src/devices/grohtml/html-text.cpp     Sun Feb 27 06:26:15 2005
@@ -444,9 +444,11 @@
   done_tt();
   if (is_present(P_TAG)) {
     html_indent *i = remove_indent(P_TAG);
+    int space = retrieve_para_space();
     (void)done_para();
     if (! is_present(PRE_TAG))
       push_para(PRE_TAG, NULL, i);
+    start_space = space;
   } else if (! is_present(PRE_TAG))
     push_para(PRE_TAG, NULL, NULL);
   dump_stack();
@@ -709,8 +711,11 @@
 
 char *html_text::done_para (void)
 {
+  char *result;
   space_emitted = TRUE;
-  return shutdown(P_TAG);
+  result = shutdown(P_TAG);
+  start_space = FALSE;
+  return result;
 }
 
 /*
@@ -968,8 +973,9 @@
     while (p != NULL) {
       if (p->type == P_TAG && p->arg1 != NULL) {
        html_indent *i = remove_indent(P_TAG);
+       int          space = retrieve_para_space();
        done_para();
-       do_para("", i, space_emitted);
+       do_para("", i, space);
        return;
       }
       p = p->next;
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.19 
groff/src/devices/grohtml/post-html.cpp:1.20
--- groff/src/devices/grohtml/post-html.cpp:1.19        Wed Feb 16 20:20:34 2005
+++ groff/src/devices/grohtml/post-html.cpp     Sun Feb 27 06:26:15 2005
@@ -2225,6 +2225,7 @@
     current_paragraph->done_para();
     next_tag        = INLINE;
     supress_sub_sup = TRUE;
+    seen_space      = FALSE;
     restore_troff_indent();
   }
 }
@@ -2834,6 +2835,7 @@
        seen_space = seen_space || current_paragraph->retrieve_para_space();
        current_paragraph->done_para();
        supress_sub_sup = TRUE;
+       current_paragraph->do_para("", seen_space);
       }
     end_center = next_center;
   }
Index: groff/src/roff/troff/env.cpp
diff -u groff/src/roff/troff/env.cpp:1.11 groff/src/roff/troff/env.cpp:1.12
--- groff/src/roff/troff/env.cpp:1.11   Thu Dec 16 13:09:54 2004
+++ groff/src/roff/troff/env.cpp        Sun Feb 27 06:26:15 2005
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -1130,7 +1130,13 @@
        error("environment stack underflow");
     }
     else {
+      int seen_space = curenv->seen_space;
+      int seen_eol   = curenv->seen_eol;
+      int suppress_next_eol = curenv->suppress_next_eol;
       curenv = env_stack->env;
+      curenv->seen_space = seen_space;
+      curenv->seen_eol   = seen_eol;
+      curenv->suppress_next_eol = suppress_next_eol;
       env_list *tem = env_stack;
       env_stack = env_stack->next;
       delete tem;
Index: groff/src/roff/troff/node.cpp
diff -u groff/src/roff/troff/node.cpp:1.15 groff/src/roff/troff/node.cpp:1.16
--- groff/src/roff/troff/node.cpp:1.15  Thu Dec 16 13:09:54 2004
+++ groff/src/roff/troff/node.cpp       Sun Feb 27 06:26:15 2005
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -3903,6 +3903,7 @@
 suppress_node::suppress_node(symbol f, char p, int id)
 : is_on(2), emit_limits(0), filename(f), position(p), image_id(id)
 {
+  is_special = 1;
 }
 
 suppress_node::suppress_node(int issue_limits, int on_or_off,