From d9d72186ca281ea763cb2d50446a113ab0a26779 Mon Sep 17 00:00:00 2001 From: Carl Sorensen Date: Mon, 20 Sep 2010 03:19:00 -0600 Subject: [PATCH] Allow user-defined predefined fretboard hash-table Add fretboard-table argument to \storePredefinedDiagram Add rule to convertrules.py Modify all predefined-*-fretboards.ly Modify regression tests Run makelsr.py --- Documentation/changes.tely | 5 + .../adding-fingerings-to-tablatures.ly | 2 +- ...adding-orchestral-cues-to-a-vocal-score.ly | 4 +- .../adjusting-lyrics-vertical-spacing.ly | 2 +- Documentation/snippets/ancient-headword.ly | 2 +- .../snippets/anglican-psalm-template.ly | 2 +- .../snippets/automatic-beam-subdivisions.ly | 2 +- .../snippets/beam-endings-in-score-context.ly | 2 +- .../snippets/beam-grouping-in-7-8-time.ly | 2 +- ...ring-markup-on-note-heads-automatically.ly | 2 +- .../snippets/changing-the-ambitus-gap.ly | 2 +- ...he-number-of-augmentation-dots-per-note.ly | 2 +- .../changing-the-size-of-woodwind-diagrams.ly | 2 +- ...signature-without-affecting-the-beaming.ly | 2 +- .../snippets/chordchanges-for-fretboards.ly | 2 +- Documentation/snippets/chords-headword.ly | 2 +- Documentation/snippets/clip-systems.ly | 2 +- .../snippets/compound-time-signatures.ly | 2 +- ...onducting-signs,-measure-grouping-signs.ly | 2 +- ...g-spanner-visibility-after-a-line-break.ly | 2 +- .../customizing-fretboard-fret-diagrams.ly | 35 +- ...-an-engraver-in-scheme-ambitus-engraver.ly | 2 +- .../snippets/displaying-complex-chords.ly | 2 +- .../snippets/displaying-grob-ancestry.ly | 2 +- ...entals-for-each-note-including-naturals.ly | 2 +- .../dynamics-custom-text-spanner-postfix.ly | 2 +- .../snippets/dynamics-text-spanner-postfix.ly | 2 +- Documentation/snippets/editorial-headword.ly | 2 +- Documentation/snippets/expressive-headword.ly | 2 +- .../snippets/faking-a-hammer-in-tablatures.ly | 2 +- .../snippets/figured-bass-headword.ly | 2 +- Documentation/snippets/flamenco-notation.ly | 2 +- Documentation/snippets/fretted-headword.ly | 2 +- .../snippets/fretted-strings.snippet-list | 1 + .../graphical-and-text-woodwind-diagrams.ly | 2 +- Documentation/snippets/grouping-beats.ly | 2 +- Documentation/snippets/guitar-slides.ly | 2 +- ...tied-notes-at-the-start-of-a-new-system.ly | 2 +- Documentation/snippets/incipit.ly | 2 +- Documentation/snippets/keyboard-headword.ly | 2 +- .../snippets/letter-tablature-formatting.ly | 2 +- Documentation/snippets/makam-example.ly | 2 +- ...aking-slurs-with-complex-dash-structure.ly | 2 +- .../snippets/modern-tab-text-clef.ly | 2 +- .../new/fretboards-alternate-tables.ly | 61 +++ .../snippets/non-default-tuplet-numbers.ly | 2 +- .../non-traditional-key-signatures.ly | 2 +- .../snippets/numbers-as-easy-note-heads.ly | 2 +- .../piano-template-with-centered-dynamics.ly | 2 +- Documentation/snippets/pitches-headword.ly | 2 +- Documentation/snippets/repeats-headword.ly | 2 +- .../reverting-default-beam-endings.ly | 2 +- Documentation/snippets/rhythms-headword.ly | 2 +- Documentation/snippets/screech-boink.ly | 2 +- ...ing-the-double-repeat-default-for-volte.ly | 2 +- ...ulation-above-and-below-a-note-or-chord.ly | 2 +- .../snippets/simultaneous-headword.ly | 2 +- .../snap-pizzicato-bartok-pizzicato.ly | 2 +- Documentation/snippets/staff-headword.ly | 2 +- .../stem-and-beam-behavior-in-tablature.ly | 2 +- Documentation/snippets/subdividing-beams.ly | 2 +- Documentation/snippets/text-headword.ly | 2 +- Documentation/snippets/unfretted-headword.ly | 2 +- ...grob-object-to-access-grobs-with--tweak.ly | 2 +- .../snippets/using-the-whiteout-property.ly | 2 +- ...nsemble-template-with-verse-and-refrain.ly | 2 +- Documentation/snippets/wind-headword.ly | 2 +- .../snippets/woodwind-diagrams-key-lists.ly | 2 +- .../snippets/woodwind-diagrams-listing.ly | 2 +- Documentation/web/news-front.itexi | 4 +- VERSION | 2 +- input/regression/auto-beam-partial-grace.ly | 2 +- .../page-breaking-outside-staff-estimation.ly | 2 +- .../part-combine-force-mmrest-position.ly | 2 +- input/regression/part-combine-force-once.ly | 2 +- input/regression/part-combine-force.ly | 2 +- input/regression/predefined-fretboards.ly | 6 +- ly/declarations-init.ly | 10 +- ly/engraver-init.ly | 2 +- ly/predefined-fretboards-init.ly | 15 +- ly/predefined-guitar-fretboards.ly | 240 +++++------ ly/predefined-guitar-ninth-fretboards.ly | 36 +- ly/predefined-ukulele-fretboards.ly | 376 +++++++++--------- ly/property-init.ly | 2 +- python/convertrules.py | 9 + 85 files changed, 527 insertions(+), 419 deletions(-) create mode 100644 Documentation/snippets/new/fretboards-alternate-tables.ly diff --git a/Documentation/changes.tely b/Documentation/changes.tely index f754c5111f..90d964256f 100644 --- a/Documentation/changes.tely +++ b/Documentation/changes.tely @@ -66,6 +66,11 @@ which scares away people. @end ignore +@item +The user is now able to specify the name of the predefined fretboard +table. This allows the use of multiple tables, with switching between them +based on user input. + @item The part-combiner's decision to combine/not combine notes can now be customized @lilypond[quote,relative=2] diff --git a/Documentation/snippets/adding-fingerings-to-tablatures.ly b/Documentation/snippets/adding-fingerings-to-tablatures.ly index d6a5253b9e..0f35642664 100644 --- a/Documentation/snippets/adding-fingerings-to-tablatures.ly +++ b/Documentation/snippets/adding-fingerings-to-tablatures.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.17 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly index 3c8c45c66e..f94113afdf 100644 --- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly +++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.34 -\version "2.13.34" +\version "2.13.36" \header { lsrtags="vocal-music, staff-notation" @@ -81,4 +81,4 @@ pianoLH = \relative c { c4 e, } } >> >> -} \ No newline at end of file +} diff --git a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly index 3055669397..693dce15bd 100644 --- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly +++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.16 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/ancient-headword.ly b/Documentation/snippets/ancient-headword.ly index 9477216504..20d36a9a94 100644 --- a/Documentation/snippets/ancient-headword.ly +++ b/Documentation/snippets/ancient-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly index a46c4e9e96..0cc03d74f5 100644 --- a/Documentation/snippets/anglican-psalm-template.ly +++ b/Documentation/snippets/anglican-psalm-template.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.32 -\version "2.13.32" +\version "2.13.36" \header { lsrtags = "vocal-music, template" diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly index a08bd6b152..91d4a14cc3 100644 --- a/Documentation/snippets/automatic-beam-subdivisions.ly +++ b/Documentation/snippets/automatic-beam-subdivisions.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.29 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly index 1c340524c4..f79d00a93d 100644 --- a/Documentation/snippets/beam-endings-in-score-context.ly +++ b/Documentation/snippets/beam-endings-in-score-context.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.29 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/beam-grouping-in-7-8-time.ly b/Documentation/snippets/beam-grouping-in-7-8-time.ly index d478bdc5c2..13fbce022d 100644 --- a/Documentation/snippets/beam-grouping-in-7-8-time.ly +++ b/Documentation/snippets/beam-grouping-in-7-8-time.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.29 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly index f76a23e5da..d6ea01ba94 100644 --- a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly +++ b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.15 -\version "2.13.31" +\version "2.13.36" \header { lsrtags = "text, tweaks-and-overrides, contexts-and-engravers" diff --git a/Documentation/snippets/changing-the-ambitus-gap.ly b/Documentation/snippets/changing-the-ambitus-gap.ly index 3a6c1bcec1..3fea24e98c 100644 --- a/Documentation/snippets/changing-the-ambitus-gap.ly +++ b/Documentation/snippets/changing-the-ambitus-gap.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.26 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 31097723b2b816696ad61696630a80ff17a39557 texidocfr = "L'affichage d'un @emph{ambitus} peut s'affiner pour diff --git a/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly b/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly index 72598af1aa..c4727d00b6 100644 --- a/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly +++ b/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.26 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033 diff --git a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly index 83899ec84b..743af1c022 100644 --- a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly +++ b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.31 -\version "2.13.31" +\version "2.13.36" \header { %%% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 diff --git a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly index 8a444bb2da..2ccf8260cb 100644 --- a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly +++ b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.5 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/chordchanges-for-fretboards.ly b/Documentation/snippets/chordchanges-for-fretboards.ly index 80e6b2c230..945b2fdeb4 100644 --- a/Documentation/snippets/chordchanges-for-fretboards.ly +++ b/Documentation/snippets/chordchanges-for-fretboards.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.0 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/chords-headword.ly b/Documentation/snippets/chords-headword.ly index fd71dc5902..c67bbeba95 100644 --- a/Documentation/snippets/chords-headword.ly +++ b/Documentation/snippets/chords-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" #(set-global-staff-size 15) \paper { ragged-right = ##f diff --git a/Documentation/snippets/clip-systems.ly b/Documentation/snippets/clip-systems.ly index b004980c41..01ebb9f138 100644 --- a/Documentation/snippets/clip-systems.ly +++ b/Documentation/snippets/clip-systems.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly index a12c86d650..4bf9463802 100644 --- a/Documentation/snippets/compound-time-signatures.ly +++ b/Documentation/snippets/compound-time-signatures.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.29 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly index cfb6e65e27..0ec502832f 100644 --- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly +++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.29 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly index e532cc7a0a..894727b7a3 100644 --- a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly +++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.1 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly index ed1a240b63..e613a63323 100644 --- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly +++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly @@ -1,9 +1,39 @@ +% Do not edit this file; it is automatically +% generated from Documentation/snippets/new +% This file is in the public domain. +%% Note: this file works from version 2.13.31 %% Do not edit this file; it is automatically %% generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.13.31" +\version "2.13.36" \header { +%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b + texidoces = " +Se pueden establecer las propiedades de los diagramas de +posiciones de acordes por medio de @code{'fret-diagram-details}. +Para los diagramas de posiciones de FretBoard, se aplican los +overrides (sobreescrituras) al objeto @code{FretBoards.FretBoard}. +Como @code{Voice}, @code{FretBoards} es un contexto del nivel +inferior, y por tanto se puede omitir su nombre en la +sobreescritura de propiedades. + +" + doctitlees = "Personalizar los diagramas de posiciones" + + +%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 + texidocde = " +Eigenschaften von Bunddiagrammen können in +@code{'fret-diagram-details} verändert werden. Einstellungen mit +dem @code{\\override}-Befehl werden dem @code{FretBoards.FretBoard}-Objekt +zugewiesen. Genauso wie @code{Voice} ist auch @code{FretBoards} ein +Kontext der niedrigsten Ebene, weshalb der Kontext auch in dem Befehl +weggelassen werden kann. + +" + doctitlede = "Bunddiagramme anpassen" + lsrtags = "fretted-strings, tweaks-and-overrides" %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b @@ -44,7 +74,8 @@ can be omitted in property overrides. } % begin verbatim \include "predefined-guitar-fretboards.ly" -\storePredefinedDiagram \chordmode { c' } +\storePredefinedDiagram #default-fret-table \chordmode { c' } % begin verbatim + #guitar-tuning #"x;1-1-(;3-2;3-3;3-4;1-1-);" << diff --git a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly index b54d3f601b..b7b55113f0 100644 --- a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly +++ b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.15 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly index 61bcfd6f35..f9dd0ae78a 100644 --- a/Documentation/snippets/displaying-complex-chords.ly +++ b/Documentation/snippets/displaying-complex-chords.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.1 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly index a13e955230..bf1f5adda5 100644 --- a/Documentation/snippets/displaying-grob-ancestry.ly +++ b/Documentation/snippets/displaying-grob-ancestry.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.10 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 9e21edc34c..89fb5eb513 100644 --- a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly index 73582ab227..16bc2962ca 100644 --- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly +++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.8 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/dynamics-text-spanner-postfix.ly b/Documentation/snippets/dynamics-text-spanner-postfix.ly index 24c94d618b..a8553ed11e 100644 --- a/Documentation/snippets/dynamics-text-spanner-postfix.ly +++ b/Documentation/snippets/dynamics-text-spanner-postfix.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.20 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/editorial-headword.ly b/Documentation/snippets/editorial-headword.ly index 6efcdb489d..f2b26ade96 100644 --- a/Documentation/snippets/editorial-headword.ly +++ b/Documentation/snippets/editorial-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/expressive-headword.ly b/Documentation/snippets/expressive-headword.ly index b7bbe4d9ae..1c494bfc8a 100644 --- a/Documentation/snippets/expressive-headword.ly +++ b/Documentation/snippets/expressive-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/faking-a-hammer-in-tablatures.ly index e293383964..c41d3430e7 100644 --- a/Documentation/snippets/faking-a-hammer-in-tablatures.ly +++ b/Documentation/snippets/faking-a-hammer-in-tablatures.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly index 7b05b2990b..13850a5ba0 100644 --- a/Documentation/snippets/figured-bass-headword.ly +++ b/Documentation/snippets/figured-bass-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" #(set-global-staff-size 15) \paper { ragged-right = ##f diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly index e10b507039..41aa067686 100644 --- a/Documentation/snippets/flamenco-notation.ly +++ b/Documentation/snippets/flamenco-notation.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.10 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly index 3c96cf7dc6..5b1370652f 100644 --- a/Documentation/snippets/fretted-headword.ly +++ b/Documentation/snippets/fretted-headword.ly @@ -7,7 +7,7 @@ % on melodies from Bellini's "Norma" % %*****************************************************************% -\version "2.13.31" +\version "2.13.36" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list index fe91aa1482..056eb0dfea 100644 --- a/Documentation/snippets/fretted-strings.snippet-list +++ b/Documentation/snippets/fretted-strings.snippet-list @@ -12,6 +12,7 @@ faking-a-hammer-in-tablatures.ly fingerings,-string-indications,-and-right-hand-fingerings.ly flamenco-notation.ly fret-diagrams-explained-and-developed.ly +fretboards-alternate-tables.ly guitar-slides.ly guitar-strum-rhythms.ly how-to-change-fret-diagram-position.ly diff --git a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly index d6a558dfe8..8feb3cf7de 100644 --- a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly +++ b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.31 -\version "2.13.31" +\version "2.13.36" \header { %%% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 diff --git a/Documentation/snippets/grouping-beats.ly b/Documentation/snippets/grouping-beats.ly index 9b1ac2276d..2ee5ae56cd 100644 --- a/Documentation/snippets/grouping-beats.ly +++ b/Documentation/snippets/grouping-beats.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/guitar-slides.ly b/Documentation/snippets/guitar-slides.ly index 5fd9890013..41812a5ad1 100644 --- a/Documentation/snippets/guitar-slides.ly +++ b/Documentation/snippets/guitar-slides.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly index 9bcb153902..b3a8fae798 100644 --- a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly +++ b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.26 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 31097723b2b816696ad61696630a80ff17a39557 texidocfr = "Cet exemple illustre comment, lorsqu'une note affublée diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly index 27d526d1fa..c96d3f93c4 100644 --- a/Documentation/snippets/incipit.ly +++ b/Documentation/snippets/incipit.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/keyboard-headword.ly b/Documentation/snippets/keyboard-headword.ly index 97f405b56c..25041bc4a2 100644 --- a/Documentation/snippets/keyboard-headword.ly +++ b/Documentation/snippets/keyboard-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) diff --git a/Documentation/snippets/letter-tablature-formatting.ly b/Documentation/snippets/letter-tablature-formatting.ly index 4e277e4c6b..148f94c665 100644 --- a/Documentation/snippets/letter-tablature-formatting.ly +++ b/Documentation/snippets/letter-tablature-formatting.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.10 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/makam-example.ly b/Documentation/snippets/makam-example.ly index 916c5a7198..04d485de80 100644 --- a/Documentation/snippets/makam-example.ly +++ b/Documentation/snippets/makam-example.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.0 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly index cec17e80ec..94c12621ec 100644 --- a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly +++ b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.1 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/modern-tab-text-clef.ly b/Documentation/snippets/modern-tab-text-clef.ly index caf014be42..a506584cf2 100644 --- a/Documentation/snippets/modern-tab-text-clef.ly +++ b/Documentation/snippets/modern-tab-text-clef.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/new/fretboards-alternate-tables.ly b/Documentation/snippets/new/fretboards-alternate-tables.ly new file mode 100644 index 0000000000..ec4cff1f0f --- /dev/null +++ b/Documentation/snippets/new/fretboards-alternate-tables.ly @@ -0,0 +1,61 @@ +\version "2.13.36" + +\header { + lsrtags = "fretted-strings" + + texidoc = " +Alternate fretboard tables can be created. These would be used in +order to have alternate fretboards for a given chord. + +In order to use an alternate fretboard table, the table must first +be created. Fretboards are then added to the table. + +The table to be used in displaying predefined fretboards is selected +by the property @code{\predefinedDiagramTable}. +" + + doctitle = "Alternate fretboard tables" +} + +\include "predefined-guitar-fretboards.ly" + +#(define custom-fretboard-table-one (make-hash-table 101)) + +#(define custom-fretboard-table-two (make-hash-table 101)) + +\storePredefinedDiagram #custom-fretboard-table-one + \chordmode{c} + #guitar-tuning + "3-(;3;5;5;5;3-);" + +\storePredefinedDiagram #custom-fretboard-table-two + \chordmode{c} + #guitar-tuning + "x;3;5;5;5;o;" + +<< + \chords { + c1 | + c1 | + c1 + } + \new FretBoards { + \chordmode { + \set predefinedDiagramTable = #default-fret-table + c1 + \set predefinedDiagramTable = #custom-fretboard-table-one + c1 + \set predefinedDiagramTable = #custom-fretboard-table-two + c1 + } + } + \new Staff { + \clef "treble_8" + \chordmode { + c1 | + c1 | + c1 + } + } +>> + diff --git a/Documentation/snippets/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly index 302820e731..f00960e58f 100644 --- a/Documentation/snippets/non-default-tuplet-numbers.ly +++ b/Documentation/snippets/non-default-tuplet-numbers.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.1 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/non-traditional-key-signatures.ly b/Documentation/snippets/non-traditional-key-signatures.ly index a140ee0c30..46770a23b7 100644 --- a/Documentation/snippets/non-traditional-key-signatures.ly +++ b/Documentation/snippets/non-traditional-key-signatures.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.0 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/numbers-as-easy-note-heads.ly b/Documentation/snippets/numbers-as-easy-note-heads.ly index c1ea51e7cf..03781d5334 100644 --- a/Documentation/snippets/numbers-as-easy-note-heads.ly +++ b/Documentation/snippets/numbers-as-easy-note-heads.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.11 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/piano-template-with-centered-dynamics.ly b/Documentation/snippets/piano-template-with-centered-dynamics.ly index 56e2b7aee2..f81b999850 100644 --- a/Documentation/snippets/piano-template-with-centered-dynamics.ly +++ b/Documentation/snippets/piano-template-with-centered-dynamics.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/pitches-headword.ly b/Documentation/snippets/pitches-headword.ly index e81b0c1196..345957df29 100644 --- a/Documentation/snippets/pitches-headword.ly +++ b/Documentation/snippets/pitches-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/repeats-headword.ly b/Documentation/snippets/repeats-headword.ly index e703c067d3..ffbac3420a 100644 --- a/Documentation/snippets/repeats-headword.ly +++ b/Documentation/snippets/repeats-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/reverting-default-beam-endings.ly b/Documentation/snippets/reverting-default-beam-endings.ly index 4e3cc2271a..58991448d5 100644 --- a/Documentation/snippets/reverting-default-beam-endings.ly +++ b/Documentation/snippets/reverting-default-beam-endings.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.29 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/rhythms-headword.ly b/Documentation/snippets/rhythms-headword.ly index 1fea62052f..d687a9ffe6 100644 --- a/Documentation/snippets/rhythms-headword.ly +++ b/Documentation/snippets/rhythms-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/screech-boink.ly b/Documentation/snippets/screech-boink.ly index 536429d378..0980f4965c 100644 --- a/Documentation/snippets/screech-boink.ly +++ b/Documentation/snippets/screech-boink.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \header { lsrtags = "headwords" texidoc = "Random complex notation" diff --git a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly index 910a603c6f..14a3a04ddd 100644 --- a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly +++ b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.26 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 158658dc75b6f6553e77ff53119ac802eb91f50c texidocfr = "LilyPond dispose de trois styles de barre différents diff --git a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly index b92baa8777..b803c69b89 100644 --- a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly +++ b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.27 -\version "2.13.31" +\version "2.13.36" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly index d81490500a..80bdf858d0 100644 --- a/Documentation/snippets/simultaneous-headword.ly +++ b/Documentation/snippets/simultaneous-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly index 8688746169..354575dcb3 100644 --- a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly +++ b/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/staff-headword.ly b/Documentation/snippets/staff-headword.ly index d450fd0357..3a954a573e 100644 --- a/Documentation/snippets/staff-headword.ly +++ b/Documentation/snippets/staff-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "catalan.ly" #(set-global-staff-size 15) \paper{ diff --git a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly index c21d261d14..487ab92d7e 100644 --- a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly +++ b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.4 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly index c96569bdc8..7dbdc83b1d 100644 --- a/Documentation/snippets/subdividing-beams.ly +++ b/Documentation/snippets/subdividing-beams.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.29 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033 diff --git a/Documentation/snippets/text-headword.ly b/Documentation/snippets/text-headword.ly index 6f96e8f774..e14f48624f 100644 --- a/Documentation/snippets/text-headword.ly +++ b/Documentation/snippets/text-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly index 137c1bddf7..a662e68c7d 100644 --- a/Documentation/snippets/unfretted-headword.ly +++ b/Documentation/snippets/unfretted-headword.ly @@ -33,7 +33,7 @@ -\version "2.13.31" +\version "2.13.36" #(set-global-staff-size 15) %%% diff --git a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly index 4061da16f0..d7334b9e6b 100644 --- a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly +++ b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.10 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/using-the-whiteout-property.ly b/Documentation/snippets/using-the-whiteout-property.ly index c0ba9a9db3..2b4ba77295 100644 --- a/Documentation/snippets/using-the-whiteout-property.ly +++ b/Documentation/snippets/using-the-whiteout-property.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.10 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly index 442d3d2b47..6d795b0ead 100644 --- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly +++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.21 -\version "2.13.31" +\version "2.13.36" \header { %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b diff --git a/Documentation/snippets/wind-headword.ly b/Documentation/snippets/wind-headword.ly index b6fa2bd14c..7b2940c848 100644 --- a/Documentation/snippets/wind-headword.ly +++ b/Documentation/snippets/wind-headword.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.12.0 -\version "2.13.31" +\version "2.13.36" #(set-global-staff-size 15) \paper { line-width = 16\cm diff --git a/Documentation/snippets/woodwind-diagrams-key-lists.ly b/Documentation/snippets/woodwind-diagrams-key-lists.ly index 61b9391096..d379e9235a 100644 --- a/Documentation/snippets/woodwind-diagrams-key-lists.ly +++ b/Documentation/snippets/woodwind-diagrams-key-lists.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.24 -\version "2.13.31" +\version "2.13.36" \header { %%% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 diff --git a/Documentation/snippets/woodwind-diagrams-listing.ly b/Documentation/snippets/woodwind-diagrams-listing.ly index bc314e098f..1f657495d9 100644 --- a/Documentation/snippets/woodwind-diagrams-listing.ly +++ b/Documentation/snippets/woodwind-diagrams-listing.ly @@ -2,7 +2,7 @@ % generated from Documentation/snippets/new % This file is in the public domain. %% Note: this file works from version 2.13.31 -\version "2.13.31" +\version "2.13.36" \header { %%% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi index 621c78d52a..ba68f30d00 100644 --- a/Documentation/web/news-front.itexi +++ b/Documentation/web/news-front.itexi @@ -9,9 +9,9 @@ @c used for news about the upcoming release; see CG 10.2 @newsItem -@subsubheading Alpha test two of 2.14 -- LilyPond 2.13.35 released! @emph{Sep 29, 2010} +@subsubheading Alpha test two of 2.14 -- LilyPond 2.13.36 released! @emph{Sep 29, 2010} -LilyPond 2.13.35 is out; this is the second alpha test of the +LilyPond 2.13.36 is out; this is the second alpha test of the upcoming 2.14 stable release. Users are invited to experiment with this version. New features since 2.12.3 are listed in the @qq{Changes} manual on the website section about diff --git a/VERSION b/VERSION index b653b3b51b..0f92d632f5 100644 --- a/VERSION +++ b/VERSION @@ -4,4 +4,4 @@ MINOR_VERSION=13 PATCH_LEVEL=36 MY_PATCH_LEVEL= VERSION_STABLE=2.12.3 -VERSION_DEVEL=2.13.35 +VERSION_DEVEL=2.13.36 diff --git a/input/regression/auto-beam-partial-grace.ly b/input/regression/auto-beam-partial-grace.ly index f80c49edc9..0ef4644791 100644 --- a/input/regression/auto-beam-partial-grace.ly +++ b/input/regression/auto-beam-partial-grace.ly @@ -1,4 +1,4 @@ -\version "2.13.35" +\version "2.13.36" \header { texidoc = "Grace notes at the start of a partial measure do not diff --git a/input/regression/page-breaking-outside-staff-estimation.ly b/input/regression/page-breaking-outside-staff-estimation.ly index b955da3855..927d4ce817 100644 --- a/input/regression/page-breaking-outside-staff-estimation.ly +++ b/input/regression/page-breaking-outside-staff-estimation.ly @@ -1,4 +1,4 @@ -\version "2.13.35" +\version "2.13.36" \header { texidoc = "The height-estimation routine takes into account diff --git a/input/regression/part-combine-force-mmrest-position.ly b/input/regression/part-combine-force-mmrest-position.ly index 94ea88f09e..6e4e3964e7 100644 --- a/input/regression/part-combine-force-mmrest-position.ly +++ b/input/regression/part-combine-force-mmrest-position.ly @@ -7,7 +7,7 @@ \layout { ragged-right = ##t } -\version "2.13.35" +\version "2.13.36" mI = \relative c'' { \partcombineApart diff --git a/input/regression/part-combine-force-once.ly b/input/regression/part-combine-force-once.ly index b2b30dce0e..0ad75ab56b 100644 --- a/input/regression/part-combine-force-once.ly +++ b/input/regression/part-combine-force-once.ly @@ -8,7 +8,7 @@ \layout { ragged-right = ##t } -\version "2.13.35" +\version "2.13.36" mI = \relative c' { e4 e \partcombineApartOnce c c | diff --git a/input/regression/part-combine-force.ly b/input/regression/part-combine-force.ly index b66d1b71b5..af582f50f2 100644 --- a/input/regression/part-combine-force.ly +++ b/input/regression/part-combine-force.ly @@ -8,7 +8,7 @@ \layout { ragged-right = ##t } -\version "2.13.35" +\version "2.13.36" mI = \relative c' { e4 e c2 | diff --git a/input/regression/predefined-fretboards.ly b/input/regression/predefined-fretboards.ly index 8644ca0ba3..8ed97dda83 100644 --- a/input/regression/predefined-fretboards.ly +++ b/input/regression/predefined-fretboards.ly @@ -1,4 +1,4 @@ -\version "2.12.0" +\version "2.13.36" \header { texidoc = "Predefined fretboards and chord shapes can be added. @@ -11,11 +11,11 @@ texidoc = "Predefined fretboards and chord shapes can be added. % add chords -\storePredefinedDiagram \chordmode {bes} +\storePredefinedDiagram #default-fret-table \chordmode {bes} #guitar-tuning #(chord-shape 'bes guitar-tuning) -\storePredefinedDiagram \chordmode {c} +\storePredefinedDiagram #default-fret-table \chordmode {c} #guitar-tuning #(offset-fret 2 (chord-shape 'bes guitar-tuning)) diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 5ab0e77ab2..54aa7121e2 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -32,7 +32,7 @@ maxima = #(ly:make-duration -3 0) %% default note names are dutch \include "nederlands.ly" -\include "drumpitch-init.ly" +\include "drumpitch-init.ly" \include "chord-modifiers-init.ly" \include "script-init.ly" @@ -68,7 +68,7 @@ startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START))) % % Code articulation definitions % -noBeam = #(make-music 'BeamForbidEvent) +noBeam = #(make-music 'BeamForbidEvent) pipeSymbol = #(make-music 'BarCheck) bracketOpenSymbol = #(make-span-event 'BeamEvent START) bracketCloseSymbol = #(make-span-event 'BeamEvent STOP) @@ -82,7 +82,7 @@ escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START) escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START) -#(define fretboard-table (make-hash-table 100)) +#(define default-fret-table (make-hash-table 100)) #(define chord-shape-table (make-hash-table 100)) \include "scale-definitions-init.ly" @@ -92,7 +92,7 @@ melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom) laissezVibrer = #(make-music 'LaissezVibrerEvent) repeatTie = #(make-music 'RepeatTieEvent) - + \include "grace-init.ly" \include "midi-init.ly" \include "paper-defaults-init.ly" @@ -104,7 +104,7 @@ repeatTie = #(make-music 'RepeatTieEvent) in = #(* 25.4 mm) pt = #(/ in 72.27) cm = #(* 10 mm) - + \include "engraver-init.ly" #(set-paper-dimension-variables (current-module)) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 6a94777e0c..0b6cd7b3aa 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -40,7 +40,7 @@ \consists "Font_size_engraver" \consists "Instrument_name_engraver" - predefinedDiagramTable = #fretboard-table + predefinedDiagramTable = #default-fret-table } \context { diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly index f205b63269..b6a60c085b 100644 --- a/ly/predefined-fretboards-init.ly +++ b/ly/predefined-fretboards-init.ly @@ -46,17 +46,18 @@ hash with the key @var{(cons key-symbol tuning)}.") % fretboard-table storePredefinedDiagram = -#(define-music-function (parser location chord tuning diagram-definition) - (ly:music? pair? string-or-pair?) +#(define-music-function (parser location + fretboard-table chord tuning diagram-definition) + (hash-table? ly:music? pair? string-or-pair?) (_i "Add predefined fret diagram defined by @var{diagram-definition} for the chord pitches @var{chord} and the stringTuning @var{tuning}.") - (let* ((pitches (event-chord-pitches + (let* ((pitches (event-chord-pitches (car (extract-named-music chord 'EventChord)))) (hash-key (cons tuning pitches)) (verbose-definition (if (string? diagram-definition) (parse-terse-string diagram-definition) diagram-definition))) - (hash-set! fretboard-table - hash-key - verbose-definition)) - (make-music 'SequentialMusic 'void #t)) + (hash-set! fretboard-table + hash-key + verbose-definition) + (make-music 'SequentialMusic 'void #t))) diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly index 1ee17fc5b7..c6d30b0dc2 100644 --- a/ly/predefined-guitar-fretboards.ly +++ b/ly/predefined-guitar-fretboards.ly @@ -20,7 +20,7 @@ %%% Add basic chordshapes -\version "2.12.0" +\version "2.13.36" \addChordShape #'f #guitar-tuning #"1-1-(;3-3;3-4;2-2;1-1;1-1-);" \addChordShape #'f:m #guitar-tuning #"1-1-(;3-3;3-4;1-1;1-1;1-1-);" @@ -43,409 +43,409 @@ %%%% c chords % -\storePredefinedDiagram \chordmode {c} +\storePredefinedDiagram #default-fret-table \chordmode {c} #guitar-tuning #"x;3-3;2-2;o;1-1;o;" -\storePredefinedDiagram \chordmode {c:m} +\storePredefinedDiagram #default-fret-table \chordmode {c:m} #guitar-tuning #(offset-fret 2 (chord-shape 'bes:m guitar-tuning)) -\storePredefinedDiagram \chordmode {c:aug} +\storePredefinedDiagram #default-fret-table \chordmode {c:aug} #guitar-tuning #(chord-shape 'c:aug guitar-tuning) -\storePredefinedDiagram \chordmode {c:dim} +\storePredefinedDiagram #default-fret-table \chordmode {c:dim} #guitar-tuning #(chord-shape 'c:dim guitar-tuning) -\storePredefinedDiagram \chordmode {c:7} +\storePredefinedDiagram #default-fret-table \chordmode {c:7} #guitar-tuning #"o;3-3;2-2;3-4;1-1;o;" -\storePredefinedDiagram \chordmode {c:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {c:maj7} #guitar-tuning #"x;3-3;2-2;o;o;o;" -\storePredefinedDiagram \chordmode {c:m7} +\storePredefinedDiagram #default-fret-table \chordmode {c:m7} #guitar-tuning #(offset-fret 2 (chord-shape 'bes:m7 guitar-tuning)) %%%% cis chords % -\storePredefinedDiagram \chordmode {cis} +\storePredefinedDiagram #default-fret-table \chordmode {cis} #guitar-tuning #(chord-shape 'cis guitar-tuning) -\storePredefinedDiagram \chordmode {cis:m} +\storePredefinedDiagram #default-fret-table \chordmode {cis:m} #guitar-tuning #"x;x;2-2;1-1;2-3;o;" -\storePredefinedDiagram \chordmode {cis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {cis:aug} #guitar-tuning #"x;4-4;3-3;2-1;2-2;x;" -\storePredefinedDiagram \chordmode {cis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {cis:dim} #guitar-tuning #(offset-fret 1 (chord-shape 'c:dim guitar-tuning)) -\storePredefinedDiagram \chordmode {cis:7} +\storePredefinedDiagram #default-fret-table \chordmode {cis:7} #guitar-tuning #"x;x;3-2;4-3;2-1;4-4;" -\storePredefinedDiagram \chordmode {cis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {cis:maj7} #guitar-tuning #"x;4-4;3-3;1-1-(;1-1;1-1-);" -\storePredefinedDiagram \chordmode {cis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {cis:m7} #guitar-tuning #"x;4-4;2-2;1-1;o;o;" %%%% des chords % -\storePredefinedDiagram \chordmode {des} +\storePredefinedDiagram #default-fret-table \chordmode {des} #guitar-tuning #"x;x;3-3;1-1-(;2-2;1-1-);" -\storePredefinedDiagram \chordmode {des:m} +\storePredefinedDiagram #default-fret-table \chordmode {des:m} #guitar-tuning #"x;x;2-2;1-1;2-3;o;" -\storePredefinedDiagram \chordmode {des:aug} +\storePredefinedDiagram #default-fret-table \chordmode {des:aug} #guitar-tuning #"x;4-4;3-3;2-1;2-2;x;" -\storePredefinedDiagram \chordmode {des:dim} +\storePredefinedDiagram #default-fret-table \chordmode {des:dim} #guitar-tuning #(offset-fret 1 (chord-shape 'c:dim guitar-tuning)) -\storePredefinedDiagram \chordmode {des:7} +\storePredefinedDiagram #default-fret-table \chordmode {des:7} #guitar-tuning #"x;x;3-2;4-3;2-1;4-4;" -\storePredefinedDiagram \chordmode {des:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {des:maj7} #guitar-tuning #"x;4-4;3-3;1-1-(;1-1;1-1-);" -\storePredefinedDiagram \chordmode {des:m7} +\storePredefinedDiagram #default-fret-table \chordmode {des:m7} #guitar-tuning #"x;4-4;2-2;1-1;o;o;" %%%% d chords % -\storePredefinedDiagram \chordmode {d} +\storePredefinedDiagram #default-fret-table \chordmode {d} #guitar-tuning #"x;x;o;2-1;3-3;2-2;" -\storePredefinedDiagram \chordmode {d:m} +\storePredefinedDiagram #default-fret-table \chordmode {d:m} #guitar-tuning #"x;x;o;2-2;3-3;1-1;" -\storePredefinedDiagram \chordmode {d:aug} +\storePredefinedDiagram #default-fret-table \chordmode {d:aug} #guitar-tuning #"x;x;o;3-2;3-3;2-1;" -\storePredefinedDiagram \chordmode {d:dim} +\storePredefinedDiagram #default-fret-table \chordmode {d:dim} #guitar-tuning #"x;x;o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {d:7} +\storePredefinedDiagram #default-fret-table \chordmode {d:7} #guitar-tuning #"x;x;o;2-2;1-1;2-3;" -\storePredefinedDiagram \chordmode {d:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {d:maj7} #guitar-tuning #"x;x;o;2-1;2-2;2-3;" -\storePredefinedDiagram \chordmode {d:m7} +\storePredefinedDiagram #default-fret-table \chordmode {d:m7} #guitar-tuning #"x;x;o;2-2;1-1-(;1-1-);" %%%% dis chords % -\storePredefinedDiagram \chordmode {dis} +\storePredefinedDiagram #default-fret-table \chordmode {dis} #guitar-tuning #(offset-fret 2 (chord-shape 'cis guitar-tuning)) -\storePredefinedDiagram \chordmode {dis:m} +\storePredefinedDiagram #default-fret-table \chordmode {dis:m} #guitar-tuning #"x;x;4-3;3-2;4-4;1-1;" -\storePredefinedDiagram \chordmode {dis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {dis:aug} #guitar-tuning #"3-3;2-2;1-1;o;o;3-4" -\storePredefinedDiagram \chordmode {dis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {dis:dim} #guitar-tuning #(chord-shape 'ees:dim guitar-tuning) -\storePredefinedDiagram \chordmode {dis:7} +\storePredefinedDiagram #default-fret-table \chordmode {dis:7} #guitar-tuning #"x;x;1-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {dis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {dis:maj7} #guitar-tuning #"x;x;1-1;3-2;3-3;3-4;" -\storePredefinedDiagram \chordmode {dis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {dis:m7} #guitar-tuning #"x;x;1-1;3-2;2-3;2-4;" %%%% ees chords % -\storePredefinedDiagram \chordmode {ees} +\storePredefinedDiagram #default-fret-table \chordmode {ees} #guitar-tuning #(offset-fret 2 (chord-shape 'cis guitar-tuning)) -\storePredefinedDiagram \chordmode {ees:m} +\storePredefinedDiagram #default-fret-table \chordmode {ees:m} #guitar-tuning #"x;x;4-3;3-2;4-4;1-1;" -\storePredefinedDiagram \chordmode {ees:aug} +\storePredefinedDiagram #default-fret-table \chordmode {ees:aug} #guitar-tuning #"3-3;2-2;1-1;o;o;3-4" -\storePredefinedDiagram \chordmode {ees:dim} +\storePredefinedDiagram #default-fret-table \chordmode {ees:dim} #guitar-tuning #(chord-shape 'ees:dim guitar-tuning) -\storePredefinedDiagram \chordmode {ees:7} +\storePredefinedDiagram #default-fret-table \chordmode {ees:7} #guitar-tuning #"x;x;1-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {ees:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {ees:maj7} #guitar-tuning #"x;x;1-1;3-2;3-3;3-4;" -\storePredefinedDiagram \chordmode {ees:m7} +\storePredefinedDiagram #default-fret-table \chordmode {ees:m7} #guitar-tuning #"x;x;1-1;3-2;2-3;2-4;" %%%% e chords % -\storePredefinedDiagram \chordmode {e} +\storePredefinedDiagram #default-fret-table \chordmode {e} #guitar-tuning #"o;2-2;2-3;1-1;o;o;" -\storePredefinedDiagram \chordmode {e:m} +\storePredefinedDiagram #default-fret-table \chordmode {e:m} #guitar-tuning #"o;2-2;2-3;o;o;o;" -\storePredefinedDiagram \chordmode {e:aug} +\storePredefinedDiagram #default-fret-table \chordmode {e:aug} #guitar-tuning #"o;3-3;2-2;1-1;x;x;" -\storePredefinedDiagram \chordmode {e:dim} +\storePredefinedDiagram #default-fret-table \chordmode {e:dim} #guitar-tuning #(offset-fret 1 (chord-shape 'ees:dim guitar-tuning)) -\storePredefinedDiagram \chordmode {e:7} +\storePredefinedDiagram #default-fret-table \chordmode {e:7} #guitar-tuning #"o;2-2;o;1-1;o;o;" -\storePredefinedDiagram \chordmode {e:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {e:maj7} #guitar-tuning #"o;2-3;1-1;1-2;o;x;" -\storePredefinedDiagram \chordmode {e:m7} +\storePredefinedDiagram #default-fret-table \chordmode {e:m7} #guitar-tuning #"o;2-2;o;o;o;o;" %%%% f chords % -\storePredefinedDiagram \chordmode {f} +\storePredefinedDiagram #default-fret-table \chordmode {f} #guitar-tuning #(chord-shape 'f guitar-tuning) -\storePredefinedDiagram \chordmode {f:m} +\storePredefinedDiagram #default-fret-table \chordmode {f:m} #guitar-tuning #(chord-shape 'f:m guitar-tuning) -\storePredefinedDiagram \chordmode {f:aug} +\storePredefinedDiagram #default-fret-table \chordmode {f:aug} #guitar-tuning #"x;x;1-1;4-3;4-4;3-2;" -\storePredefinedDiagram \chordmode {f:dim} +\storePredefinedDiagram #default-fret-table \chordmode {f:dim} #guitar-tuning #"x;x;o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {f:7} +\storePredefinedDiagram #default-fret-table \chordmode {f:7} #guitar-tuning #(chord-shape 'f:7 guitar-tuning) -\storePredefinedDiagram \chordmode {f:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {f:maj7} #guitar-tuning #"x;x;3-3;2-2;1-1;o;" -\storePredefinedDiagram \chordmode {f:m7} +\storePredefinedDiagram #default-fret-table \chordmode {f:m7} #guitar-tuning #(chord-shape 'f:m7 guitar-tuning) %%%% fis chords % -\storePredefinedDiagram \chordmode {fis} +\storePredefinedDiagram #default-fret-table \chordmode {fis} #guitar-tuning #(offset-fret 1 (chord-shape 'f guitar-tuning)) -\storePredefinedDiagram \chordmode {fis:m} +\storePredefinedDiagram #default-fret-table \chordmode {fis:m} #guitar-tuning #(offset-fret 1 (chord-shape 'f:m guitar-tuning)) -\storePredefinedDiagram \chordmode {fis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {fis:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" -\storePredefinedDiagram \chordmode {fis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {fis:dim} #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;" -\storePredefinedDiagram \chordmode {fis:7} +\storePredefinedDiagram #default-fret-table \chordmode {fis:7} #guitar-tuning #(offset-fret 1 (chord-shape 'f:7 guitar-tuning)) -\storePredefinedDiagram \chordmode {fis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {fis:maj7} #guitar-tuning #"x;x;4-4;3-3;2-2;1-1;" -\storePredefinedDiagram \chordmode {fis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {fis:m7} #guitar-tuning #(offset-fret 1 (chord-shape 'f:m7 guitar-tuning)) %%%% ges chords % -\storePredefinedDiagram \chordmode {ges} +\storePredefinedDiagram #default-fret-table \chordmode {ges} #guitar-tuning #(offset-fret 1 (chord-shape 'f guitar-tuning)) -\storePredefinedDiagram \chordmode {ges:m} +\storePredefinedDiagram #default-fret-table \chordmode {ges:m} #guitar-tuning #(offset-fret 1 (chord-shape 'f:m guitar-tuning)) -\storePredefinedDiagram \chordmode {ges:aug} +\storePredefinedDiagram #default-fret-table \chordmode {ges:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" -\storePredefinedDiagram \chordmode {ges:dim} +\storePredefinedDiagram #default-fret-table \chordmode {ges:dim} #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;" -\storePredefinedDiagram \chordmode {ges:7} +\storePredefinedDiagram #default-fret-table \chordmode {ges:7} #guitar-tuning #(offset-fret 1 (chord-shape 'f:7 guitar-tuning)) -\storePredefinedDiagram \chordmode {ges:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {ges:maj7} #guitar-tuning #"x;x;4-4;3-3;2-2;1-1;" -\storePredefinedDiagram \chordmode {ges:m7} +\storePredefinedDiagram #default-fret-table \chordmode {ges:m7} #guitar-tuning #(offset-fret 1 (chord-shape 'f:m7 guitar-tuning)) %%%% g chords % -\storePredefinedDiagram \chordmode {g} +\storePredefinedDiagram #default-fret-table \chordmode {g} #guitar-tuning #"3-2;2-1;o;o;o;3-3;" -\storePredefinedDiagram \chordmode {g:m} +\storePredefinedDiagram #default-fret-table \chordmode {g:m} #guitar-tuning #(offset-fret 2 (chord-shape 'f:m guitar-tuning)) -\storePredefinedDiagram \chordmode {g:aug} +\storePredefinedDiagram #default-fret-table \chordmode {g:aug} #guitar-tuning #"x;x;5-1;8-3;8-4;7-2;" -\storePredefinedDiagram \chordmode {g:dim} +\storePredefinedDiagram #default-fret-table \chordmode {g:dim} #guitar-tuning #"x;x;5-2;6-4;5-3;3-1;" -\storePredefinedDiagram \chordmode {g:7} +\storePredefinedDiagram #default-fret-table \chordmode {g:7} #guitar-tuning #"3-3;2-2;o;o;o;1-1;" -\storePredefinedDiagram \chordmode {g:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {g:maj7} #guitar-tuning #"x;x;5-4;4-3;3-2;2-1;" -\storePredefinedDiagram \chordmode {g:m7} +\storePredefinedDiagram #default-fret-table \chordmode {g:m7} #guitar-tuning #(offset-fret 2 (chord-shape 'f:m7 guitar-tuning)) %%%% gis chords % -\storePredefinedDiagram \chordmode {gis} +\storePredefinedDiagram #default-fret-table \chordmode {gis} #guitar-tuning #(offset-fret 3 (chord-shape 'f guitar-tuning)) -\storePredefinedDiagram \chordmode {gis:m} +\storePredefinedDiagram #default-fret-table \chordmode {gis:m} #guitar-tuning #(offset-fret 3 (chord-shape 'f:m guitar-tuning)) -\storePredefinedDiagram \chordmode {gis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {gis:aug} #guitar-tuning #"o;3-4;2-3;1-1;1-2;o;" -\storePredefinedDiagram \chordmode {gis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {gis:dim} #guitar-tuning #"x;x;o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {gis:7} +\storePredefinedDiagram #default-fret-table \chordmode {gis:7} #guitar-tuning #(offset-fret 3 (chord-shape 'f:7 guitar-tuning)) -\storePredefinedDiagram \chordmode {gis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {gis:maj7} #guitar-tuning #"x;x;1-1-(;1-1;1-1-);3-3;" -\storePredefinedDiagram \chordmode {gis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {gis:m7} #guitar-tuning #(offset-fret 3 (chord-shape 'f:m7 guitar-tuning)) %%%% aes chords % -\storePredefinedDiagram \chordmode {aes} +\storePredefinedDiagram #default-fret-table \chordmode {aes} #guitar-tuning #(offset-fret 3 (chord-shape 'f guitar-tuning)) -\storePredefinedDiagram \chordmode {aes:m} +\storePredefinedDiagram #default-fret-table \chordmode {aes:m} #guitar-tuning #(offset-fret 3 (chord-shape 'f:m guitar-tuning)) -\storePredefinedDiagram \chordmode {aes:aug} +\storePredefinedDiagram #default-fret-table \chordmode {aes:aug} #guitar-tuning #"o;3-4;2-3;1-1;1-2;o;" -\storePredefinedDiagram \chordmode {aes:dim} +\storePredefinedDiagram #default-fret-table \chordmode {aes:dim} #guitar-tuning #"x;x;o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {aes:7} +\storePredefinedDiagram #default-fret-table \chordmode {aes:7} #guitar-tuning #(offset-fret 3 (chord-shape 'f:7 guitar-tuning)) -\storePredefinedDiagram \chordmode {aes:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {aes:maj7} #guitar-tuning #"x;x;1-1-(;1-1;1-1-);3-3;" -\storePredefinedDiagram \chordmode {aes:m7} +\storePredefinedDiagram #default-fret-table \chordmode {aes:m7} #guitar-tuning #(offset-fret 3 (chord-shape 'f:m7 guitar-tuning)) %%%% a chords % -\storePredefinedDiagram \chordmode {a} +\storePredefinedDiagram #default-fret-table \chordmode {a} #guitar-tuning #"x;o;2-1;2-2;2-3;o;" -\storePredefinedDiagram \chordmode {a:m} +\storePredefinedDiagram #default-fret-table \chordmode {a:m} #guitar-tuning #"x;o;2-2;2-3;1-1;o;" -\storePredefinedDiagram \chordmode {a:aug} +\storePredefinedDiagram #default-fret-table \chordmode {a:aug} #guitar-tuning #"x;o;3-4;2-2;2-3;1-1;" -\storePredefinedDiagram \chordmode {a:dim} +\storePredefinedDiagram #default-fret-table \chordmode {a:dim} #guitar-tuning #(chord-shape 'a:dim guitar-tuning) -\storePredefinedDiagram \chordmode {a:7} +\storePredefinedDiagram #default-fret-table \chordmode {a:7} #guitar-tuning #"x;o;2-1;o;2-3;o;" -\storePredefinedDiagram \chordmode {a:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {a:maj7} #guitar-tuning #"x;o;2-2;1-1;2-3;o;" -\storePredefinedDiagram \chordmode {a:m7} +\storePredefinedDiagram #default-fret-table \chordmode {a:m7} #guitar-tuning #"x;o;2-2;o;1-1;o;" %%%% ais chords % -\storePredefinedDiagram \chordmode {ais} +\storePredefinedDiagram #default-fret-table \chordmode {ais} #guitar-tuning #(chord-shape 'bes guitar-tuning) -\storePredefinedDiagram \chordmode {ais:m} +\storePredefinedDiagram #default-fret-table \chordmode {ais:m} #guitar-tuning #(chord-shape 'bes:m guitar-tuning) -\storePredefinedDiagram \chordmode {ais:aug} +\storePredefinedDiagram #default-fret-table \chordmode {ais:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" -\storePredefinedDiagram \chordmode {ais:dim} +\storePredefinedDiagram #default-fret-table \chordmode {ais:dim} #guitar-tuning #(offset-fret 1 (chord-shape 'a:dim guitar-tuning)) -\storePredefinedDiagram \chordmode {ais:7} +\storePredefinedDiagram #default-fret-table \chordmode {ais:7} #guitar-tuning #(chord-shape 'bes:7 guitar-tuning) -\storePredefinedDiagram \chordmode {ais:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {ais:maj7} #guitar-tuning #"x;1-1;3-3;2-2;3-4;x;" -\storePredefinedDiagram \chordmode {ais:m7} +\storePredefinedDiagram #default-fret-table \chordmode {ais:m7} #guitar-tuning #(chord-shape 'bes:m7 guitar-tuning) %%%% bes chords % -\storePredefinedDiagram \chordmode {bes} +\storePredefinedDiagram #default-fret-table \chordmode {bes} #guitar-tuning #(chord-shape 'bes guitar-tuning) -\storePredefinedDiagram \chordmode {bes:m} +\storePredefinedDiagram #default-fret-table \chordmode {bes:m} #guitar-tuning #(chord-shape 'bes:m guitar-tuning) -\storePredefinedDiagram \chordmode {bes:aug} +\storePredefinedDiagram #default-fret-table \chordmode {bes:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" -\storePredefinedDiagram \chordmode {bes:dim} +\storePredefinedDiagram #default-fret-table \chordmode {bes:dim} #guitar-tuning #(offset-fret 1 (chord-shape 'a:dim guitar-tuning)) -\storePredefinedDiagram \chordmode {bes:7} +\storePredefinedDiagram #default-fret-table \chordmode {bes:7} #guitar-tuning #(chord-shape 'bes:7 guitar-tuning) -\storePredefinedDiagram \chordmode {bes:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {bes:maj7} #guitar-tuning #"x;1-1;3-3;2-2;3-4;x;" -\storePredefinedDiagram \chordmode {bes:m7} +\storePredefinedDiagram #default-fret-table \chordmode {bes:m7} #guitar-tuning #(chord-shape 'bes:m7 guitar-tuning) %%%% b chords % -\storePredefinedDiagram \chordmode {b} +\storePredefinedDiagram #default-fret-table \chordmode {b} #guitar-tuning #(offset-fret 1 (chord-shape 'bes guitar-tuning)) -\storePredefinedDiagram \chordmode {b:m} +\storePredefinedDiagram #default-fret-table \chordmode {b:m} #guitar-tuning #(offset-fret 1 (chord-shape 'bes:m guitar-tuning)) -\storePredefinedDiagram \chordmode {b:aug} +\storePredefinedDiagram #default-fret-table \chordmode {b:aug} #guitar-tuning #"x;3-2;2-1;o;o;x;" -\storePredefinedDiagram \chordmode {b:dim} +\storePredefinedDiagram #default-fret-table \chordmode {b:dim} #guitar-tuning #"x;x;o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {b:7} +\storePredefinedDiagram #default-fret-table \chordmode {b:7} #guitar-tuning #(offset-fret 1 (chord-shape 'bes:7 guitar-tuning)) -\storePredefinedDiagram \chordmode {b:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {b:maj7} #guitar-tuning #"x;2-1;4-3;3-2;4-4;x;" -\storePredefinedDiagram \chordmode {b:m7} +\storePredefinedDiagram #default-fret-table \chordmode {b:m7} #guitar-tuning #(offset-fret 1 (chord-shape 'bes:m7 guitar-tuning)) diff --git a/ly/predefined-guitar-ninth-fretboards.ly b/ly/predefined-guitar-ninth-fretboards.ly index fe3f957ea0..34204ca022 100644 --- a/ly/predefined-guitar-ninth-fretboards.ly +++ b/ly/predefined-guitar-ninth-fretboards.ly @@ -15,61 +15,61 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.12.0" +\version "2.13.36" % Add ninth chords to predefined fret diagrams for standard guitar tunings \addChordShape #'c:9 #guitar-tuning #"x;3-2;2-1;3-3-(;3-3;3-3-);" \addChordShape #'f:9 #guitar-tuning #"1-1-(;3-3;1-1;2-2;1-1-);3-4;" -\storePredefinedDiagram \chordmode {c:9} +\storePredefinedDiagram #default-fret-table \chordmode {c:9} #guitar-tuning #(chord-shape 'c:9 guitar-tuning) -\storePredefinedDiagram \chordmode {cis:9} +\storePredefinedDiagram #default-fret-table \chordmode {cis:9} #guitar-tuning #(offset-fret 1 (chord-shape 'c:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {des:9} +\storePredefinedDiagram #default-fret-table \chordmode {des:9} #guitar-tuning #(offset-fret 1 (chord-shape 'c:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {d:9} +\storePredefinedDiagram #default-fret-table \chordmode {d:9} #guitar-tuning #(offset-fret 2 (chord-shape 'c:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {dis:9} +\storePredefinedDiagram #default-fret-table \chordmode {dis:9} #guitar-tuning #(offset-fret 3 (chord-shape 'c:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {ees:9} +\storePredefinedDiagram #default-fret-table \chordmode {ees:9} #guitar-tuning #(offset-fret 3 (chord-shape 'c:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {e:9} +\storePredefinedDiagram #default-fret-table \chordmode {e:9} #guitar-tuning #"o;2-2;o;1-1;o;2-3;" -\storePredefinedDiagram \chordmode {f:9} +\storePredefinedDiagram #default-fret-table \chordmode {f:9} #guitar-tuning #(chord-shape 'f:9 guitar-tuning) -\storePredefinedDiagram \chordmode {fis:9} +\storePredefinedDiagram #default-fret-table \chordmode {fis:9} #guitar-tuning #(offset-fret 1 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {ges:9} +\storePredefinedDiagram #default-fret-table \chordmode {ges:9} #guitar-tuning #(offset-fret 1 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {g:9} +\storePredefinedDiagram #default-fret-table \chordmode {g:9} #guitar-tuning #(offset-fret 2 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {gis:9} +\storePredefinedDiagram #default-fret-table \chordmode {gis:9} #guitar-tuning #(offset-fret 3 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {aes:9} +\storePredefinedDiagram #default-fret-table \chordmode {aes:9} #guitar-tuning #(offset-fret 3 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {a:9} +\storePredefinedDiagram #default-fret-table \chordmode {a:9} #guitar-tuning #(offset-fret 4 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {ais:9} +\storePredefinedDiagram #default-fret-table \chordmode {ais:9} #guitar-tuning #(offset-fret 5 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {bes:9} +\storePredefinedDiagram #default-fret-table \chordmode {bes:9} #guitar-tuning #(offset-fret 5 (chord-shape 'f:9 guitar-tuning)) -\storePredefinedDiagram \chordmode {b:9} +\storePredefinedDiagram #default-fret-table \chordmode {b:9} #guitar-tuning #(offset-fret -1 (chord-shape 'c:9 guitar-tuning)) diff --git a/ly/predefined-ukulele-fretboards.ly b/ly/predefined-ukulele-fretboards.ly index 0c8829e879..554c828fe4 100644 --- a/ly/predefined-ukulele-fretboards.ly +++ b/ly/predefined-ukulele-fretboards.ly @@ -15,7 +15,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.13.9" +\version "2.13.36" %%%% sources: %%%% ukulele hall of fame museum website (http://www.ukulele.org/), @@ -24,782 +24,782 @@ %%% a chords -\storePredefinedDiagram \chordmode {a} +\storePredefinedDiagram #default-fret-table \chordmode {a} #ukulele-tuning #"2-2;1-1;o;o;" -\storePredefinedDiagram \chordmode {a:m} +\storePredefinedDiagram #default-fret-table \chordmode {a:m} #ukulele-tuning #"2-1;o;o;o;" -\storePredefinedDiagram \chordmode {a:7} +\storePredefinedDiagram #default-fret-table \chordmode {a:7} #ukulele-tuning #"o;1-1;o;o;" -\storePredefinedDiagram \chordmode {a:m7} +\storePredefinedDiagram #default-fret-table \chordmode {a:m7} #ukulele-tuning #"o;o;o;o;" -\storePredefinedDiagram \chordmode {a:dim} +\storePredefinedDiagram #default-fret-table \chordmode {a:dim} #ukulele-tuning #"2-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {a:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {a:maj7} #ukulele-tuning #"1-1;1-2;o;o;" -\storePredefinedDiagram \chordmode {a:6} +\storePredefinedDiagram #default-fret-table \chordmode {a:6} #ukulele-tuning #"2-1;4-3;2-2;4-4;" -\storePredefinedDiagram \chordmode {a:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {a:sus2} #ukulele-tuning #"2-2;4-3;5-4;2-1;" -\storePredefinedDiagram \chordmode {a:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {a:sus4} #ukulele-tuning #"2-1;2-2;o;o;" -\storePredefinedDiagram \chordmode {a:aug} +\storePredefinedDiagram #default-fret-table \chordmode {a:aug} #ukulele-tuning #"2-2;1-1-(;1-1-);4-4;" -\storePredefinedDiagram \chordmode {a:9} +\storePredefinedDiagram #default-fret-table \chordmode {a:9} #ukulele-tuning #"o;1-1;o;2-2;" %%% ais chords -\storePredefinedDiagram \chordmode {ais} +\storePredefinedDiagram #default-fret-table \chordmode {ais} #ukulele-tuning #"3-3;2-2;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {ais:m} +\storePredefinedDiagram #default-fret-table \chordmode {ais:m} #ukulele-tuning #"3-3;1-1-(;1-1;1-1-);" -\storePredefinedDiagram \chordmode {ais:7} +\storePredefinedDiagram #default-fret-table \chordmode {ais:7} #ukulele-tuning #"1-1-(;2-2;1-1;1-1-);" -\storePredefinedDiagram \chordmode {ais:m7} +\storePredefinedDiagram #default-fret-table \chordmode {ais:m7} #ukulele-tuning #"1-1-(;1-1;1-1;1-1-);" -\storePredefinedDiagram \chordmode {ais:dim} +\storePredefinedDiagram #default-fret-table \chordmode {ais:dim} #ukulele-tuning #"o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {ais:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {ais:maj7} #ukulele-tuning #"2-2-(;2-2-);1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {ais:6} +\storePredefinedDiagram #default-fret-table \chordmode {ais:6} #ukulele-tuning #"o;2-2;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {ais:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {ais:sus2} #ukulele-tuning #"3-3;o;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {ais:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {ais:sus4} #ukulele-tuning #"3-3-(;3-3-);1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {ais:aug} +\storePredefinedDiagram #default-fret-table \chordmode {ais:aug} #ukulele-tuning #"3-2;1-1-(;1-1-);5-4;" -\storePredefinedDiagram \chordmode {ais:9} +\storePredefinedDiagram #default-fret-table \chordmode {ais:9} #ukulele-tuning #"1-1-(;2-2;1-1-);3-3;" %%% bes chords -\storePredefinedDiagram \chordmode {bes} +\storePredefinedDiagram #default-fret-table \chordmode {bes} #ukulele-tuning #"3-3;2-2;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {bes:m} +\storePredefinedDiagram #default-fret-table \chordmode {bes:m} #ukulele-tuning #"3-3;1-1-(;1-1;1-1-);" -\storePredefinedDiagram \chordmode {bes:7} +\storePredefinedDiagram #default-fret-table \chordmode {bes:7} #ukulele-tuning #"1-1-(;2-2;1-1;1-1-);" -\storePredefinedDiagram \chordmode {bes:m7} +\storePredefinedDiagram #default-fret-table \chordmode {bes:m7} #ukulele-tuning #"1-1-(;1-1;1-1;1-1-);" -\storePredefinedDiagram \chordmode {bes:dim} +\storePredefinedDiagram #default-fret-table \chordmode {bes:dim} #ukulele-tuning #"o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {bes:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {bes:maj7} #ukulele-tuning #"2-2-(;2-2-);1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {bes:6} +\storePredefinedDiagram #default-fret-table \chordmode {bes:6} #ukulele-tuning #"o;2-2;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {bes:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {bes:sus2} #ukulele-tuning #"3-3;o;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {bes:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {bes:sus4} #ukulele-tuning #"3-3-(;3-3-);1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {bes:aug} +\storePredefinedDiagram #default-fret-table \chordmode {bes:aug} #ukulele-tuning #"3-2;1-1-(;1-1-);5-4;" -\storePredefinedDiagram \chordmode {bes:9} +\storePredefinedDiagram #default-fret-table \chordmode {bes:9} #ukulele-tuning #"1-1-(;2-2;1-1-);3-3;" %%% b chords -\storePredefinedDiagram \chordmode {b} +\storePredefinedDiagram #default-fret-table \chordmode {b} #ukulele-tuning #"4-3;3-2;2-1-(;2-1-);" -\storePredefinedDiagram \chordmode {b:m} +\storePredefinedDiagram #default-fret-table \chordmode {b:m} #ukulele-tuning #"4-3;2-1-(;2-1;2-1-);" -\storePredefinedDiagram \chordmode {b:7} +\storePredefinedDiagram #default-fret-table \chordmode {b:7} #ukulele-tuning #"2-1-(;3-2;2-1;2-1-);" -\storePredefinedDiagram \chordmode {b:m7} +\storePredefinedDiagram #default-fret-table \chordmode {b:m7} #ukulele-tuning #"2-1-(;2-1;2-1;2-1-);" -\storePredefinedDiagram \chordmode {b:dim} +\storePredefinedDiagram #default-fret-table \chordmode {b:dim} #ukulele-tuning #"1-1;2-3;1-2;2-4;" -\storePredefinedDiagram \chordmode {b:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {b:maj7} #ukulele-tuning #"3-2-(;3-2-);2-1-(;2-1-);" -\storePredefinedDiagram \chordmode {b:6} +\storePredefinedDiagram #default-fret-table \chordmode {b:6} #ukulele-tuning #"1-1;3-4;2-2;2-3;" -\storePredefinedDiagram \chordmode {b:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {b:sus2} #ukulele-tuning #"5-4;1-1;2-3;2-2;" -\storePredefinedDiagram \chordmode {b:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {b:sus4} #ukulele-tuning #"4-2-(;4-2-);2-1-(;2-1-);" -\storePredefinedDiagram \chordmode {b:aug} +\storePredefinedDiagram #default-fret-table \chordmode {b:aug} #ukulele-tuning #"o;3-2-(;3-2-);2-1;" -\storePredefinedDiagram \chordmode {b:9} +\storePredefinedDiagram #default-fret-table \chordmode {b:9} #ukulele-tuning #"2-2-(;3-3;2-2-);4-4;" %%% c chords -\storePredefinedDiagram \chordmode {c} +\storePredefinedDiagram #default-fret-table \chordmode {c} #ukulele-tuning #"o;o;o;3-3;" -\storePredefinedDiagram \chordmode {c:m} +\storePredefinedDiagram #default-fret-table \chordmode {c:m} #ukulele-tuning #"o;3-1;3-2;3-3;" -\storePredefinedDiagram \chordmode {c:7} +\storePredefinedDiagram #default-fret-table \chordmode {c:7} #ukulele-tuning #"o;o;o;1-1;" -\storePredefinedDiagram \chordmode {c:m7} +\storePredefinedDiagram #default-fret-table \chordmode {c:m7} #ukulele-tuning #"3-1-(;3-1;3-1;3-1-);" -\storePredefinedDiagram \chordmode {c:dim} +\storePredefinedDiagram #default-fret-table \chordmode {c:dim} #ukulele-tuning #"2-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {c:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {c:maj7} #ukulele-tuning #"o;o;o;2-1;" -\storePredefinedDiagram \chordmode {c:6} +\storePredefinedDiagram #default-fret-table \chordmode {c:6} #ukulele-tuning #"o;o;o;o;" -\storePredefinedDiagram \chordmode {c:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {c:sus2} #ukulele-tuning #"o;2-1;3-2-(;3-2-);" -\storePredefinedDiagram \chordmode {c:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {c:sus4} #ukulele-tuning #"o;o;1-1;3-3;" -\storePredefinedDiagram \chordmode {c:aug} +\storePredefinedDiagram #default-fret-table \chordmode {c:aug} #ukulele-tuning #"1-1;o;o;3-4;" -\storePredefinedDiagram \chordmode {c:9} +\storePredefinedDiagram #default-fret-table \chordmode {c:9} #ukulele-tuning #"o;2-2;o;1-1;" %%% cis chords -\storePredefinedDiagram \chordmode {cis} +\storePredefinedDiagram #default-fret-table \chordmode {cis} #ukulele-tuning #"1-1-(;1-1;1-1-);4-4;" -\storePredefinedDiagram \chordmode {cis:m} +\storePredefinedDiagram #default-fret-table \chordmode {cis:m} #ukulele-tuning #"1-1;4-2;4-3-(;4-3-);" -\storePredefinedDiagram \chordmode {cis:7} +\storePredefinedDiagram #default-fret-table \chordmode {cis:7} #ukulele-tuning #"1-1-(;1-1;1-1-);2-2;" -\storePredefinedDiagram \chordmode {cis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {cis:m7} #ukulele-tuning #"2-2-(;2-2-);1-1;3-3;" -\storePredefinedDiagram \chordmode {cis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {cis:dim} #ukulele-tuning #"o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {cis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {cis:maj7} #ukulele-tuning #"1-1-(;1-1;1-1-);3-3;" -\storePredefinedDiagram \chordmode {cis:6} +\storePredefinedDiagram #default-fret-table \chordmode {cis:6} #ukulele-tuning #"1-1-(;1-1;1-1;1-1-);" -\storePredefinedDiagram \chordmode {cis:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {cis:sus2} #ukulele-tuning #"1-1;3-2;4-3-(;4-3-);" -\storePredefinedDiagram \chordmode {cis:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {cis:sus4} #ukulele-tuning #"1-1-(;1-1-);2-2;4-4;" -\storePredefinedDiagram \chordmode {cis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {cis:aug} #ukulele-tuning #"2-2;1-1-(;1-1-);4-4;" -\storePredefinedDiagram \chordmode {cis:9} +\storePredefinedDiagram #default-fret-table \chordmode {cis:9} #ukulele-tuning #"1-1-(;3-3;1-1-);2-2;" %%% des chords -\storePredefinedDiagram \chordmode {des} +\storePredefinedDiagram #default-fret-table \chordmode {des} #ukulele-tuning #"1-1-(;1-1;1-1-);4-4;" -\storePredefinedDiagram \chordmode {des:m} +\storePredefinedDiagram #default-fret-table \chordmode {des:m} #ukulele-tuning #"1-1;4-2;4-3-(;4-3-);" -\storePredefinedDiagram \chordmode {des:7} +\storePredefinedDiagram #default-fret-table \chordmode {des:7} #ukulele-tuning #"1-1-(;1-1;1-1-);2-2;" -\storePredefinedDiagram \chordmode {des:m7} +\storePredefinedDiagram #default-fret-table \chordmode {des:m7} #ukulele-tuning #"2-2-(;2-2-);1-1;3-3;" -\storePredefinedDiagram \chordmode {des:dim} +\storePredefinedDiagram #default-fret-table \chordmode {des:dim} #ukulele-tuning #"o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {des:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {des:maj7} #ukulele-tuning #"1-1-(;1-1;1-1-);3-3;" -\storePredefinedDiagram \chordmode {des:6} +\storePredefinedDiagram #default-fret-table \chordmode {des:6} #ukulele-tuning #"1-1-(;1-1;1-1;1-1-);" -\storePredefinedDiagram \chordmode {des:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {des:sus2} #ukulele-tuning #"1-1;3-2;4-3-(;4-3-);" -\storePredefinedDiagram \chordmode {des:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {des:sus4} #ukulele-tuning #"1-1-(;1-1-);2-2;4-4;" -\storePredefinedDiagram \chordmode {des:aug} +\storePredefinedDiagram #default-fret-table \chordmode {des:aug} #ukulele-tuning #"2-2;1-1-(;1-1-);4-4;" -\storePredefinedDiagram \chordmode {des:9} +\storePredefinedDiagram #default-fret-table \chordmode {des:9} #ukulele-tuning #"1-1-(;3-3;1-1-);2-2;" %%% d chords -\storePredefinedDiagram \chordmode {d} +\storePredefinedDiagram #default-fret-table \chordmode {d} #ukulele-tuning #"2-1;2-2;2-3;o;" -\storePredefinedDiagram \chordmode {d:m} +\storePredefinedDiagram #default-fret-table \chordmode {d:m} #ukulele-tuning #"2-2-(;2-2-);1-1;o;" -\storePredefinedDiagram \chordmode {d:7} +\storePredefinedDiagram #default-fret-table \chordmode {d:7} #ukulele-tuning #"2-1-(;2-1;2-1-);3-2;" -\storePredefinedDiagram \chordmode {d:m7} +\storePredefinedDiagram #default-fret-table \chordmode {d:m7} #ukulele-tuning #"2-2-(;2-2-);1-1;3-3;" -\storePredefinedDiagram \chordmode {d:dim} +\storePredefinedDiagram #default-fret-table \chordmode {d:dim} #ukulele-tuning #"1-1;2-3;1-2;2-4;" -\storePredefinedDiagram \chordmode {d:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {d:maj7} #ukulele-tuning #"2-1-(;2-1;2-1-);4-3;" -\storePredefinedDiagram \chordmode {d:6} +\storePredefinedDiagram #default-fret-table \chordmode {d:6} #ukulele-tuning #"2-1-(;2-1;2-1;2-1-);" -\storePredefinedDiagram \chordmode {d:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {d:sus2} #ukulele-tuning #"2-1;2-2;o;o;" -\storePredefinedDiagram \chordmode {d:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {d:sus4} #ukulele-tuning #"o;2-1;3-2;o;" -\storePredefinedDiagram \chordmode {d:aug} +\storePredefinedDiagram #default-fret-table \chordmode {d:aug} #ukulele-tuning #"3-2;2-1-(;2-1-);5-4;" -\storePredefinedDiagram \chordmode {d:9} +\storePredefinedDiagram #default-fret-table \chordmode {d:9} #ukulele-tuning #"2-1-(;4-3;2-1-);3-2;" %%%% dis chords -\storePredefinedDiagram \chordmode {dis} +\storePredefinedDiagram #default-fret-table \chordmode {dis} #ukulele-tuning #"o;3-2-(;3-2-);1-1;" -\storePredefinedDiagram \chordmode {dis:m} +\storePredefinedDiagram #default-fret-table \chordmode {dis:m} #ukulele-tuning #"3-3-(;3-3-);2-2;1-1;" -\storePredefinedDiagram \chordmode {dis:7} +\storePredefinedDiagram #default-fret-table \chordmode {dis:7} #ukulele-tuning #"3-1-(;3-1;3-1-);4-2;" -\storePredefinedDiagram \chordmode {dis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {dis:m7} #ukulele-tuning #"3-2-(;3-2-);2-1;4-4;" -\storePredefinedDiagram \chordmode {dis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {dis:dim} #ukulele-tuning #"2-1;3-3;2-1;3-4;" -\storePredefinedDiagram \chordmode {dis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {dis:maj7} #ukulele-tuning #"3-1-(;3-2;3-1-);5-2;" -\storePredefinedDiagram \chordmode {dis:6} +\storePredefinedDiagram #default-fret-table \chordmode {dis:6} #ukulele-tuning #"3-1-(;3-1;3-1;3-1-);" -\storePredefinedDiagram \chordmode {dis:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {dis:sus2} #ukulele-tuning #"3-2-(;3-2-);1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {dis:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {dis:sus4} #ukulele-tuning #"1-2;3-3;4-4;1-1;" -\storePredefinedDiagram \chordmode {dis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {dis:aug} #ukulele-tuning #"o;3-2-(;3-2-);2-1;" -\storePredefinedDiagram \chordmode {dis:9} +\storePredefinedDiagram #default-fret-table \chordmode {dis:9} #ukulele-tuning #"o;1-1-(;1-1;1-1-);" %%%% ees chords -\storePredefinedDiagram \chordmode {ees} +\storePredefinedDiagram #default-fret-table \chordmode {ees} #ukulele-tuning #"o;3-2-(;3-2-);1-1;" -\storePredefinedDiagram \chordmode {ees:m} +\storePredefinedDiagram #default-fret-table \chordmode {ees:m} #ukulele-tuning #"3-3-(;3-3-);2-2;1-1;" -\storePredefinedDiagram \chordmode {ees:7} +\storePredefinedDiagram #default-fret-table \chordmode {ees:7} #ukulele-tuning #"3-1-(;3-1;3-1-);4-2;" -\storePredefinedDiagram \chordmode {ees:m7} +\storePredefinedDiagram #default-fret-table \chordmode {ees:m7} #ukulele-tuning #"3-2-(;3-2-);2-1;4-4;" -\storePredefinedDiagram \chordmode {ees:dim} +\storePredefinedDiagram #default-fret-table \chordmode {ees:dim} #ukulele-tuning #"2-1;3-3;2-1;3-4;" -\storePredefinedDiagram \chordmode {ees:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {ees:maj7} #ukulele-tuning #"3-1-(;3-2;3-1-);5-2;" -\storePredefinedDiagram \chordmode {ees:6} +\storePredefinedDiagram #default-fret-table \chordmode {ees:6} #ukulele-tuning #"3-1-(;3-1;3-1;3-1-);" -\storePredefinedDiagram \chordmode {ees:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {ees:sus2} #ukulele-tuning #"3-2-(;3-2-);1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {ees:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {ees:sus4} #ukulele-tuning #"1-2;3-3;4-4;1-1;" -\storePredefinedDiagram \chordmode {ees:aug} +\storePredefinedDiagram #default-fret-table \chordmode {ees:aug} #ukulele-tuning #"o;3-2-(;3-2-);2-1;" -\storePredefinedDiagram \chordmode {ees:9} +\storePredefinedDiagram #default-fret-table \chordmode {ees:9} #ukulele-tuning #"o;1-1-(;1-1;1-1-);" %%%% e chords -\storePredefinedDiagram \chordmode {e} +\storePredefinedDiagram #default-fret-table \chordmode {e} #ukulele-tuning #"4-2;4-3;4-4;2-1;" -\storePredefinedDiagram \chordmode {e:m} +\storePredefinedDiagram #default-fret-table \chordmode {e:m} #ukulele-tuning #"4-3;4-3;3-2;2-1;" -\storePredefinedDiagram \chordmode {e:7} +\storePredefinedDiagram #default-fret-table \chordmode {e:7} #ukulele-tuning #"1-1;2-2;o;2-3;" -\storePredefinedDiagram \chordmode {e:m7} +\storePredefinedDiagram #default-fret-table \chordmode {e:m7} #ukulele-tuning #"o;2-1;o;2-2;" -\storePredefinedDiagram \chordmode {e:dim} +\storePredefinedDiagram #default-fret-table \chordmode {e:dim} #ukulele-tuning #"o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {e:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {e:maj7} #ukulele-tuning #"1-1;3-3;o;2-2;" -\storePredefinedDiagram \chordmode {e:6} +\storePredefinedDiagram #default-fret-table \chordmode {e:6} #ukulele-tuning #"4-1-(;4-1;4-1;4-1-);" -\storePredefinedDiagram \chordmode {e:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {e:sus2} #ukulele-tuning #"4-3-(;4-3-);2-1-(;2-1-);" -\storePredefinedDiagram \chordmode {e:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {e:sus4} #ukulele-tuning #"2-2;4-4;o;2-1;" -\storePredefinedDiagram \chordmode {e:aug} +\storePredefinedDiagram #default-fret-table \chordmode {e:aug} #ukulele-tuning #"1-1;o;o;3-4;" -\storePredefinedDiagram \chordmode {e:9} +\storePredefinedDiagram #default-fret-table \chordmode {e:9} #ukulele-tuning #"1-1;2-2-(;2-2;2-2-);" %%%% f chords -\storePredefinedDiagram \chordmode {f} +\storePredefinedDiagram #default-fret-table \chordmode {f} #ukulele-tuning #"2-2;o;1-1;o;" -\storePredefinedDiagram \chordmode {f:m} +\storePredefinedDiagram #default-fret-table \chordmode {f:m} #ukulele-tuning #"1-1;o;1-2;3-4;" -\storePredefinedDiagram \chordmode {f:7} +\storePredefinedDiagram #default-fret-table \chordmode {f:7} #ukulele-tuning #"2-2;3-3;1-1;3-4;" -\storePredefinedDiagram \chordmode {f:m7} +\storePredefinedDiagram #default-fret-table \chordmode {f:m7} #ukulele-tuning #"1-1;3-3;1-2;3-4;" -\storePredefinedDiagram \chordmode {f:dim} +\storePredefinedDiagram #default-fret-table \chordmode {f:dim} #ukulele-tuning #"1-1;2-3;1-2;2-4;" -\storePredefinedDiagram \chordmode {f:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {f:maj7} #ukulele-tuning #"2-2;4-4;1-1;3-3;" -\storePredefinedDiagram \chordmode {f:6} +\storePredefinedDiagram #default-fret-table \chordmode {f:6} #ukulele-tuning #"2-2-(;2-2-);1-1;3-4;" -\storePredefinedDiagram \chordmode {f:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {f:sus2} #ukulele-tuning #"o;o;1-1;3-3;" -\storePredefinedDiagram \chordmode {f:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {f:sus4} #ukulele-tuning #"3-3;o;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {f:aug} +\storePredefinedDiagram #default-fret-table \chordmode {f:aug} #ukulele-tuning #"2-2;1-1-(;1-1-);4-4;" -\storePredefinedDiagram \chordmode {f:9} +\storePredefinedDiagram #default-fret-table \chordmode {f:9} #ukulele-tuning #"2-1;3-2-(;3-2;3-2-);" %%%% fis chords -\storePredefinedDiagram \chordmode {fis} +\storePredefinedDiagram #default-fret-table \chordmode {fis} #ukulele-tuning #"3-3;1-1;2-2;1-1;" -\storePredefinedDiagram \chordmode {fis:m} +\storePredefinedDiagram #default-fret-table \chordmode {fis:m} #ukulele-tuning #"2-2;1-1;2-3;o;" -\storePredefinedDiagram \chordmode {fis:7} +\storePredefinedDiagram #default-fret-table \chordmode {fis:7} #ukulele-tuning #"3-3;4-4;2-2;1-1;" -\storePredefinedDiagram \chordmode {fis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {fis:m7} #ukulele-tuning #"2-1;4-3;2-2;4-4;" -\storePredefinedDiagram \chordmode {fis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {fis:dim} #ukulele-tuning #"2-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {fis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {fis:maj7} #ukulele-tuning #"3-2;5-4;2-1;4-3;" -\storePredefinedDiagram \chordmode {fis:6} +\storePredefinedDiagram #default-fret-table \chordmode {fis:6} #ukulele-tuning #"3-2-(;3-2-);2-1;4-4;" -\storePredefinedDiagram \chordmode {fis:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {fis:sus2} #ukulele-tuning #"1-1-(;1-1-);2-2;4-4;" -\storePredefinedDiagram \chordmode {fis:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {fis:sus4} #ukulele-tuning #"4-4;1-1;2-2;2-3;" -\storePredefinedDiagram \chordmode {fis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {fis:aug} #ukulele-tuning #"3-2;2-1-(;2-1-);5-4;" -\storePredefinedDiagram \chordmode {fis:9} +\storePredefinedDiagram #default-fret-table \chordmode {fis:9} #ukulele-tuning #"3-1;4-2-(;4-2;4-2-);" %%%% ges chords -\storePredefinedDiagram \chordmode {ges} +\storePredefinedDiagram #default-fret-table \chordmode {ges} #ukulele-tuning #"3-3;1-1;2-2;1-1;" -\storePredefinedDiagram \chordmode {ges:m} +\storePredefinedDiagram #default-fret-table \chordmode {ges:m} #ukulele-tuning #"2-2;1-1;2-3;o;" -\storePredefinedDiagram \chordmode {ges:7} +\storePredefinedDiagram #default-fret-table \chordmode {ges:7} #ukulele-tuning #"3-3;4-4;2-2;1-1;" -\storePredefinedDiagram \chordmode {ges:m7} +\storePredefinedDiagram #default-fret-table \chordmode {ges:m7} #ukulele-tuning #"2-1;4-3;2-2;4-4;" -\storePredefinedDiagram \chordmode {ges:dim} +\storePredefinedDiagram #default-fret-table \chordmode {ges:dim} #ukulele-tuning #"2-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {ges:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {ges:maj7} #ukulele-tuning #"3-2;5-4;2-1;4-3;" -\storePredefinedDiagram \chordmode {ges:6} +\storePredefinedDiagram #default-fret-table \chordmode {ges:6} #ukulele-tuning #"3-2-(;3-2-);2-1;4-4;" -\storePredefinedDiagram \chordmode {ges:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {ges:sus2} #ukulele-tuning #"1-1-(;1-1-);2-2;4-4;" -\storePredefinedDiagram \chordmode {ges:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {ges:sus4} #ukulele-tuning #"4-4;1-1;2-2;2-3;" -\storePredefinedDiagram \chordmode {ges:aug} +\storePredefinedDiagram #default-fret-table \chordmode {ges:aug} #ukulele-tuning #"3-2;2-1-(;2-1-);5-4;" -\storePredefinedDiagram \chordmode {ges:9} +\storePredefinedDiagram #default-fret-table \chordmode {ges:9} #ukulele-tuning #"3-1;4-2-(;4-2;4-2-);" %%%% g chords -\storePredefinedDiagram \chordmode {g} +\storePredefinedDiagram #default-fret-table \chordmode {g} #ukulele-tuning #"o;2-1;3-3;2-2;" -\storePredefinedDiagram \chordmode {g:m} +\storePredefinedDiagram #default-fret-table \chordmode {g:m} #ukulele-tuning #"o;2-2;3-3;1-1;" -\storePredefinedDiagram \chordmode {g:7} +\storePredefinedDiagram #default-fret-table \chordmode {g:7} #ukulele-tuning #"o;2-2;1-1;2-3;" -\storePredefinedDiagram \chordmode {g:m7} +\storePredefinedDiagram #default-fret-table \chordmode {g:m7} #ukulele-tuning #"o;2-2;1-1-(;1-1-);" -\storePredefinedDiagram \chordmode {g:dim} +\storePredefinedDiagram #default-fret-table \chordmode {g:dim} #ukulele-tuning #"o;1-1;o;1-2;" -\storePredefinedDiagram \chordmode {g:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {g:maj7} #ukulele-tuning #"o;2-1;2-2;2-3;" -\storePredefinedDiagram \chordmode {g:6} +\storePredefinedDiagram #default-fret-table \chordmode {g:6} #ukulele-tuning #"o;2-1;o;2-2;" -\storePredefinedDiagram \chordmode {g:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {g:sus2} #ukulele-tuning #"o;2-1;3-2;o;" -\storePredefinedDiagram \chordmode {g:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {g:sus4} #ukulele-tuning #"o;2-1;3-2;3-3;" -\storePredefinedDiagram \chordmode {g:aug} +\storePredefinedDiagram #default-fret-table \chordmode {g:aug} #ukulele-tuning #"o;3-2-(;3-2-);2-1;" -\storePredefinedDiagram \chordmode {g:9} +\storePredefinedDiagram #default-fret-table \chordmode {g:9} #ukulele-tuning #"2-2;2-3;1-1;2-4;" %%%% gis chords -\storePredefinedDiagram \chordmode {gis} +\storePredefinedDiagram #default-fret-table \chordmode {gis} #ukulele-tuning #"5-3;3-1-(;4-2;3-1-);" -\storePredefinedDiagram \chordmode {gis:m} +\storePredefinedDiagram #default-fret-table \chordmode {gis:m} #ukulele-tuning #"1-1;3-3;4-4;2-2;" -\storePredefinedDiagram \chordmode {gis:7} +\storePredefinedDiagram #default-fret-table \chordmode {gis:7} #ukulele-tuning #"1-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {gis:m7} +\storePredefinedDiagram #default-fret-table \chordmode {gis:m7} #ukulele-tuning #"1-1;3-4;2-2;2-3;" -\storePredefinedDiagram \chordmode {gis:dim} +\storePredefinedDiagram #default-fret-table \chordmode {gis:dim} #ukulele-tuning #"1-1;2-3;1-2;2-4;" -\storePredefinedDiagram \chordmode {gis:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {gis:maj7} #ukulele-tuning #"1-1;3-2;3-3-(;3-3-);" -\storePredefinedDiagram \chordmode {gis:6} +\storePredefinedDiagram #default-fret-table \chordmode {gis:6} #ukulele-tuning #"1-1;3-3;1-2;3-4;" -\storePredefinedDiagram \chordmode {gis:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {gis:sus2} #ukulele-tuning #"1-2;3-3;4-4;1-1;" -\storePredefinedDiagram \chordmode {gis:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {gis:sus4} #ukulele-tuning #"1-1;2-3;4-3-(;4-3-);" -\storePredefinedDiagram \chordmode {gis:aug} +\storePredefinedDiagram #default-fret-table \chordmode {gis:aug} #ukulele-tuning #"1-1;o;o;3-4;" -\storePredefinedDiagram \chordmode {gis:9} +\storePredefinedDiagram #default-fret-table \chordmode {gis:9} #ukulele-tuning #"1-1;o;2-3;1-2;" %%%% aes chords -\storePredefinedDiagram \chordmode {aes} +\storePredefinedDiagram #default-fret-table \chordmode {aes} #ukulele-tuning #"5-3;3-1-(;4-2;3-1-);" -\storePredefinedDiagram \chordmode {aes:m} +\storePredefinedDiagram #default-fret-table \chordmode {aes:m} #ukulele-tuning #"1-1;3-3;4-4;2-2;" -\storePredefinedDiagram \chordmode {aes:7} +\storePredefinedDiagram #default-fret-table \chordmode {aes:7} #ukulele-tuning #"1-1;3-3;2-2;3-4;" -\storePredefinedDiagram \chordmode {aes:m7} +\storePredefinedDiagram #default-fret-table \chordmode {aes:m7} #ukulele-tuning #"1-1;3-4;2-2;2-3;" -\storePredefinedDiagram \chordmode {aes:dim} +\storePredefinedDiagram #default-fret-table \chordmode {aes:dim} #ukulele-tuning #"1-1;2-3;1-2;2-4;" -\storePredefinedDiagram \chordmode {aes:maj7} +\storePredefinedDiagram #default-fret-table \chordmode {aes:maj7} #ukulele-tuning #"1-1;3-2;3-3-(;3-3-);" -\storePredefinedDiagram \chordmode {aes:6} +\storePredefinedDiagram #default-fret-table \chordmode {aes:6} #ukulele-tuning #"1-1;3-3;1-2;3-4;" -\storePredefinedDiagram \chordmode {aes:sus2} +\storePredefinedDiagram #default-fret-table \chordmode {aes:sus2} #ukulele-tuning #"1-2;3-3;4-4;1-1;" -\storePredefinedDiagram \chordmode {aes:sus4} +\storePredefinedDiagram #default-fret-table \chordmode {aes:sus4} #ukulele-tuning #"1-1;2-3;4-3-(;4-3-);" -\storePredefinedDiagram \chordmode {aes:aug} +\storePredefinedDiagram #default-fret-table \chordmode {aes:aug} #ukulele-tuning #"1-1;o;o;3-4;" -\storePredefinedDiagram \chordmode {aes:9} +\storePredefinedDiagram #default-fret-table \chordmode {aes:9} #ukulele-tuning #"1-1;o;2-3;1-2;" diff --git a/ly/property-init.ly b/ly/property-init.ly index 1091662705..3283df7b2e 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -337,7 +337,7 @@ back to the lilypond source statement.") predefinedFretboardsOff = \set predefinedDiagramTable = ##f predefinedFretboardsOn = - \set predefinedDiagramTable = #fretboard-table + \set predefinedDiagramTable = #default-fret-table %% shape note heads diff --git a/python/convertrules.py b/python/convertrules.py index 063da1f4f9..df2540967a 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -3056,6 +3056,15 @@ def conv(str): r"style = #'none", str); return str + +@rule ((2, 13, 36), + _ ("Add fretboard-table argument to savePredefinedFretboard.")) +def conv(str): + str = re.sub (r"storePredefinedDiagram", + r"storePredefinedDiagram #default-fret-table", + str); + return str + # Guidelines to write rules (please keep this at the end of this file) # # - keep at most one rule per version; if several conversions should be done, -- 2.39.2