From eaf0862baffbb945a99e525e1a4f7ef01ae3bfd8 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:14:35 +0000
Subject: [PATCH] lilypond-1.0.14

---
 lily/template5.cc                            | 5 +++--
 mi2mu/include/mudela-item.hh                 | 2 +-
 mi2mu/mudela-item.cc                         | 6 +++++-
 stepmake/stepmake/executable-rules.make      | 1 +
 stepmake/stepmake/yolily-debian-targets.make | 1 -
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lily/template5.cc b/lily/template5.cc
index ca2523d478..ccedf67a4d 100644
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -14,8 +14,6 @@
 
 #include "interval.tcc"
 
-template INTERVAL__INSTANTIATE(Rational);
-
 #include "compare.hh"
 
 Rational
@@ -32,3 +30,6 @@ Interval_t<Rational>::T_to_str (Rational a)
   return a.str ();
 }
 
+
+
+template INTERVAL__INSTANTIATE(Rational);
diff --git a/mi2mu/include/mudela-item.hh b/mi2mu/include/mudela-item.hh
index 461d43b71a..6dce94333d 100644
--- a/mi2mu/include/mudela-item.hh
+++ b/mi2mu/include/mudela-item.hh
@@ -75,7 +75,7 @@ public:
     virtual String str();
     
 //    int const c0_pitch_i_c_ = 60; // huh?
-    int const c0_pitch_i_c_ = 48;
+    static int const c0_pitch_i_c_ = 48;
 
     static bool const simple_plet_b_s = false;
     int channel_i_;
diff --git a/mi2mu/mudela-item.cc b/mi2mu/mudela-item.cc
index 053762502f..caf499ee43 100644
--- a/mi2mu/mudela-item.cc
+++ b/mi2mu/mudela-item.cc
@@ -153,7 +153,11 @@ Mudela_time_signature::str ()
   as
   \plet 2/3; c4 \plet 1/1;
  */
-bool const Mudela_note::simple_plet_b_s = true;
+/*
+  UGH: .hh says false, .cc says true.
+  FIXME.
+ */
+bool const Mudela_note::simple_plet_b_s;
 
 Mudela_note::Mudela_note (Mudela_column* mudela_column_l,
 			  int channel_i, int pitch_i, int dyn_i)
diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
index 1bb8bf6d7f..e032d7ee59 100644
--- a/stepmake/stepmake/executable-rules.make
+++ b/stepmake/stepmake/executable-rules.make
@@ -1 +1,2 @@
 # empty
+
diff --git a/stepmake/stepmake/yolily-debian-targets.make b/stepmake/stepmake/yolily-debian-targets.make
index 9c19eb29db..ab52ceaf49 100644
--- a/stepmake/stepmake/yolily-debian-targets.make
+++ b/stepmake/stepmake/yolily-debian-targets.make
@@ -2,7 +2,6 @@
 
 default: $(OUTCONF_FILES)
 
-
 $(outdir)/%: %
 	rm -f $@
 	ln $< $@
-- 
2.39.5