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

Conflicts:
	ly/music-functions-init.ly

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 9002f977b4f03133098acf6a5741a86f4122f715..6ea50df006e096cb0457816a286aac317ff433f2 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -66,14 +66,6 @@ which scares away people.
 
 @end ignore
 
-
-@item
-A new @code{\language} command makes it easier to select
-note names languages: instead of the usual
-@code{\include "italiano.ly"} syntax (which is still
-supported and recommended), it is possible to just type
-@code{\language "italiano"}.
-
 @item
 auotbeaming is now disabled by @code{\cadenzaOn} and enabled by
 @code{\cadenzaOff}.  Beaming in cadenzas should be indicated manually.

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 7be51190499249fae86a30368185ae580ed9b3ba..0451385176735a3e839eeef30c2054e15e4726c1 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -439,32 +439,14 @@ any standard.
 @cindex language, pitch names in other
 
 There are predefined sets of note and accidental names for various
-other languages.  These may be selected using the following
-shortcut syntax:
-
-@example
-\language "italiano"
-@end example
-
-@noindent
-for Italian note names, or any other supported language listed below.
-Alternatively, the relevant language-specific file may be directly
-included in the input file; the previous example could equally be
-written as follows:
-
-@example
-\include "italiano.ly"
-@end example
-
-@noindent
-The latter syntax is actually more reliable, in that it allows for more
-complex files to be included: for instance the @file{arabic.ly} file is
-not supported by the @code{@bs{}language} shortcut, and can only be
-processed through the @code{@bs{}include} command.
+other languages.  To use them, include the language-specific init
+file listed below.  For example, to use English note names, add
+@code{@w{\include "english.ly"}} to the input file.
 
 @warning{Because some other include files (such as @code{@w{predefined-fretboards.ly}})
-use default (Nederlands) note names, it is recommended to select the note name language
-@emph{after} having included all other LilyPond distribution files.}
+use default (Nederlands) note names, the @code{@bs{}include}
+command for the language file should be placed after all other
+LilyPond distribution files.}
 
 The available language files and the note names they define are:
 

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index ad53afe592f626f3c0b092010846ca429ac8bac0..b96f90272fc8c2c4c8e4764679bcb27f7759e98a 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,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.")

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 923a48dc58b331413ca67579af5ad41f389449c6..688900411fa446304cb390465cdbb6aae86f418f 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -470,10 +470,6 @@ i.e.  this is not an override"
   (make-music 'SkipMusic
              'duration dur))
 
-(define-public make-void-music
-  (make-music 'Music
-             'void #t))
-
 (define-public (make-grace-music music)
   (make-music 'GraceMusic
              'element music))