From: Valentin Villenave Date: Sun, 24 Oct 2010 12:17:07 +0000 (+0200) Subject: Revert make-void-music and \language functions. X-Git-Tag: release/2.13.37-1~17 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a57acf2755504cfb0813ca02662ad43e7456506;p=lilypond.git Revert make-void-music and \language functions. reverts commit 9e3d1968ffbbbdb60c06468dbdc30f6163dbe01b. reverts commit 1f84e8613c950b773562b95d87c5e051c8016650. reverts commit 02fe038744e634b42f1a3377c4f0dc3d25e80344. reverts commit 25a94417fb5484035bb816260a2168c17ae675ec. Better luck next time, I guess -- if any. --- diff --git a/Documentation/changes.tely b/Documentation/changes.tely index 9002f977b4..6ea50df006 100644 --- 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 7be5119049..0451385176 100644 --- 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/input/regression/note-names.ly b/input/regression/note-names.ly deleted file mode 100644 index eb0e1ec9ee..0000000000 --- a/input/regression/note-names.ly +++ /dev/null @@ -1,28 +0,0 @@ - -\header -{ - texidoc = "Various languages are supported for note names input. -Selecting another language within a music expression is possible, -and doesn't break point-and-click abilities. -" -} - -\version "2.13.37" - -\include "english.ly" - -\relative c'' { - g bf d c - - %% nederlands.ly is loaded by default, so the - %% dutchPitchnames variable is already defined. - #(begin - (set! pitchnames dutchPitchnames) - (ly:parser-set-note-names parser dutchPitchnames)) - bes a g fis - - %% The \language command just retrieves a pitches alist - %% from the relevant file, and sets pitchnames accordingly. - \language "italiano" - sol fa mib re -} \ No newline at end of file diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 76908833f2..54aa7121e2 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -30,8 +30,6 @@ maxima = #(ly:make-duration -3 0) \include "toc-init.ly" %% default note names are dutch -%% This also initializes the pitchnames variable, -%% so we don't want to use \language here. \include "nederlands.ly" \include "drumpitch-init.ly" diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index ad53afe592..8ac1deda01 100644 --- 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?) diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 923a48dc58..688900411f 100644 --- 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))