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 3c812fce6d69743027b665b37c298c68c0c543b3..97a6bb6ca4500784d1eeab097a31422a65dcad69 100644 (file)
--- a/input/test/american-chords.ly
+++ b/input/test/american-chords.ly
@@ -1,46 +1,55 @@
+\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-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
+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 { \ChordNameContext chordNameWordSpace = #1 }
-        \translator { \LyricsContext textScriptWordSpace = #0.3 }
+\score {
+  \notes <
+    \context ChordNames \scheme
+    \context Staff \transpose c'' \scheme
+  >
+  \paper {
+    \translator { 
+      \ChordNamesContext
+      ChordName \override #'word-space = #1 
+      ChordName \override #'style = #'american
     }
+  }
 }
-
-%    (((0 . 0) (2 . -1) (4 . 0)) . ("Bar" . ("script" . "Baz")))