patch::: 1.3.152.jcn2

1.3.152.jcn2
============

* Some small chord name fixes.

diff --git a/CHANGES b/CHANGES
index 76516840010d6575697168904210cc7886eb6d48..c89915083406278241c63ecf13f573d20f6726f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.152.jcn2
+============
+
+* Some small chord name fixes.
+
 1.3.151.jcn4
 ============
 
@@ -8,6 +13,9 @@ choke on it (so there are printers that don't use ghostscript?).
 
 * Chord tremolo fixes: shift beams vertically on whole notes.  Center beams on whole notes.  'beam-gap' had been renamed to 'gap', but only for reading.
 
+1.3.152
+=======
+
 1.3.151.uu1
 ===========
 

diff --git a/VERSION b/VERSION
index 8f664406f14b46706eef138461b7e48c40d10be7..ea0adbcddfb3b5a3be296b29b8cbdc0fa7b8f96a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=152
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/chord-taxonomy.ly b/input/test/chord-taxonomy.ly
new file mode 100644 (file)
index 0000000..5751954
--- /dev/null
+++ b/input/test/chord-taxonomy.ly
@@ -0,0 +1,24 @@
+\header {
+  title="Chord Taxonomy of LilyPond -- jazz"
+}
+scheme = \chords {
+      c1
+      c:4
+      c:9
+      bes:9^7
+      c:11^7
+      c:9+
+      % TODO
+      c:m5-.7
+      c:m5-.7-
+      c:7+
+      c:m7+
+    }
+    
+\score {
+  <
+    \property ChordNames.ChordName \set #'style = #'jazz
+    \context ChordNames \scheme
+    \context Staff \notes \transpose c'' \scheme
+  >
+}

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 75d3253501a43fb0322f24fa3b04ee107be19c6d..454c70c1f3a81069bcafda98f27ea16ed85fa7c7 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -47,16 +47,16 @@
        ; Cm iso Cm.no5
        (((0 . 0) (2 . -1)) . ("m"))
        ; C2 iso C2.no3
-       (((0 . 0) (1 . 0) (4 . 0)) . ("" (super "2")))
+       (((0 . 0) (1 . 0) (4 . 0)) . ("" (super "2") " "))
        ; C4 iso C4.no3
-       (((0 . 0) (3 . 0) (4 . 0)) . ("" (super "4")))
+       (((0 . 0) (3 . 0) (4 . 0)) . ("" (super "4") " " ))
        ;; Cdim iso Cm5-
        (((0 . 0) (2 . -1) (4 . -1)) . ("dim"))
        ; Co iso Cm5-7-
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" (super "o")))
+        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" (super "o") " "))
        ; Cdim9
-       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1)) . ("dim" (super "9")))
-       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1) (3 . -1)) . ("dim" (super "11")))
+       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1)) . ("dim" (super "9") " "))
+       (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1) (3 . -1)) . ("dim" (super "11") " "))
        )
       chord::names-alist-banter))
 
@@ -456,7 +456,7 @@
 ;Alternate:     (((0 . 0) (2 . 0) (4 . 1)) . ("+"))
         (((0 . 0) (1 . 0) (4 . 0)) . ("2"))
         ;; Common seventh chords
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" (super "o") "7"))
+        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" (super "o") " " "7"))
         (((0 . 0) (2 . 0) (4 . 0) (6 . 0)) . ("maj7"))
         ;; urg! should use (0 . 0 2 . -1) -> "m", and add "7" to that!!
         (((0 . 0) (2 . -1) (4 . 0) (6 . -1)) . ("m7"))
@@ -465,7 +465,7 @@
         ;jazz: the delta, see jazz-chords.ly
         ;;(((0 . 0) (2 . -1) (4 . -1) (6 . -2)) .  (super ((font-family . math) "N"))
         ;; slashed o
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (columns (super (overstrike "o") "/") "7"))
+        (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (columns (super (overstrike "o") "/") " " "7"))
 
         (((0 . 0) (2 . 0) (4 . 1) (6 . -1)) . ("aug7"))
         (((0 . 0) (2 . 0) (4 . -1) (6 . 0)) . (columns "maj7" ((font-relative-size . -2) ((raise . 0.2) (music (named "accidentals--1")))) "5"))
@@ -625,7 +625,7 @@
        ;; half diminshed chords
        ;; half diminished seventh chord = slashed o
        ;; (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (((raise . 0.8) "/o")))
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (columns (super (overstrike "o") "/") "7")) ; slashed o
+        (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (columns (super (overstrike "o") "/") " " "7")) ; slashed o
 
        ; half diminished seventh chord  with major 9 = slashed o cancelation 9
        (((0 . 0) (2 . -1) (4 . -1) (6 . -1) (1 . 0)) . (
@@ -827,6 +827,16 @@ If we encounter a chromatically altered step, turn on list-step
       (append
       '(
         (((0 . 0) (2 . -1)) . ("m"))
+
+       ;; some fixups -- jcn
+       ; major seventh chord = triangle
+       (((0 . 0) (2 . 0) (4 . 0) (6 . 0)) .  (((raise . 0.5)((font-family . math) "N"))))
+       ;; (((0 . 0) (2 . 0) (4 . 0) (6 . 0)) .  (((raise . 0.5)((font-family . math) "M"))))
+
+       ;; minor major seventh chord = m triangle
+       (((0 . 0) (2 . -1) (4 . 0) (6 . 0)) . (columns ("m") ((raise . 0.5)((font-family . math) "N"))))
+       ;; (((0 . 0) (2 . -1) (4 . 0) (6 . 0)) . (columns ("m") ((raise . 0.5)((font-family . math) "M"))))
+       
        )
-      '()))
-      ;;chord::names-alist-american))
+      ;; '()))
+      chord::names-alist-american))