release: 1.3.120

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

diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly
index 9aa0536f441a750f9a87b22bfb393200908ca7fc..82ad35fd2c21e9c8556fc9a592e540e13ee4108f 100644 (file)
--- a/input/test/american-chords.ly
+++ b/input/test/american-chords.ly
@@ -1,35 +1,44 @@
+\version "1.3.117"
+%{
+  See scm/chord-names.scm: chord::names-alist-american
+  James Hammons <jlhamm@pacificnet.net>
+%}
+
+\include "english.ly"
 #(set! chord::names-alist-american
       (append 
       '(
-       ;; any changes here, see scm/chord-names.scm
+       ;; any changes here, see scm/chord-name.scm
 
        )
       chord::names-alist-american))
 
-chord = \notes\transpose c''\chords{
-\property ChordNames.chordNameStyle = "american"
-c
-c:m
-c:m5-
-c:5^3
-c:4^3
-c:5+
-c:2^3
-c:m5-.7-
-c:7+
-c:7.4^3
-c:5+.7
-c:m5-.7
-c:5-.7+
-c:m7+
-c:m7
-c:7
-c:6
-c:m6
-c:9^7
-c:6.9^7
-c:9
-c:7+.9
+chord =  \notes\transpose c''\chords{
+       \property ChordNames.ChordName \override #'style = #'american
+c         % Major triad
+cs:m      % Minor triad
+df:m5-    % Diminished triad
+c:5^3     % Root-fifth chord
+c:4^3     % Suspended fourth triad
+c:5+      % Augmented triad
+c:2^3     % "2" chord
+c:m5-.7-  % Diminished seventh
+c:7+      % Major seventh
+c:7.4^3   % Dominant seventh suspended fourth
+c:5+.7    % Augmented dominant seventh
+c:m5-.7   % "Half" diminished seventh
+c:5-.7    % Dominant seventh flat fifth
+c:5-.7+   % Major seventh flat fifth
+c:m7+     % Minor-major seventh
+c:m7      % Minor seventh
+c:7       % Dominant seventh
+c:6       % Major sixth
+c:m6      % Minor sixth
+c:9^7     % Major triad w/added ninth
+c:6.9^7   % Six/Nine chord
+c:9       % Dominant ninth 
+c:7+.9    % Major ninth
+c:m7.9    % Minor ninth
 }
 
 \score{
@@ -39,9 +48,9 @@ c:7+.9
 >
     \paper
     {
-        \translator { \ChordNameContext chordNameWordSpace = #1 }
-        \translator { \LyricsContext textScriptWordSpace = #0.3 }
+               \translator { 
+                       \ChordNamesContext
+                       ChordName \override #'word-space = #1 
+               }
     }
 }
-
-%    (((0 . 0) (2 . -1) (4 . 0)) . ("Bar" . ("script" . "Baz")))