From fdc0e499ab92a227bc52ed038453adf1e4c30639 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 8 Aug 2000 14:46:46 +0200
Subject: [PATCH] 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
---
 CHANGES                     | 15 ++++++++++++++-
 VERSION                     |  2 +-
 midi2ly/duration-convert.cc | 10 ++++++++--
 midi2ly/mudela-item.cc      |  4 ++--
 midi2ly/mudela-stream.cc    |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 44d2d1bbef..4fcc87ed5b 100644
--- 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 10c371b1bf..04429a4b9e 100644
--- 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 bfe8ca2178..8b86426cea 100644
--- 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 7c427c9ff4..23e8d5361e 100644
--- 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 f47a26ffa8..d8c67bcf24 100644
--- 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
-- 
2.39.5