patch::: 1.2.9.jcn2

pl 9.jcn2
	- 2.95 fixes
	- input/test/different-time-signatures.ly (wasn't this in refman?)

diff --git a/CHANGES b/CHANGES
index 638bacedf40d7cecff57c9441cfec103323e251c..dde6aac485a3dea2c612fb1aa222c9035d3c6150 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+pl 9.jcn2
+       - 2.95 fixes
+       - input/test/different-time-signatures.ly (wasn't this in refman?)
+
 pl 9.jcn1
        - included last Localisation.texi
        - set-lily: de catalog too

diff --git a/TODO b/TODO
index 48a1b492359920a06dade2bb4f24abbcc44fb7fa..b6461b75e11fd4e0dcc642e6f1d78ca620071a12 100644 (file)
--- a/TODO
+++ b/TODO
@@ -16,6 +16,29 @@ Grep -i for TODO, FIXME and ugh/ugr/urg.
 . * script engraver
 . * HaraKiriStaffContext removes bar lines and doesn't remove
     staff margin text on removed staff lines.
+. * Chords:
+.  * Bass/inversion pitch when not part of Chord
+Sometimes a series of changing chords will be blocked out over a static tone
+in the bass, usually this was referred to as a pedal tone (and it's been
+continued to be used, even in contemporary music).  Another less frequently
+used practice is putting a non-chordal tone in the bass (that is not acting
+as a pedal tone) in order to create tension or make a more colorful sound.
+There are examples of this in the classsical literature, but its use is much
+more prevalent today.  For example, the chord sequence Dm7 - Dm7/G is such a
+sequence, and the Dm7/G defies easy classification.  Is it a G7(no 3rd)add
+9/11?  Or is it a G7(no 3rd)add2/4?  Or perhaps Dm7 add11?  It's a heck of a
+lot easier to read to just leave it as Dm7/G!
+.  * Diminished does not mean 5-
+When speaking of a chord, dimished can mean one of two things:  A diminished
+triad or a dimished seventh chord (which is distinctly different from what's
+known as the 'half-diminished' chord).  The triad is a root with a flat
+third and flat fifth, and is notated (at least in America, someone else will
+have to fill me in on other countries) as (using C as the root) Cdim, or Co.
+The diminished seventh has a root with a flat third, flat fifth, and a
+doubly flatted seventh (which is enharmonically equivalent to a sixth, and
+from which comes tons of confusion).  It is usually notated as (again, using
+C as the root) Cdim7 or Co7.
+
 . * Mondrup:
 
 - I would like the possibility of forcing clef- and key- changes to be

diff --git a/VERSION b/VERSION
index eaef5028d4274f86e4b046740e620d488e427b5b..e126e9c0882adb7d4be01ab9c2fce3d2c21a7cb1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=9
-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/flower/getopt-long.cc b/flower/getopt-long.cc
index 0b9a638ae5c8cba34fdcc5e6f894cba94eef26e7..b1e83ef1bd7ad5f1d1fc583901572ed3056bb229 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -16,7 +16,7 @@
 inline char*
 gettext (char const* s)
 {
-  return s;
+  return (char*)s;
 }
 #else
 #include <libintl.h>

diff --git a/flower/international.cc b/flower/international.cc
index f677ef72b39f45c075f0bbf1a95b95ef8b3604da..6734a49bff81cff2a28997d086ea31650f1e3d39 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -16,7 +16,7 @@
 inline char*
 gettext (char const* s)
 {
-  return s;
+  return (char*)s;
 }
 #else
 #include <libintl.h>

diff --git a/input/bugs/monstrous.ly b/input/bugs/monstrous.ly
new file mode 100644 (file)
index 0000000..52ca689
--- /dev/null
+++ b/input/bugs/monstrous.ly
@@ -0,0 +1,20 @@
+
+monstrous= \chords{
+    \property Score.chordInversion = "1"
+
+    % /c is missing:
+    bes-6/c
+
+    % Cdim7 ??
+    cis-3-.5-.6 
+}
+
+\score{
+    <
+       \context ChordNames \monstrous
+       \context Staff \monstrous
+    >
+    \paper{
+       linelength=-1.0\mm;
+    }
+}

diff --git a/input/test/different-time-signatures.ly b/input/test/different-time-signatures.ly
new file mode 100644 (file)
index 0000000..f7d7624
--- /dev/null
+++ b/input/test/different-time-signatures.ly
@@ -0,0 +1,24 @@
+\score{
+    <
+       \context Staff=a \notes{
+           \time 3/4;
+           c4 c c | c c c |
+       }
+       \context Staff=b \notes{
+           \time 2/4;
+           c4 c | c c | c c
+       }
+    >
+
+    \paper{
+       linelength = -1.0\cm;
+       \translator{
+           \ScoreContext
+           \remove Timing_engraver;
+       }
+       \translator{
+           \StaffContext
+           \consists Timing_engraver;
+       }
+    }
+}