From 6ad7ab4e0af8d5879103467094d140c741f73a36 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 17 Oct 2004 03:37:16 +0000
Subject: [PATCH] Update TEXINFO-ENVIRONMENT-REGEXP to match more things.

---
 v7/src/edwin/tximod.scm | 107 +++++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 41 deletions(-)

diff --git a/v7/src/edwin/tximod.scm b/v7/src/edwin/tximod.scm
index db8ff2505..39355238c 100644
--- a/v7/src/edwin/tximod.scm
+++ b/v7/src/edwin/tximod.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: tximod.scm,v 1.30 2004/10/14 17:37:25 cph Exp $
+$Id: tximod.scm,v 1.31 2004/10/17 03:37:16 cph Exp $
 
 Copyright 1987,1989,1990,1991,1992,1994 Massachusetts Institute of Technology
 Copyright 1996,2000,2001,2004 Massachusetts Institute of Technology
@@ -209,46 +209,71 @@ The default is not to surround any existing words with the braces."
 	(let ((m
 	       (re-search-backward texinfo-environment-regexp mark start #f)))
 	  (if m
-	      (cond ((match-forward "@end" m)
-		     (loop m (+ depth 1)))
-		    ((> depth 1)
-		     (loop m (- depth 1)))
-		    (else
-		     (re-match-forward texinfo-environment-regexp m)
-		     (insert-string "@end ")
-		     (insert-region (re-match-start 1)
-				    (re-match-end 1))
-		     (insert-newline)))
+	      (let ((string (re-match-extract-string 1)))
+		(cond ((string=? string "end")
+		       (loop m (+ depth 1)))
+		      ((> depth 1)
+		       (loop m (- depth 1)))
+		      (else
+		       (insert-string "@end ")
+		       (insert-string string)
+		       (insert-newline))))
 	      (insert-string "@end ")))))))
 
 (define texinfo-environment-regexp
-  (string-append
-   "^@"
-   (regexp-group "cartouche"
-		 "copying"
-		 "def[a-z]*[a-wyz]\\>"
-		 "direntry"
-		 "display"
-		 "end"
-		 "enumerate"
-		 "example"
-		 "f?table"
-		 "flushleft"
-		 "flushright"
-		 "format"
-		 "group"
-		 "html"
-		 "ifclear"
-		 "ifhtml"
-		 "ifinfo"
-		 "ifset"
-		 "iftex"
-		 "ignore"
-		 "itemize"
-		 "lisp"
-		 "menu"
-		 "quotation"
-		 "smallexample"
-		 "smalllisp"
-		 "tex"
-		 "titlepage")))
\ No newline at end of file
+  (string-append "^@"
+		 (regexp-group "cartouche"
+			       "copying"
+			       "defcv"
+			       "deffn"
+			       "defivar"
+			       "defmac"
+			       "defmethod"
+			       "defop"
+			       "defopt"
+			       "defspec"
+			       "deftp"
+			       "deftypefn"
+			       "deftypefun"
+			       "deftypevar"
+			       "deftypevr"
+			       "defun"
+			       "defvar"
+			       "defvr"
+			       "description"
+			       "detailmenu"
+			       "direntry"
+			       "display"
+			       "end"
+			       "enumerate"
+			       "example"
+			       "flushleft"
+			       "flushright"
+			       "format"
+			       "ftable"
+			       "group"
+			       "html"
+			       "ifclear"
+			       "ifhtml"
+			       "ifinfo"
+			       "ifnothtml"
+			       "ifnotinfo"
+			       "ifnottex"
+			       "ifset"
+			       "iftex"
+			       "ignore"
+			       "itemize"
+			       "lisp"
+			       "macro"
+			       "menu"
+			       "multitable"
+			       "quotation"
+			       "smalldisplay"
+			       "smallexample"
+			       "smallformat"
+			       "smalllisp"
+			       "table"
+			       "tex"
+			       "titlepage"
+			       "vtable")
+		 "\\>"))
\ No newline at end of file
-- 
2.25.1