Allow predefined diagrams regardless of note names language.

This should make the @warning in NR 1.1.1 "note names" no
longer needed.

diff --git a/Documentation/de/notation/pitches.itely b/Documentation/de/notation/pitches.itely
index 807d9116df44a80222559496182d1064aa726687..6946922777fd99e684eb2a2dd2d0b77bb0567767 100644 (file)
--- a/Documentation/de/notation/pitches.itely
+++ b/Documentation/de/notation/pitches.itely
@@ -477,12 +477,6 @@ Zum Beispiel fügt man mit @code{@w{\include "deutsch.ly"}} die
 Notendefinitionen für die deutsche Sprache am Anfang der Datei 
 hinzu
 
-@warning{Weil in einigen @code{\include}-Dateien (wie
-beispielsweise @code{@w{predefined-fretboards.ly}}) die niederländischen
-(Standard-)Notenbezeichnungen benutzt werden, muss der
-@code{@bs{}include}-Befehl für die Sprachdatei nach allen
-anderen LilyPond-eigenen Dateien gesetzt werden.}
-
 In der Tabelle sind die existierenden Sprachdefinitionen
 mit den dazugehörigen Notenbezeichnungen dargestellt.
 

diff --git a/Documentation/es/notation/pitches.itely b/Documentation/es/notation/pitches.itely
index 08b8d3060552bd3949659c2a8c09fea0fe5fdc54..97552a367b7b584240c3b9f8f53f43e4088b05d8 100644 (file)
--- a/Documentation/es/notation/pitches.itely
+++ b/Documentation/es/notation/pitches.itely
@@ -450,12 +450,6 @@ archivo de inicio específico del idioma según aparece relacionado más
 abajo.  Por ejemplo, para usar los nombres de las notas en español,
 inserte @code{@w{\include "espanol.ly"}} en el archivo de entrada.
 
-@warning{A causa de que alguno de los otros archivos de inclusión
-(como @code{@w{predefined-fretboards.ly}}) utilizan los nombres de
-nota predeterminados (holandeses), la instrucción @code{@bs{}include}
-para el archivo de idioma se debe colocar después de todos los demás
-archivos de la distribución de LilyPond.}
-
 Los archivos de idioma disponibles y los nombres de las notas que
 definen son los siguientes:
 

diff --git a/Documentation/fr/notation/pitches.itely b/Documentation/fr/notation/pitches.itely
index 4eda2db2965c4d95154784693b95b97142041857..3468713eb454071c535eec7ccfd1a8964d224509 100644 (file)
--- a/Documentation/fr/notation/pitches.itely
+++ b/Documentation/fr/notation/pitches.itely
@@ -440,12 +440,6 @@ langues.  Pour les utiliser, incluez le fichier d'initialisation
 spécifique à la langue voulue.  Par exemple, pour les langues romanes,
 ajoutez @w{@code{\include "italiano.ly"}} au début du fichier source.
 
-@warning{Dans la mesure où certains fichiers d'initialisation, comme 
-@w{@code{predefined-fretboards.ly}}, utilisent les conventions bataves,
-la commande @code{@bs{}include} concernant la langue que vous désirez
-utiliser doît intervenir après toutes les autres inclusions de fichier
-d'initialisation de LilyPond.}
-
 Les fichiers de langue disponibles ainsi que les noms de note utilisés
 sont les suivants@tie{}:
 

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 0451385176735a3e839eeef30c2054e15e4726c1..f63a815316c0451a920f8893f20864d66b38af99 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -443,11 +443,6 @@ 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, 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:
 
 @quotation

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 5faf35bee068b68f2e3c793213ee405c0da8a015..bddd34e58208602ea0648094b1cc2e9700acbcbc 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -30,6 +30,8 @@ maxima = #(ly:make-duration -3 0)
 \include "toc-init.ly"
 
 \include "language-init.ly"
+pitchnames = #default-language
+#(ly:parser-set-note-names parser pitchnames)
 
 \include "drumpitch-init.ly"
 \include "chord-modifiers-init.ly"

diff --git a/ly/language-init.ly b/ly/language-init.ly
index 17a3aa7cb1455eade29757d5027269a3f2353690..4ead6005ad81659b79de1bf5c3f340c90ab57be4 100644 (file)
--- a/ly/language-init.ly
+++ b/ly/language-init.ly
@@ -956,6 +956,5 @@
   ))
 
 %% default note names are dutch
-pitchnames = #(ly:assoc-get 'nederlands language-pitch-names '())
-#(ly:parser-set-note-names parser pitchnames)
-
+#(define default-language
+  (ly:assoc-get 'nederlands language-pitch-names '()))

diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly
index c6d30b0dc2e87b058dbd73bbab2c58060dfd48e2..0211ca98a7845583d859debf1080b5d2423930a1 100644 (file)
--- a/ly/predefined-guitar-fretboards.ly
+++ b/ly/predefined-guitar-fretboards.ly
@@ -15,6 +15,9 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
+% chord definitions require default pitchnames
+#(define prev-pitchnames pitchnames)
+#(set! pitchnames default-language)
 
 \include "predefined-guitar-ninth-fretboards.ly"
 
@@ -449,3 +452,4 @@
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'bes:m7 guitar-tuning))
 
+#(set! pitchnames prev-pitchnames)

diff --git a/ly/predefined-ukulele-fretboards.ly b/ly/predefined-ukulele-fretboards.ly
index 554c828fe4b3da93b36ac515245553619526d99f..827b04da12659da8b69fd895854dab13ec6ebfd9 100644 (file)
--- a/ly/predefined-ukulele-fretboards.ly
+++ b/ly/predefined-ukulele-fretboards.ly
@@ -21,6 +21,9 @@
 %%%%   ukulele hall of fame museum website (http://www.ukulele.org/),
 %%%%   kiwi ukulele website (http://www.kiwiukulele.co.nz/)
 
+% chord definitions require default pitchnames
+#(define prev-pitchnames pitchnames)
+#(set! pitchnames default-language)
 
 %%% a chords
 
@@ -803,3 +806,5 @@
 \storePredefinedDiagram #default-fret-table \chordmode {aes:9}
                         #ukulele-tuning
                         #"1-1;o;2-3;1-2;"
+
+#(set! pitchnames prev-pitchnames)