release: 1.3.120

[lilypond.git] / input / test / jazz-chords.ly

diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly
index 8bcafc2aea2a6fbf9b6e90cc3e1579c8c9ec8c77..fefa24587aa9e3202af9a8800cb46cbfd3c1c4a0 100644 (file)
--- a/input/test/jazz-chords.ly
+++ b/input/test/jazz-chords.ly
@@ -1,46 +1,67 @@
-\version "1.3.96"
+
+\version "1.3.117";
+
 %% This should only be necessary if your kpathsea setup is broken
-%%
-%% Make sure the correct msamxx.tfm is where lily can find it
-%% (ie cwd or lily's tfm dir).
-%%
-%% For normal (20pt) paper, do
-%%
-%%   cp locate `msam9.tfm` $LILYPONDPREFIX/tfm
-
-#(set! chord::names-alist-american
-      (append 
-      '(
-        ;; any changes here, see scm/chord-names.scm
-
-
-        ;(((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (super "o7"))
-        ;jazz: the delta, see jazz-chords.ly
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) .  (super ((font-family . "math") "N")))
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (rows ((raise . 1) "o") ((raise . 0.5) ((kern . -0.5) ((font-size . "-3") "/"))) "7")) ; slashed o
-
-        ;(((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (super "x7"))
-        ; slashed o
-       )
-      chord::names-alist-american))
-
-chord = \notes\transpose c''\chords{
-       \property ChordNames.ChordNames \push #'style = #"american"
-       c:m5-.7-
-       c:m5-.7
+%
+% Make sure the correct msamxx.tfm is where lily can find it
+% (ie cwd or lily's tfm dir).
+%
+% For normal (20pt) paper, do
+%
+%   cp locate `msam9.tfm` LILYPONDPREFIXxtfm
+%
+
+chord =  \notes\transpose c''\chords{
+\property ChordNames.ChordName \override #'style = #'jazz
+% major chords
+c
+c:6            % 6 = major triad with added sixth
+c:maj          % triangle = maj
+c:6.9^7                % 6/9 
+c:9^7          % add9
+
+% minor chords
+c:m            % m = minor triad
+c:m.6          % m6 = minor triad with added sixth
+c:m.7+         % m triangle = minor major seventh chord
+c:3-.6.9^7     % m6/9 
+c:m.7          % m7
+c:3-.9         % m9
+c:3-.9^7       % madd9
+
+% dominant chords
+c:7            % 7 = dominant
+c:7.5+         % +7 = augmented dominant
+c:7.5-         % 7b5 = hard diminished dominant
+c:9            % 7(9)
+c:9-           % 7(b9)
+c:9+           % 7(#9)
+c:13^9.11      % 7(13)
+c:13-^9.11     % 7(b13)
+c:13^11                % 7(9,13)
+c:13.9-^11     % 7(b9,13)
+c:13.9+^11     % 7(#9,13)
+c:13-^11       % 7(9,b13)
+c:13-.9-^11    % 7(b9,b13)
+c:13-.9+^11    % 7(#9,b13)
+
+% half diminished chords
+c:m5-.7                % slashed o = m7b5
+c:9.3-.5-      % o/7(pure 9)
+
+% diminished chords
+c:m5-.7-       % o = diminished seventh chord
+
 }
 
 \score{
-    <
-       \context ChordNames \chord
-       \context Staff \chord
-    >
+<
+\context ChordNames \chord
+\context Staff \chord
+>
     \paper
     {
-         \translator { 
-               \ChordNamesContext
-               ChordNames \push #'word-space = #1 
-         }
+        \translator { \ChordNamesContext ChordName \override #'word-space = #1 }
+%        \translator { \LyricsContext textScriptWordSpace = #0.3 }
     }
 }
-