Revert make-void-music and \language functions.

[lilypond.git] / ly / music-functions-init.ly

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index ad53afe592f626f3c0b092010846ca429ac8bac0..8ac1deda0113e19ca9676a17cbcf573d5e0eeb09 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -25,12 +25,9 @@
 %% this file is alphabetically sorted.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% need SRFI-1 for filter;
-%% optargs for lambda*;
-%% regex for string-match
+%% need SRFI-1 for filter; optargs for lambda*
 #(use-modules (srfi srfi-1)
-             (ice-9 optargs)
-             (ice-9 regex))
+             (ice-9 optargs))
 
 %% TODO: using define-music-function in a .scm causes crash.
 
@@ -363,35 +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?)