allow strings in LilyPond-parens-alist

diff --git a/ChangeLog b/ChangeLog
index aec6a67cfcefae3cb007d93b637db6bd4a20e2d2..adf3eb9ccaa9ad499333e66bfdc86a965b8bb8ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-27  Heikki Junes  <hjunes@cc.hut.fi>
+
+       * lilypond-indent.el: allow strings in LilyPond-parens-alist.
+
 2003-05-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/user/converters.itely (Invoking midi2ly): Update.

diff --git a/lilypond-indent.el b/lilypond-indent.el
index 68b03beeb517ea4916ff51abacadae59b979d9b1..3d62982550e1479d1d9a12556122011b746610a1 100644 (file)
--- a/lilypond-indent.el
+++ b/lilypond-indent.el
@@ -290,17 +290,17 @@ Argument LIM limit."
   `( ( ?<  .  ?> )    
      ( ?{  .  ?} )    
      ( ?[  .  ?] )
-     ;; ( "\\["  .  "\\]" )
+     ( "\\["  .  "\\]" )
      ( ?\(  .  ?\) )
-     ;; ( "\\("  .  "\\)" )
+     ( "\\("  .  "\\)" )
      ))
 
 
 (defun LilyPond-matching-paren (bracket-type)
   "Returns the open corresponding to the close specified by bracket-type, or vice versa"
-  (cond ( (memq bracket-type (mapcar 'car LilyPond-parens-alist))
+  (cond ( (member bracket-type (mapcar 'car LilyPond-parens-alist))
          (cdr (assoc bracket-type LilyPond-parens-alist)) )
-       ( (memq bracket-type (mapcar 'cdr LilyPond-parens-alist))
+       ( (member bracket-type (mapcar 'cdr LilyPond-parens-alist))
          (car (rassoc bracket-type LilyPond-parens-alist)) )
        nil))
 
@@ -327,7 +327,7 @@ slur-paren-p defaults to nil.
       (if slur-paren-p
          ;; expressional slurs  '\( ... \)' are not taken into account
          (setq regexp-alist (cons '( ?\) . ("\\([^\\]\\([\\][\\]\\)*\\|^\\)(" . "\\([^\\]\\([\\][\\]\\)*\\|^\\))")) regexp-alist)))
-      (if (memq bracket-type (mapcar 'car regexp-alist))
+      (if (member bracket-type (mapcar 'car regexp-alist))
          (progn (setq paren-regexp (cdr (assoc bracket-type regexp-alist)))
                 (setq paren-regexp (concat (car paren-regexp) "\\|" (cdr paren-regexp))))
        (setq paren-regexp (concat (mapconcat 'car (mapcar 'cdr regexp-alist) "\\|") "\\|"