[Groff-commit] groff ChangeLog NEWS src/preproc/eqn/eqn.man sr...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     13/01/06 21:59:21

Modified files:
        .              : ChangeLog NEWS 
        src/preproc/eqn: eqn.man lex.cpp 

Log message:
        [eqn] Add `delim on'.
        
        * src/preproc/eqn/lex.cpp (start_delim_saved, end_delim_saved): New
        global variables.
        (do_delim): Handle `delim on' to restore previous start and end
        delimiters.
        
        * src/preproc/eqn/eqn.man, NEWS: Document it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1370&r2=1.1371
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.272&r2=1.273
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/eqn/eqn.man?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/eqn/lex.cpp?cvsroot=groff&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1370
retrieving revision 1.1371
diff -u -b -r1.1370 -r1.1371
--- ChangeLog   4 Jan 2013 07:28:40 -0000       1.1370
+++ ChangeLog   6 Jan 2013 21:59:21 -0000       1.1371
@@ -1,3 +1,14 @@
+2013-01-06  Werner LEMBERG  <address@hidden>
+
+       [eqn] Add `delim on'.
+
+       * src/preproc/eqn/lex.cpp (start_delim_saved, end_delim_saved): New
+       global variables.
+       (do_delim): Handle `delim on' to restore previous start and end
+       delimiters.
+
+       * src/preproc/eqn/eqn.man, NEWS: Document it.
+
 2013-01-02  Deri James  <address@hidden>
 
        [gropdf] Various minor fixes.

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -b -r1.272 -r1.273
--- NEWS        1 Jan 2013 21:45:21 -0000       1.272
+++ NEWS        6 Jan 2013 21:59:21 -0000       1.273
@@ -9,6 +9,20 @@
 described.  There are more details in the man and info pages.
 
 
+VERSION 1.22.2
+==============
+
+Eqn
+---
+
+o A GNU extension
+
+    delim on
+
+  has been added to reactivate delimiters which have been disabled with
+  `delim off'.
+
+
 VERSION 1.22.1
 ==============
 

Index: src/preproc/eqn/eqn.man
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/eqn/eqn.man,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/preproc/eqn/eqn.man     7 Jul 2012 20:38:20 -0000       1.20
+++ src/preproc/eqn/eqn.man     6 Jan 2013 21:59:21 -0000       1.21
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2004, 2005, 2007, 2009
+Copyright (C) 1989-2001, 2004, 2005, 2007, 2009, 2013
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -131,6 +131,9 @@
 and
 .B .EN
 even when followed by a character other than space or newline.
+Also, the statement
+.RB ` "delim on" '
+is not handled specially.
 .TP
 .B \-N
 Don't allow newlines within delimiters.
@@ -243,6 +246,23 @@
 below;
 these may safely be ignored if you do not know \*(tx.
 .
+.SS Controlling delimiters
+.
+If not in compatibility mode,
+.B eqn
+recognizes
+.
+.RS
+.LP
+.B delim on
+.RE
+.
+.LP
+to restore the delimiters which have been previously disabled
+with a call to
+.RB ` "delim off" '.
+If delimiters haven't been specified, the call has no effect.
+.
 .SS Automatic spacing
 .B eqn
 gives each component of an equation a type, and adjusts the spacing

Index: src/preproc/eqn/lex.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/eqn/lex.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/preproc/eqn/lex.cpp     5 Jan 2009 20:11:06 -0000       1.10
+++ src/preproc/eqn/lex.cpp     6 Jan 2013 21:59:21 -0000       1.11
@@ -1,6 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2005, 2007,
-                 2008, 2009
+/* Copyright (C) 1989-1992, 2000-2003, 2005, 2007-2009, 2013
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -1058,6 +1057,9 @@
   }
 }
 
+char start_delim_saved = '\0';
+char end_delim_saved = '\0';
+
 void do_delim()
 {
   int c = get_char();
@@ -1069,8 +1071,14 @@
   else {
     if (c == 'o' && d == 'f' && peek_char() == 'f') {
       (void)get_char();
+      start_delim_saved = start_delim;
+      end_delim_saved = end_delim;
       start_delim = end_delim = '\0';
     }
+    else if (c == 'o' && d == 'n' && !compatible_flag) {
+      start_delim = start_delim_saved;
+      end_delim = end_delim_saved;
+    }
     else {
       start_delim = c;
       end_delim = d;