lilypond-1.0.14

diff --git a/lily/template5.cc b/lily/template5.cc
index ca2523d47819187a6c4d0de5156ec4daf6747163..ccedf67a4dd68a02ea2426fc9bc59715093d61a7 100644 (file)
--- 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 461d43b71a7a7a8fed9500a781a27a51a347ed4f..6dce94333df8aca2c37ffba363e9b2df2efb13bd 100644 (file)
--- 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 053762502f84735f3b927cd74134b33be9322b35..caf499ee4324cb082642b2e4973e0060d3c110ed 100644 (file)
--- 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 1bb8bf6d7fd4c8d09aea89b47de20fb8bbb61626..e032d7ee59da0ee580e7967954f6938b5163084d 100644 (file)
--- 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 9c19eb29dbe797d3c743656e7a34d0457b23be50..ab52ceaf49dd1b47925be7e8e6843f331a8b2b61 100644 (file)
--- 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 $< $@