patch::: 1.1.19.jcn1: vlees

diff --git a/VERSION b/VERSION
index 39f8dac6c607696a38f545a7089a89d8fa37a600..985f62eacd89c8d7755cdb6197e8794a96a9799f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=19
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/include/score-column.hh b/lily/include/score-column.hh
index 50fd2afa89b22e9da99bd77c6a496dff2a3a3876..dc3f53961ab6c743ea85bf0cbb47a5572071f8ae 100644 (file)
--- a/lily/include/score-column.hh
+++ b/lily/include/score-column.hh
@@ -42,7 +42,7 @@ public:
     
 
   Moment when() {  return when_; }
-  Score_column (Moment when);       
+  Score_column (Moment when, bool musical_b = false);
   void add_duration (Moment);
   void preprocess();
   bool musical_b() { return musical_b_; }

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index ad1b82d413f0ff8914314808ac9b749fec38717b..4bfa5be725a5cdde6df93d45ba1cfb5bf0fa5104 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -11,6 +11,7 @@
 #include "multi-measure-rest-engraver.hh"
 #include "score-column.hh"
 #include "time-description.hh"
+#include "p-score.hh"
 
 
 ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver);
@@ -49,7 +50,15 @@ Multi_measure_rest_engraver::do_process_requests ()
     {
       Time_description const *time = get_staff_info().time_C_;
       mmrest_p_ = new Multi_measure_rest;
-      rest_item_creation_mom_ =  time->when_mom ();
+      rest_item_creation_mom_ = time->when_mom ();
+
+      rest_item_creation_mom_ += time->whole_per_measure_ / Moment (2);
+#if 0
+      // core dump because of missing column?
+      mmrest_p_->pscore_l_->add_column (new Score_column (rest_item_creation_mom_));
+      mmrest_p_->pscore_l_->add_column (new Score_column (rest_item_creation_mom_, true));
+#endif
+
       announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_));
       start_measure_i_ = time->bars_i_;
     }
@@ -76,7 +85,6 @@ Multi_measure_rest_engraver::do_post_move_processing ()
   if (mmrest_p_ && (!time->whole_in_measure_ || !multi_measure_req_l_))
     {
       assert (rest_item_creation_mom_ < now);
-      mmrest_p_->measures_i_ = time->bars_i_ - start_measure_i_;
       mmrest_p_ = 0;
     }
 }

diff --git a/lily/score-column.cc b/lily/score-column.cc
index 54a52bf502884eb5be5a6fe61327496557f14d36..ab3ceb8a505f39f2249f1454c77e86c632303331 100644 (file)
--- a/lily/score-column.cc
+++ b/lily/score-column.cc
@@ -11,11 +11,11 @@
 #include "score-column.hh"
 #include "command-request.hh"
 
-Score_column::Score_column (Moment w)
+Score_column::Score_column (Moment w, bool musical_b)
 {
   break_penalty_i_ = 0;
   when_ = w;
-  musical_b_ = false;
+  musical_b_ = musical_b;
 }
 
 void

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index e1ab3ab2fb5ea2e055d531f17ac289792b8c35df..783e36399bc418a5819cf5658c931f95b44c1aaa 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -16,6 +16,7 @@
 #include "score-column.hh"
 #include "command-request.hh"
 #include "paper-def.hh"
+#include "p-score.hh"