patch::: 1.1.14.jcn1

pl 14.jcn1
        - bf: get_chord C-m5-
        - typos: chord-name

diff --git a/NEWS b/NEWS
index ff5f32efab4127f092c29e9dd1a487ada6a46522..ff0fe81a052abbcb5f4cb255a70d6a134621c1cb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 14.jcn1
+        - bf: get_chord C-m5-
+        - typos: chord-name
+
 pl 14
 
 pl 13.hwn1

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 133f91ae6423607948bcd85ff75da6376dac9507..46bee3b37c45217ea2abed73665012416cd58905 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -50,14 +50,13 @@ Chord_name_engraver::do_process_requests ()
   /*
    Banter style chord names (almost).
    TODO:
-     - don't print inclusive scale (i.e. no "9" in c 9/11)
-     - handle c7 / cmaj7
-     - use #,b iso -es -is on tonica
+     - move this stuff to new Item class Chord_name
      - switch on property, add american (?) chordNameStyle
+     - jazz inversions
 
   Scalar chordNameStyle = get_property ("chordNameStyle");
-  if (chordNameStyle == "Banner")
-     chord = pitches_to_banner (pitch_arr_.size ());
+  if (chordNameStyle == "Banter")
+     chord = pitches_to_banter (pitch_arr_));
 
    */
 

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 7d43cdd8d870acf176b0fa997c4c657256b7d47a..8773ae06d08717a58d7443291505615bfd7670df 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -211,9 +211,7 @@ My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p,
   triads.push (mthird);  // d f 
   triads.push (mthird);  // e g 
   triads.push (third);   // f a 
-  // 7 always seems means 7-...
   triads.push (third);   // g b 
-//  triads.push (mthird);   // g bes
   triads.push (mthird);  // a c 
   triads.push (mthird);  // b d 
 
@@ -249,6 +247,8 @@ My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p,
              }
            missing.transpose (triads[(missing.notename_i_ - tonic.notename_i_ + 7) % 7]);
          }
+      else if (p.notename_i_ == missing.notename_i_)
+        missing.transpose (triads[(missing.notename_i_ - tonic.notename_i_ + 7) % 7]);
       else
        i++;
     }