From: Valentin Villenave <valentin@villenave.net>
Date: Sun, 24 Oct 2010 12:25:06 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.13.37-1~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=37a03b2840c04c4625515fa53772e21911098923;p=lilypond.git

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond

Conflicts:
	ly/music-functions-init.ly
---

37a03b2840c04c4625515fa53772e21911098923
diff --cc ly/music-functions-init.ly
index 8ac1deda01,ad53afe592..b96f90272f
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@@ -360,7 -363,36 +360,6 @@@ label 
  					   'page-label label))))
  
  
 -language =
 -#(define-music-function (parser location str) (string?)
 -   (_i "Select note-names language.")
 -   ;; This function is a hack around the old language
 -   ;; selection system, using separate .ly files for each
 -   ;; supported languages.
 -   ;; TODO: re-implement language selection in a cleaner way.
 -   (let* ((file-name (string-append (string-downcase! str) ".ly"))
 -
 -	  ; Ugh.  ly:gulp-file's "file not found" error message
 -	  ; won't be much informative in this specific case.
 -	  (raw-string (ly:gulp-file file-name))
 -
 -	  ; extract the pitchnames alist.
 -	  (delim-alist (string-match "`\\(.*\\)\\)\\s[ |\n]?\\)" raw-string ))
 -	  (extract-alist (if delim-alist
 -			     (match:substring delim-alist)
 -			     #f)))
 -
 -     (if extract-alist
 -	 (let ((lang-alist (eval-string extract-alist)))
 -	   (if (ly:get-option 'verbose)
 -	       (ly:message (_ "Using ~a note names...") str))
 -	   (set! pitchnames lang-alist)
 -	   (ly:parser-set-note-names parser lang-alist))
 -	 (ly:error (_ "Cannot process ~a as a language file.
 -Use \\include \"~a\" instead.") file-name file-name))
 -     make-void-music))
 -
--
  makeClusters =
  #(define-music-function (parser location arg) (ly:music?)
     (_i "Display chords in @var{arg} as clusters.")