lilypond-1.1.23

diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly
index be44b11d8896074962e6aaf54b8a9e4ce1475a7a..2755cfffdadbff179d952d814967d234f2c3104f 100644 (file)
--- a/input/test/multi-rest.ly
+++ b/input/test/multi-rest.ly
@@ -1,6 +1,6 @@
 \version "1.0.14";
 
-voice_one = \notes\transpose c'        {  \stemup
+voice_one = \notes\transpose c''{  \stemup
        R1 * 2 | f'4-. r r2 | R1 * 3 |
        f'4-. r r2 | R1 * 3 |
        es'4-. r r2 | r1 |
@@ -11,7 +11,7 @@ voice_one = \notes\transpose c'       {  \stemup
        }
 
 voice_two = \notes
-       { \transpose c, { \stemdown
+       { \transpose c' { \stemdown
        R1 * 2 | f'4-. r r2 | R1 * 3 |
        f'4-. r r2 | R1 * 3 |
        es'4-. r r2 | r1 |

diff --git a/lily/encompass-info.cc b/lily/encompass-info.cc
index 6adca21c22cb47bda6251b862338d7b5a76bf787..7a9100ffb03ad29b60d57d78339632baa68e2b56 100644 (file)
--- a/lily/encompass-info.cc
+++ b/lily/encompass-info.cc
@@ -14,6 +14,7 @@
 #include "encompass-info.hh"
 #include "slur.hh"
 #include "staff-sym.hh"
+#include "note-head.hh"
 #include "debug.hh"
 
 Encompass_info::Encompass_info ()
@@ -23,6 +24,8 @@ Encompass_info::Encompass_info ()
 
 Encompass_info::Encompass_info (Note_column const* note, Direction dir)
 {
+  interstaff_f_ = 0;
+  
   Paper_def* paper = note->paper ();
   Real interline = paper->interline_f ();
   // UGH
@@ -57,25 +60,31 @@ Encompass_info::Encompass_info (Note_column const* note, Direction dir)
   if (stem_l->dir_ != dir)
     o_.y () += 1.0 * internote * dir;
 
-  Slur* slur_l_ = stem_l->slur_l_;
-  if (slur_l_->encompass_arr_.size ()
-      && stem_l->staff_sym_l_ != slur_l_->encompass_arr_[0]->stem_l_->staff_sym_l_)
+  Slur* slur_l = stem_l->slur_l_;
+  if (slur_l->encompass_arr_.size ()
+      && stem_l->staff_sym_l_ != slur_l->encompass_arr_[0]->stem_l_->staff_sym_l_)
     {
+#if 0 // this is nonsense..., don't issue warning
       if (stem_l->staff_sym_l_->dim_cache_[Y_AXIS].valid_b ())
        {
          interstaff_f_ = stem_l->staff_sym_l_->absolute_coordinate (Y_AXIS)
-           - slur_l_->encompass_arr_[0]->stem_l_->staff_sym_l_->absolute_coordinate (Y_AXIS);
+           - slur_l->encompass_arr_[0]->stem_l_->staff_sym_l_->absolute_coordinate (Y_AXIS);
        }
       else
+#endif
        {
-         warning (_ ("invalid dimension cache: guessing staff position"));
-         if (slur_l_->vertical_align_drul_[MIN] != 
-             slur_l_->vertical_align_drul_[MAX])
+         //  warning (_ ("invalid dimension cache: guessing staff position"));
+         if (slur_l->vertical_align_drul_[MIN] != 
+             slur_l->vertical_align_drul_[MAX])
            warning (_ ("minVerticalAlign != maxVerticalAlign: interstaff slurs may be broken"));
-         interstaff_f_ = slur_l_->vertical_align_drul_[MIN];
-         // urg, guess staff order:
-         // if our stem ends higher, our staff is probably lower...
-         if (stem_l->chord_start_f () > slur_l_->encompass_arr_[0]->stem_l_->chord_start_f ())
+         interstaff_f_ = slur_l->vertical_align_drul_[MIN];
+         /* urg, guess staff order */
+         int d = note->head_l_arr_.top ()->steps_i_
+           - slur_l->encompass_arr_[0]->head_l_arr_[0]->steps_i_;
+         if (abs (d > 3))
+           interstaff_f_ *= sign (d);
+         else if (stem_l->chord_start_f () >
+                  slur_l->encompass_arr_[0]->stem_l_->chord_start_f ())
            interstaff_f_ *= -1;
        }
       o_.y () += interstaff_f_;

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index f1df3cf2e325b15013c0d317c8e24a2dfabdf919..6f3ba9597aed4d8991bea7340982d8710dc76710 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -68,7 +68,6 @@ 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 ();
       announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_));
       start_measure_i_ = time->bars_i_;
     }
@@ -78,13 +77,16 @@ void
 Multi_measure_rest_engraver::do_pre_move_processing ()
 {
   Moment now (now_moment ());
-  //urg lily dumps core if i want to let her print all (SkipBars=0) rests...
-#if 0
-  if (mmrest_p_ && (now >= rest_start_mom_) && (mmrest_p_->column_arr_.size () >= 2))
+  Time_description const *time = get_staff_info().time_C_;
+  if (mmrest_p_ && (now >= rest_start_mom_) 
+    && !time->whole_in_measure_
+    && (mmrest_p_->column_arr_.size () >= 2))
     {
       typeset_element (mmrest_p_);
+      /*
+       must keep mmrest_p_ around to set measures_i_
+       */
     }
-#endif
   if (lastrest_p_)
     {
       typeset_element (lastrest_p_);
@@ -98,21 +100,15 @@ Multi_measure_rest_engraver::do_post_move_processing ()
   Time_description const *time = get_staff_info().time_C_;
   Moment now (now_moment ());
 
-  /*
-   when our time's up, calculate the number of bars rest and
-   make way for new request
-   however, linger around a bit to catch this last column when
-   its announced
-   */
-  if (mmrest_p_ && (now >= rest_stop_mom_)) //&& (!time->whole_in_measure_))
+  if (mmrest_p_ && !time->whole_in_measure_)
     {
       lastrest_p_ = mmrest_p_;
       lastrest_p_->measures_i_ = time->bars_i_ - start_measure_i_;
-      //urg lily dumps core if i want to let her print all (SkipBars=0) rests...
-#if 0
-      if (lastrest_p_->column_arr_.size () >= 2)
-        lastrest_p_ = 0;
-#endif
+      mmrest_p_ = 0;
+    }
+
+  if (now >= rest_stop_mom_)
+    {
       multi_measure_req_l_ = 0;
       mmrest_p_ = 0;
     }

diff --git a/lily/staff-margin-engraver.cc b/lily/staff-margin-engraver.cc
index f1f8aa10da7d2c25fd2f25c0a1c7456fd9d015dd..4caa9650397427a2fb69b6cf44b4a636ed86a146 100644 (file)
--- a/lily/staff-margin-engraver.cc
+++ b/lily/staff-margin-engraver.cc
@@ -62,8 +62,7 @@ Staff_margin_engraver::acknowledge_element (Score_element_info i)
   Text_def *td_p =new Text_def;
   td_p->align_dir_ = LEFT;
   td_p->text_str_ = string;
-  // huh?
-  script_p_->dir_ = RIGHT;
+  script_p_->dir_ = LEFT;
   script_p_->specs_p_ = td_p;
   script_p_->breakable_b_ = true;
 

diff --git a/lily/stem-info.cc b/lily/stem-info.cc
index dec7ead2f1fc35cd58b473572c426201dff805ed..14f10606232709e3f20ec7ac28df8981914d84a1 100644 (file)
--- a/lily/stem-info.cc
+++ b/lily/stem-info.cc
@@ -108,14 +108,16 @@ Stem_info::Stem_info (Stem*s)
   if (beam_l_->sinfo_.size ()
       && stem_l_->staff_sym_l_ != beam_l_->sinfo_[0].stem_l_->staff_sym_l_)
     {
+#if 0 // this is nonsense..., don't issue warning
       if (stem_l_->staff_sym_l_->dim_cache_[Y_AXIS].valid_b ())
        {
          interstaff_f_ = stem_l_->staff_sym_l_->absolute_coordinate (Y_AXIS)
            - beam_l_->sinfo_[0].stem_l_->staff_sym_l_->absolute_coordinate (Y_AXIS) / internote_f;
        }
       else
+#endif
        {
-         warning (_ ("invalid dimension cache: guessing staff position"));
+         //      warning (_ ("invalid dimension cache: guessing staff position"));
          if (beam_l_->vertical_align_drul_[MIN] != 
              beam_l_->vertical_align_drul_[MAX])
            warning (_ ("minVerticalAlign != maxVerticalAlign: interstaff slurs may be broken"));

diff --git a/mi2mu/mudela-item.cc b/mi2mu/mudela-item.cc
index ff189fec01d0d5b9c7bcd340e3a43e4bf3afbc2a..da7335ddf75b2570c97d46b4de34ce8ea1216bbf 100644 (file)
--- a/mi2mu/mudela-item.cc
+++ b/mi2mu/mudela-item.cc
@@ -202,10 +202,12 @@ Mudela_note::str ()
 
   //ugh
   if (dur.plet_b ())
-    str += String ("\\[")
+    str += String ("\\times ")
       + String_convert::i2dec_str (dur.plet_.iso_i_, 0, 0)
       + "/"
-      + String_convert::i2dec_str (dur.plet_.type_i_, 0, 0);
+      + String_convert::i2dec_str (dur.plet_.type_i_, 0, 0)
+      + " { ";
+  
 
   str += name_str;
 
@@ -214,7 +216,7 @@ Mudela_note::str ()
   str += Duration_convert::dur2_str (tmp);
 
   if (dur.plet_b ())
-    str += String (" \\]");
+    str += String (" }");
 
   /* 
      note of zero duration is nonsense, 

diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc
index cdaa6f7ae7481d870613eb70cb836ee5ea43f91f..5bdfd11e253333ae1489c022e7bd1ac13c2f5742 100644 (file)
--- a/mi2mu/mudela-stream.cc
+++ b/mi2mu/mudela-stream.cc
@@ -92,7 +92,7 @@ Mudela_stream::header()
   *os_p_ << filename_str_g;
   *os_p_ << "\n\n";
   // ugh
-  *os_p_ << "\\version \"1.0.2\";\n";
+  *os_p_ << "\\version \"1.0.14\";\n";
 }
 
 void