patch::: 1.3.121.jcn1

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

diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly
index ac9716fe66c87792832d0947c467ba56e9389f34..97a6bb6ca4500784d1eeab097a31422a65dcad69 100644 (file)
--- a/input/test/american-chords.ly
+++ b/input/test/american-chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.110"
+\version "1.3.117"
 %{
   See scm/chord-names.scm: chord::names-alist-american
   James Hammons <jlhamm@pacificnet.net>
@@ -13,44 +13,43 @@
        )
       chord::names-alist-american))
 
-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
+scheme = \chords {
+  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{
-<
-\context ChordNames \chord
-\context Staff \chord
->
-    \paper
-    {
-               \translator { 
-                       \ChordNamesContext
-                       ChordNames \override #'word-space = #1 
-               }
+\score {
+  \notes <
+    \context ChordNames \scheme
+    \context Staff \transpose c'' \scheme
+  >
+  \paper {
+    \translator { 
+      \ChordNamesContext
+      ChordName \override #'word-space = #1 
+      ChordName \override #'style = #'american
     }
+  }
 }