patch::: 1.1.22.jcn2: jcn2

pl 22.jcn2
	- updated mi2mu
	- bf: multi-measure-rest (input/test/m.ly)
	- half fix for staff-margin-engraver

diff --git a/NEWS b/NEWS
index 99fb62d6e42072290133787f9ef151bd9c93ac7b..a3ad4ae23aadbc20028b527ecc6cb61e1238005c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+pl 22.jcn2
+       - updated mi2mu
+       - bf: multi-measure-rest (input/test/m.ly)
+       - half fix for staff-margin-engraver
+
 pl 22.jcn1
        - bf's: cross-staff slur
        - bf: gnossienne-4

diff --git a/TODO b/TODO
index 659bbb3dfb0aa3fec7886433f79b16726293602c..72cca33a4a808258a7bff0b7d1ea56970c3d5c38 100644 (file)
--- a/TODO
+++ b/TODO
@@ -62,7 +62,9 @@ BUGS:
 
        * ly2dvi barfs on linewidth = -1.
 
-       * fix midi output.
+       * fix midi output:
+          - default duration?  duration must be not entered
+            explicitely on first note.
 
        * turn slope-damping on/off
 

diff --git a/VERSION b/VERSION
index 4e40843629516320f5e64a2a838931a5a0cd3a78..7ea9167167d5a50da5823aacb5af56d2c1bde376 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=22
-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/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 69664953434d1a300f465be416e8d36838229e79..7a9100ffb03ad29b60d57d78339632baa68e2b56 100644 (file)
--- a/lily/encompass-info.cc
+++ b/lily/encompass-info.cc
@@ -64,14 +64,16 @@ Encompass_info::Encompass_info (Note_column const* note, Direction dir)
   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);
        }
       else
+#endif
        {
-         warning (_ ("invalid dimension cache: guessing staff position"));
+         //  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"));

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index f1df3cf2e325b15013c0d317c8e24a2dfabdf919..7f0c7583b1dc06eb46829171d9ea150b26ec60ac 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,13 @@ 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))
     {
       typeset_element (mmrest_p_);
+      /*
+       must keep mmrest_p_ around to set measures_i_
+       */
     }
-#endif
   if (lastrest_p_)
     {
       typeset_element (lastrest_p_);
@@ -98,21 +97,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_)
     {
       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

diff --git a/mutopia/gnossienne-4.ly b/mutopia/gnossienne-4.ly
index b346daa8de32831f0a4f05df6ebc7ac8c9f38709..0d5ba62ef340ac698d88e99b2b1f432932e04be9 100644 (file)
--- a/mutopia/gnossienne-4.ly
+++ b/mutopia/gnossienne-4.ly
@@ -24,44 +24,43 @@ global = \notes {
   \bar ".|";
 }
   
-upper = \type Voice=one \notes \relative c''{
+upper = \type Staff=treble \notes\relative c''{
   \clef violin;
   \stemup
+  \type Voice=one
   r2 r r 
-  r2 r r 
-  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
+  r2 r r
+  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e]
   % grace hack
-  % urg, how to get grace in different voice, thus in different beam??
-%  [es8 { \type Voice=urgnobeam \tiny b8*1/2 ~ \normalsize } )c*1/2] r4 r2 r
-  [es8 \type Voice=x \tiny b8*1/2 ~ \normalsize \type Voice=one )c*1/2] r4 r2 r
+  < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
   r2 r r
-  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
-  [es8 { \type Voice=urgnobeam \tiny b8*1/2 ~ \normalsize } )c*1/2] r4 r2 r
+  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e]
+  < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
   r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis] 
   )d4 \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ gis8 r r4 r2
   r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis] 
   )d4 \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ gis8 r r4 r2
   \tiny a8*1/2 ~ \normalsize f4*3/4 ~ f8 r r2 r
-  r2 r4 [a8( b][c d c b] \tiny b8*1/2 ~ \normalsize [e8*1/2 
-  { \type Voice=urgnobeam \tiny a,8*1/2 ~ \normalsize } )g8*1/2] r4 r2 r
+  r2 r4 [a8( b][c d c b] \tiny b8*1/2 ~ \normalsize 
+  < { [e8*1/2 )g,8] } \type Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r
   r2 r4 [a8( b][c d c b] [a b c d][c b a b][c d c b]
-  \tiny b8*1/2 ~ \normalsize [e8*1/2 
-  { \type Voice=urgnobeam \tiny a,8*1/2 ~ \normalsize } )g8*1/2] r4 r2 r
+  \tiny b8*1/2 ~ \normalsize 
+  < { [e8*1/2 )g,8] } \type Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r
   a2( \tiny e'8*1/2 ~ \normalsize f4*3/4 ~ )f8 r r2
   r2 r r
   fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r
-  \tiny b'8*1/2 ~ \normalsize [a8*1/2 
-  { \type Voice=urgnobeam \tiny b8*1/2 ~ \normalsize } a8*1/2] r4 r2 r
-  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
-  [es8 { \type Voice=urgnobeam \tiny b8*1/2 ~ \normalsize } )c*1/2] r4 r2 r
+  \tiny b'8*1/2 ~ \normalsize 
+  < { [a8*1/2 a8] } \type Voice=x { \stemup s8*1/4 \tiny b8*1/2 ~ } > r4 r2 r
+  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e]
+  < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
   d,4( \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ )gis8 r r4 r2
   f4 ~ f8 r r2 r
   [f'8( g a b][a g f g][a b a g]
-  \tiny f8*1/2 ~ \normalsize [g8*1/2 
-  { \type Voice=urgnobeam \tiny d8*1/2 ~ \normalsize } )e8*1/2] r4 r2 r
+  \tiny f8*1/2 ~ \normalsize 
+  < { [g8*1/2 )e8] } \type Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r
   [f8( g a b][a g f g][a b a g]
-  \tiny f8*1/2 ~ \normalsize [g8*1/2 
-  { \type Voice=urgnobeam \tiny d8*1/2 ~ \normalsize } )e8*1/2] r4 r2 r
+  \tiny f8*1/2 ~ \normalsize 
+  < { [g8*1/2 )e8] } \type Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r
   a,2( \tiny e'8*1/2 ~ \normalsize f4*3/4 ~ )f8 r r2
   r2 r r
   fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r