[Groff-commit] groff ChangeLog src/roff/troff/input.cpp tmac/s...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     08/10/04 05:15:18

Modified files:
        .              : ChangeLog 
        src/roff/troff : input.cpp 
        tmac           : s.tmac 

Log message:
        * src/roff/troff/input.cpp (do_suppress): Make \O[3], \O[4], and
        \O[5] non-transparent w.r.t. beginning-of-line recognition (similar
        to the other \O variants).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1148&r2=1.1149
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/input.cpp?cvsroot=groff&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/s.tmac?cvsroot=groff&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1148
retrieving revision 1.1149
diff -u -b -r1.1148 -r1.1149
--- ChangeLog   3 Oct 2008 06:38:28 -0000       1.1148
+++ ChangeLog   4 Oct 2008 05:15:16 -0000       1.1149
@@ -1,3 +1,9 @@
+2008-10-04  Werner LEMBERG  <address@hidden>
+
+       * src/roff/troff/input.cpp (do_suppress): Make \O[3], \O[4], and
+       \O[5] non-transparent w.r.t. beginning-of-line recognition (similar
+       to the other \O variants).
+
 2008-10-03  Werner LEMBERG  <address@hidden>
 
        * src/devices/grops/grops.man, src/roff/troff/troff.man,

Index: src/roff/troff/input.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/input.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/roff/troff/input.cpp    30 Sep 2008 13:47:35 -0000      1.54
+++ src/roff/troff/input.cpp    4 Oct 2008 05:15:17 -0000       1.55
@@ -109,8 +109,8 @@
 int begin_level = 0;           // number of nested \O escapes
 
 int have_input = 0;            // whether \f, \F, \D'F...', \H, \m, \M,
-                               // \R, \s, or \S has been processed in
-                               // token::next()
+                               // \O[345], \R, \s, or \S has been processed
+                               // in token::next()
 int old_have_input = 0;                // value of have_input right before \n
 int tcommand_flag = 0;
 int unsafe_flag = 0;           // safer by default
@@ -5496,9 +5496,11 @@
       return new suppress_node(1, 1);
     break;
   case '3':
+    have_input = 1;
     begin_level++;
     break;
   case '4':
+    have_input = 1;
     begin_level--;
     break;
   case '5':
@@ -5524,6 +5526,8 @@
       image_no++;
       if (begin_level == 0)
        return new suppress_node(symbol(s), position, image_no);
+      else
+       have_input = 1;
     }
     break;
   default:

Index: tmac/s.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/s.tmac,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- tmac/s.tmac 19 Sep 2007 14:55:56 -0000      1.35
+++ tmac/s.tmac 4 Oct 2008 05:15:18 -0000       1.36
@@ -1821,7 +1821,7 @@
 .      nr tbl*have-header 0
 .       if !'\*(.T'html' .sp \\n[DD]u
 .\}
-.      HTML-IMAGE-END
+.HTML-IMAGE-END
 .\" reset tabs
 .TA
 ..