From 645646ce8d2390a4e2b249b219ed07464ad88836 Mon Sep 17 00:00:00 2001 From: Heikki Junes Date: Mon, 26 May 2003 23:56:07 +0000 Subject: [PATCH] allow strings in LilyPond-parens-alist --- ChangeLog | 4 ++++ lilypond-indent.el | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index aec6a67cfc..adf3eb9cca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-05-27 Heikki Junes + + * lilypond-indent.el: allow strings in LilyPond-parens-alist. + 2003-05-26 Jan Nieuwenhuizen * Documentation/user/converters.itely (Invoking midi2ly): Update. diff --git a/lilypond-indent.el b/lilypond-indent.el index 68b03beeb5..3d62982550 100644 --- 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) "\\|") "\\|" -- 2.39.2