patch::: 1.3.76.jcn2

1.3.76.jcn2
===========

* Midi2ly bugfix: handle durations longer than longa.  These can occur
  because of lengthened notes when using --no-rests.

* Midi2ly: output `new' \key syntax, and updated version number.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.76.jcn1, To = lilypond-1.3.76.jcn2

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.76.jcn2.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 44d2d1bbeffb07c0abfc99a41fe5e5ce6ff53430..4fcc87ed5bebea58fccd1dadf0bb3066b65ead6e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,17 @@
---- ../lilypond-1.3.76/CHANGES Thu Aug  3 20:29:02 2000
+--- ../lilypond-1.3.76.jcn1/CHANGES    Tue Aug  8 13:56:35 2000
+++ b/CHANGES   Tue Aug  8 14:46:46 2000
+@@ -1,3 +1,11 @@
+1.3.76.jcn2
+===========
+
+* Midi2ly bugfix: handle durations longer than longa.  These can occur
+  because of lengthened notes when using --no-rests.
+
+* Midi2ly: output `new' \key syntax, and updated version number.
+
+ 1.3.76.jcn1
+ ===========
+ --- ../lilypond-1.3.76/CHANGES        Thu Aug  3 20:29:02 2000
 ++ b/CHANGES   Tue Aug  8 13:56:35 2000
 @@ -1,3 +1,14 @@
 1.3.76.jcn1

diff --git a/VERSION b/VERSION
index 10c371b1bfdabfb0061466fcd6d6e9134c483c89..04429a4b9efdfdc68e8377a10f56e243c9c47c9e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=76
-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/midi2ly/duration-convert.cc b/midi2ly/duration-convert.cc
index bfe8ca217852d015dc28e24b33a2acf2a6a6fc7c..8b86426cea945cb13458f27a61bb347830d5044c 100644 (file)
--- a/midi2ly/duration-convert.cc
+++ b/midi2ly/duration-convert.cc
@@ -29,8 +29,14 @@ Duration_convert::dur2_str (Duration dur)
     str = to_str ( type2_i (dur.durlog_i_) );
   else if (dur.durlog_i_ == -1)
     str = "\\breve";
-  else if (dur.durlog_i_ == -2)
-    str = "\\longa";
+  else if (dur.durlog_i_ <= -2)
+    {
+      str = "\\longa";
+      if (dur.durlog_i_ < -2)
+       {
+         dur.plet_.iso_i_ *= 1 << (-2 - dur.durlog_i_);
+       }
+     }
   str += to_str ('.', dur.dots_i_);
   if (dur.plet_b ())
     str += String ("*") + to_str (dur.plet_.iso_i_)

diff --git a/midi2ly/mudela-item.cc b/midi2ly/mudela-item.cc
index 7c427c9ff4316f47e94297961d076e15c0d2f39e..23e8d5361e4a4e91e07105ae4a252616d1e2f8ea 100644 (file)
--- a/midi2ly/mudela-item.cc
+++ b/midi2ly/mudela-item.cc
@@ -56,7 +56,7 @@ Mudela_key::str ()
     : ((-accidentals_i_ % 7) ["cfbeadg"] - 'a' - 2 -2 * minor_i_ + 7) % 7;
   
   String notename_str = !minor_i_
-    ? to_str ((char) ((key_i + 2) % 7 + 'A'))
+    ? to_str ((char) ((key_i + 2) % 7 + 'a'))
     : to_str ((char) ((key_i + 2) % 7 + 'a'));
 
   // fis cis gis dis ais eis bis
@@ -70,7 +70,7 @@ Mudela_key::str ()
   if (accidentals_i)
     notename_str += String (accname [accidentals_i + 2]);
 
-  return "\\key " + notename_str  + (minor_i_ ? "\\minor" : "") + ";\n";
+  return "\\key " + notename_str  + (minor_i_ ? "\\minor" : "\\major") + ";\n";
 }
 
 String

diff --git a/midi2ly/mudela-stream.cc b/midi2ly/mudela-stream.cc
index f47a26ffa872a5a483fd106e23a2041b475dd9fc..d8c67bcf2489d384d2cfdc23d7c36df70fbfb29f 100644 (file)
--- a/midi2ly/mudela-stream.cc
+++ b/midi2ly/mudela-stream.cc
@@ -100,7 +100,7 @@ Mudela_stream::header()
   *os_p_ << filename_str_g;
   *os_p_ << "\n\n";
   // ugh
-  *os_p_ << "\\version \"1.3.4\";\n";
+  *os_p_ << "\\version \"1.3.76\";\n";
 }
 
 void