[Groff-commit] groff ./ChangeLog src/roff/troff/env.cpp tmac/a...

[Werner LEMBERG]

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

Modified files:
        .              : ChangeLog 
        src/roff/troff : env.cpp 
        tmac           : an-old.tmac 

Log message:
        * tmac/an-old.tmac (an-do-tag): Make margin characters work.
        
        * src/roff/troff/env.cpp (environment::copy): Copy margin character
        node.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.960&tr2=1.961&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/roff/troff/env.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/tmac/an-old.tmac.diff?tr1=1.52&tr2=1.53&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.960 groff/ChangeLog:1.961
--- groff/ChangeLog:1.960       Wed May 24 07:36:03 2006
+++ groff/ChangeLog     Sat May 27 05:43:37 2006
@@ -1,3 +1,10 @@
+2006-05-26  Werner LEMBERG  <address@hidden>
+
+       * tmac/an-old.tmac (an-do-tag): Make margin characters work.
+
+       * src/roff/troff/env.cpp (environment::copy): Copy margin character
+       node.
+
 2006-05-21  Werner LEMBERG  <address@hidden>
 
        * tmac/trace.tmac (de1): Fix serious typo (.di -> .do) and minor
@@ -4400,7 +4407,7 @@
        (doc-str-Rv-std-suffix, doc-str-Rv-stds-suffix, doc-str-Rv-std0):
        Use minus, not hyphen.
 
-       * tmc/groff_mdoc.man: Updated.
+       * tmac/groff_mdoc.man: Updated.
 
 2003-07-01  Werner LEMBERG  <address@hidden>
 
Index: groff/src/roff/troff/env.cpp
diff -u groff/src/roff/troff/env.cpp:1.15 groff/src/roff/troff/env.cpp:1.16
--- groff/src/roff/troff/env.cpp:1.15   Sat Feb 11 20:34:37 2006
+++ groff/src/roff/troff/env.cpp        Sat May 27 05:43:37 2006
@@ -837,7 +837,8 @@
   current_tab = TAB_NONE;
   current_field = 0;
   margin_character_flags = e->margin_character_flags;
-  margin_character_node = e->margin_character_node;
+  if (e->margin_character_node)
+    margin_character_node = e->margin_character_node->copy();
   margin_character_distance = e->margin_character_distance;
   numbering_nodes = 0;
   number_text_separation = e->number_text_separation;
Index: groff/tmac/an-old.tmac
diff -u groff/tmac/an-old.tmac:1.52 groff/tmac/an-old.tmac:1.53
--- groff/tmac/an-old.tmac:1.52 Thu Sep  1 22:25:06 2005
+++ groff/tmac/an-old.tmac      Sat May 27 05:43:37 2006
@@ -417,10 +417,17 @@
 .  di
 .  nr an-div? 0
 .  ll
+.  \" We must emit the diversion in a separate environment to
+.  \" assure that a possible margin character is printed correctly.
 .  ie (\\n[dl] + \\n[an-tag-sep] > \\n[an-prevailing-indent]) \{\
+.    ev 2
+.    evc 0
+.    mc
+.    nf
 .    in \\n[an-margin]u
 .    ne (2v + 1u)
 .    an-div
+.    ev
 .    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .  \}
 .  el \{\
@@ -428,12 +435,17 @@
 .    \" of the character cell, it is possible that the following combination
 .    \" of .in and .ti yields a different result as the .in request in
 .    \" the .ie part above.
-.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
-.    ti -\\n[an-prevailing-indent]u
-.    chop an-div
+.    ev 2
+.    evc 0
+.    mc
+.    nf
+.    in \\n[an-margin]u
 .    ne (1v + 1u)
 .    DEVTAG-COL 1
-\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
+.    an-div
+.    sp -1
+.    ev
+.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .    DEVTAG-COL-NEXT 2
 .  \}
 ..