convertly.

diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly
index 813c4654d45e8ff64cb51ece1f8221ec8485ec30..aeb1ccec24c5b511cd384a74c3e5a22d2e9d93ac 100644 (file)
--- a/input/regression/chord-changes.ly
+++ b/input/regression/chord-changes.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 
 \header{
 texidoc="property chordChanges: only display chord names when

diff --git a/input/regression/chord-names.ly b/input/regression/chord-names.ly
index e7d4ce07b176c1de4443dd987a385b1291f3754c..a352c3da2fa05824b2ccdb85ab65ce2d516c8863 100644 (file)
--- a/input/regression/chord-names.ly
+++ b/input/regression/chord-names.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header{
 texidoc="
 Chord names are generated from a list pitches, and are customisable

diff --git a/input/test/Cc-chords.ly b/input/test/Cc-chords.ly
index f26556285c307602721e07bd0ff93cbd2bc1862d..4d760aac69bf0b29d894233dbfadea50f847c5cc 100644 (file)
--- a/input/test/Cc-chords.ly
+++ b/input/test/Cc-chords.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header {
   texidoc="Jazz chord names, but with lower case names for minor chords
 
@@ -41,7 +41,7 @@ FIXME:
 
 \score {
   <
-    \property ChordNames.ChordName \set #'style = #'jazz
+    #(set-chord-name-style 'jazz)
     \context ChordNames \chords { c1 c:m c:m7 }
   >
 }

diff --git a/input/test/chord-banter.ly b/input/test/chord-banter.ly
index d6741fb0a96c76163c3ff5db406bc24dc785caeb..6d862155722a4be110ae9dfa7ef99673349789a6 100644 (file)
--- a/input/test/chord-banter.ly
+++ b/input/test/chord-banter.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header{
 filename =     "chord-table.ly"
 copyright =    "public domain"

diff --git a/input/test/chord-changes.ly b/input/test/chord-changes.ly
index 1963f05bd1392d865ec1b969a8e963ff0721eb78..131561c2e0c784dd36864909391b8e6e3735ebec 100644 (file)
--- a/input/test/chord-changes.ly
+++ b/input/test/chord-changes.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 
 \header{
 texidoc="property chordChanges: only display chord names when

diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly
index bf2444a33cd3e929e1b3ed8911ecf49d1d7040fb..7a1c1a67aa65c790da016558abd39ec67d40cc7d 100644 (file)
--- a/input/test/chord-inversion.ly
+++ b/input/test/chord-inversion.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header{
 enteredby =     "jcn"
 copyright =     "public domain"

diff --git a/input/test/chord-markup.ly b/input/test/chord-markup.ly
index 3cfa334b0c430376e522afa52239bb7277a9e42f..b88f75174c0e574c18da43fd0bc29dc2ae12f44b 100644 (file)
--- a/input/test/chord-markup.ly
+++ b/input/test/chord-markup.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header{
     texidoc = "chord/markup test"
 }

diff --git a/input/test/chord-names-american.ly b/input/test/chord-names-american.ly
new file mode 100644 (file)
index 0000000..c1e5e21
--- /dev/null
+++ b/input/test/chord-names-american.ly
@@ -0,0 +1,62 @@
+\version "1.7.10"
+\header {
+    texidoc = "Chord names in american styles, according to one of our users.
+
+
+FIXME
+
+"
+}
+
+\include "english.ly"
+
+
+%%FIXME:
+
+% DON'T  do this in the test file, it messes up all other files in the directory.
+
+% #(set! chord::names-alist-american
+%     (append 
+%     '(
+%       ;; any changes here, see scm/chord-name.scm
+%      )
+%      chord::names-alist-american))
+
+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 {
+  \notes <
+    \context ChordNames {
+         #(set-chord-name-style 'american)
+         \scheme
+    }
+    \context Staff \transpose c c' \scheme
+  >
+}
+
+%% new-chords-done %%

diff --git a/input/test/chord-names-banter.ly b/input/test/chord-names-banter.ly
new file mode 100644 (file)
index 0000000..464fe04
--- /dev/null
+++ b/input/test/chord-names-banter.ly
@@ -0,0 +1,91 @@
+\version "1.7.10"
+
+
+\header{
+texidoc =  "banter  chords
+
+
+FIXME
+
+"
+}
+
+% test German (Banter) naming
+% for more conventional naming, comment scm stuff out
+
+% urg, 
+% this shows a serious shortcoming with our guile approach:
+% we can't (easily) display banter/non banter chords alongside
+% eachother.  These guile lists are fixed in the guile environment
+% when this file has been parsed...
+
+%{
+
+
+%% FIXME: 
+
+#;(define chord::names-alist-banter '())
+#(set! chord::names-alist-banter
+      (append 
+      '(
+        (((0 . 0) (2 . -1) (4 . -1)) . (("m" ("5-" . (type . "super")))))
+        Co iso Cm5-7-
+        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("o" (type "super")))
+       )))
+
+% German note names:
+% Urg, this will break again, in time
+% Is this correct, anyway?
+
+#(define (pitch->text pitch)
+  (if (and (= (modulo (cadr pitch) 7) 6)
+             (= (caddr pitch) -1))
+      (cons (make-string 1 (integer->char 66)) '())
+      (cons
+       (if (= (modulo (cadr pitch) 7) 6)
+          (make-string 1 (integer->char 72))
+          (make-string 1 (integer->char (+ (modulo (+ (cadr pitch) 2) 7) 65))))
+       (if (= (caddr pitch) 0)
+          '()
+          (list (list (string-append "accidentals-" 
+                                     (number->string (caddr pitch)))
+                      '(font . "feta")))))))
+
+%}
+
+chord =  \notes\transpose c' c''\chords{
+       % dim modifier means: lower all implicit additions
+       c:dim9
+       c:dim
+       c:dim7
+       % explicit additions are taken as entered:
+       c:m5-.7-
+       % note that 7 is a special case: it's always lowered by 1...
+       c:dim7-.9
+       c:dim9-.11
+
+       % test German names
+       b:dim7
+       bes:m5-
+
+       \break
+
+       c:sus2  %?
+       c:sus4
+       c^3
+       c^3.5
+       c:2.6^5
+       c:dim^5-
+       c:dim7^5-
+       cis:m5-
+}
+
+\score{
+       < \context ChordNames {
+         #(set-chord-name-style 'banter)
+         \chord }
+         \context Staff \chord
+       >
+}
+
+%% new-chords-done %%

diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
new file mode 100644 (file)
index 0000000..fd996ce
--- /dev/null
+++ b/input/test/chord-names-jazz.ly
@@ -0,0 +1,64 @@
+\version "1.7.10"
+
+
+
+%% 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` LILYPONDPREFIXxtfm
+%
+
+scheme = \chords {
+  % 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 {
+  \notes <
+    \context ChordNames {
+       #(set-chord-name-style 'jazz)
+       \scheme }
+    \context Staff \transpose c c' \scheme
+  >
+}
+%% new-chords-done %%

diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly
index f87a9ef55c6cd8666401174b5122a269090a7f78..e91c0cf169187a3d9880305d49e7d63c65854a63 100644 (file)
--- a/input/test/chord-table.ly
+++ b/input/test/chord-table.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header{
 filename =     "chord-table.ly"
 copyright =    "public domain"

diff --git a/input/test/chord-taxonomy.ly b/input/test/chord-taxonomy.ly
index 05752119a8956e5859d50859f35cfc3e294dfd4d..8f840581b72d5d84d13197b62199e55bf7aa3637 100644 (file)
--- a/input/test/chord-taxonomy.ly
+++ b/input/test/chord-taxonomy.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header {
   title="Chord Taxonomy of LilyPond -- jazz"
 }
@@ -18,7 +18,7 @@ scheme = \chords {
     
 \score {
   <
-    \property ChordNames.ChordName \set #'style = #'jazz
+    #(set-chord-name-style 'jazz)
     \context ChordNames \scheme
     \context Staff \notes \transpose c c' \scheme
   >

diff --git a/input/test/chords.ly b/input/test/chords.ly
index bd7b7c6b053a03f2e516fa42ebb0d75b3914d45d..b6bb57f3143f32d0d3f38ef6cca9c6fdd07effc6 100644 (file)
--- a/input/test/chords.ly
+++ b/input/test/chords.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 
 
 %{

diff --git a/input/test/ct-jazz.ly b/input/test/ct-jazz.ly
index 427fbd723ea006eac41c651bb090964a8d4eff4d..eb3338fcdaf480f0002a9ad9ea63690f84670982 100644 (file)
--- a/input/test/ct-jazz.ly
+++ b/input/test/ct-jazz.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 \header {
   title="Chord Taxomony of LilyPond -- jazz"
   subtitle="Amy's chord tests"
@@ -15,7 +15,7 @@ scheme = \chords {
     
 \score {
   <
-    \property ChordNames.ChordName \set #'style = #'jazz
+    #(set-chord-name-style 'jazz)
     \context ChordNames \scheme
     \context Staff \notes \transpose c c' \scheme
   >

diff --git a/input/test/german-chords.ly b/input/test/german-chords.ly
index 583c20503c638fd9d3852bd481f525ce1e90eb9e..62585f4b9c0fe43cb4dcd1126f3c0427e8dbd5b2 100644 (file)
--- a/input/test/german-chords.ly
+++ b/input/test/german-chords.ly
@@ -8,7 +8,7 @@ FIXME. Most likely broken during namespace reorganisation of early 1.7.
 
 
 }
-\version "1.7.6"
+\version "1.7.10"
 \include "german-chords-init.ly"
 
 % #(set! german-Bb #t)

diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly
index 44f7d0ed6f1439d477bfa018c61051c88ee2cef8..54b3376afab2d01c690108b3b093fd448d40392e 100644 (file)
--- a/input/test/gmsusd.ly
+++ b/input/test/gmsusd.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 % the Gm7sus4/D chord prints as Gm/4/7/D
 % it took me quite a while by experiment to work out how to enter it -- PC
 

diff --git a/input/test/improv.ly b/input/test/improv.ly
index 6349630bc7585c5a8e36fd399d2747eff2a7a03d..02b65719d5974aad1f8ef1938d0c6af575cecb40 100644 (file)
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -6,7 +6,7 @@ texidoc = "note heads for improvisation have a different shape. "
 %{ TODO: the construct with separet SquashVoice context is a little
  gory. FIXME.  %}
 
-\version "1.7.6"
+\version "1.7.10"
 
 improOn = \notes {\translator Voice = impro }
 improOff = \notes {\translator SquashVoice = melo }

diff --git a/input/test/monstrous.ly b/input/test/monstrous.ly
index 29d770aada594cea8388ac08ac3c5c5305f91bd8..83d4bf65a50e915fdf018508db37f7804af986fb 100644 (file)
--- a/input/test/monstrous.ly
+++ b/input/test/monstrous.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "1.7.10"
 
 \header {
     texidoc ="FIXME"

diff --git a/input/test/note-chords.ly b/input/test/note-chords.ly
index 4e795d0fd1f62e6b1669f7ed44fe31c6ce544e54..276ffb8b27673a69a0e4f2df24f527675c60ca61 100644 (file)
--- a/input/test/note-chords.ly
+++ b/input/test/note-chords.ly
@@ -3,7 +3,7 @@
     texidoc= "Chord names don't attempt to find inversions and
 bass notes."  }
 
-\version "1.7.6"
+\version "1.7.10"
 
 scheme = \notes {
   <<c' e' g'>>1