[Groff-commit] groff ChangeLog src/roff/grog/grog.sh

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     12/05/24 11:35:43

Modified files:
        .              : ChangeLog 
        src/roff/grog  : grog.sh 

Log message:
        * src/roff/grog/grog.sh: Fix .so handling.
        
        See
        
          http://lists.gnu.org/archive/html/bug-groff/2012-05/msg00000.html
        
        for the report and the bug fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1334&r2=1.1335
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/grog.sh?cvsroot=groff&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1334
retrieving revision 1.1335
diff -u -b -r1.1334 -r1.1335
--- ChangeLog   24 May 2012 06:36:15 -0000      1.1334
+++ ChangeLog   24 May 2012 11:35:43 -0000      1.1335
@@ -1,3 +1,13 @@
+2012-05-24  Denis M. Wilson  <address@hidden>
+
+       * src/roff/grog/grog.sh: Fix .so handling.
+
+       See
+
+         http://lists.gnu.org/archive/html/bug-groff/2012-05/msg00000.html
+
+       for the report and the bug fix.
+
 2012-05-24  Ivan Shmakov  <address@hidden>
 
        Add some generic fallback characters.

Index: src/roff/grog/grog.sh
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/grog/grog.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/roff/grog/grog.sh       22 Jan 2011 15:18:57 -0000      1.19
+++ src/roff/grog/grog.sh       24 May 2012 11:35:43 -0000      1.20
@@ -5,7 +5,7 @@
 # Source file position: <groff-source>/src/roff/grog/grog.sh
 # Installed position: <prefix>/bin/grog
 
-# Copyright (C) 1993, 2006, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2006, 2009, 2011-2012 Free Software Foundation, Inc.
 # Written by James Clark, maintained by Werner Lemberg.
 # Rewritten by and put under GPL Bernd Warken.
 
@@ -159,7 +159,8 @@
 | @EGREP@ \
     '^\.(cstart|P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* 
Oc|NH|TL|TS|TE|EQ|TH|TL|NH|SH|\[|\]|R1|GS|G1|PH|SA|SO_START|SO_END)' \
 | awk '
-/^\.SO_START$/ { so = 1 }
+/^\.SO_START$/ { so = 1
+  soelim = soelim||chem||eqn||grap||grn||pic||tbl||refer||(refer_start && 
!refer_end) }
 /^\.SO_END$/ { so = 0 }
 /^\.cstart$/ { chem++; if (so > 0) soelim++ }
 /^\.TS/ { tbl++; in_tbl = 1; if (so > 0) soelim++; }