diff options
| author | Valentin Villenave <valentin@villenave.net> | 2010-10-29 10:24:04 +0200 |
|---|---|---|
| committer | Valentin Villenave <valentin@villenave.net> | 2010-10-29 10:24:04 +0200 |
| commit | ae32937afe6f0bdaf24faf1a57ff3d3537e08b34 (patch) | |
| tree | 039d837503e4db677048adfe59cbe85fed6ec44a /ly | |
| parent | cccab99dae25d9f00513d89401e012af138419b5 (diff) | |
Allow predefined diagrams regardless of note names language.
This should make the @warning in NR 1.1.1 "note names" no
longer needed.
Diffstat (limited to 'ly')
| -rw-r--r-- | ly/declarations-init.ly | 2 | ||||
| -rw-r--r-- | ly/language-init.ly | 5 | ||||
| -rw-r--r-- | ly/predefined-guitar-fretboards.ly | 4 | ||||
| -rw-r--r-- | ly/predefined-ukulele-fretboards.ly | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 5faf35bee0..bddd34e582 100644 --- 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 17a3aa7cb1..4ead6005ad 100644 --- 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 c6d30b0dc2..0211ca98a7 100644 --- 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 554c828fe4..827b04da12 100644 --- 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) |