release commit

diff --git a/ChangeLog b/ChangeLog
index 24d0e20685be1c7f4ad91acb02c529a53cd4c5f5..7f3cdedf5d7e730c59394efa3882fa7b649436af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-07  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * VERSION (PATCH_LEVEL): release 2.0.2
+       
+       * lily/mark-engraver.cc (process_music): backport of mark \default
+       fix.
+
+       * lily/tie-engraver.cc (acknowledge_grob): backport tie/accidental
+       bugfix: make ties only for note heads with the same pitch.
+       
+
 2003-12-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/README.in (Suggested): Add gv, remove native windows

diff --git a/VERSION b/VERSION
index 3b76cb1959bbbf62fefb673fd78e4d6a911724e8..e08c7690b63778f02d7e6c2a212b1c0f17c77926 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=0
-PATCH_LEVEL=1
+PATCH_LEVEL=2
 MY_PATCH_LEVEL=
 

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 0d875ba8c11a30ecc8a048770ae239e635ee62a6..637cc5cbb6fac7c049d9cf2a24fade45f624e2b4 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -86,10 +86,7 @@ Mark_engraver::create_items (Music *rq)
   if (text_)
     return;
 
-  SCM s = get_property ("RehearsalMark");
-  text_ = new Item (s);
-
-
+  text_ = new Item (get_property ("RehearsalMark"));
   announce_grob(text_, rq->self_scm());
 }
 
@@ -121,8 +118,6 @@ Mark_engraver::process_music ()
     {
       create_items (mark_req_);
 
-      String t;
-
       /*
        automatic marks.
        */
@@ -134,6 +129,8 @@ Mark_engraver::process_music ()
        }
       else 
        {
+         String t ;
+         
          if (!gh_string_p (m) && !gh_number_p (m)) 
            m =  get_property ("rehearsalMark");
          
@@ -152,19 +149,18 @@ Mark_engraver::process_music ()
                {
                  char c = t[0];
                  c++;
-                 next = to_string (c);
+                 t = to_string (c);
                }
-             m = scm_makfrom0str (next.to_str0 ());
+             m = scm_makfrom0str (t.to_str0 ());
            }
          else
            {
              m = gh_int2scm (1);
+             t = to_string (1);
            }
          
-         daddy_trans_->set_property ("rehearsalMark", m);
-         
          text_->set_grob_property ("text",
-                                     scm_makfrom0str (t.to_str0 ()));
+                                   scm_makfrom0str (t.to_str0 ()));
 
          SCM series = SCM_EOL;
          SCM family = ly_symbol2scm ("number");
@@ -172,7 +168,13 @@ Mark_engraver::process_music ()
            {
              if (!isdigit (t[i])) 
                {
-                 series = ly_symbol2scm ("bold");
+                 /*
+                   This looks strange, since \mark "A"
+                   isn't printed in bold.
+                   
+                  */
+                 
+                 // series = ly_symbol2scm ("bold");
                  family = ly_symbol2scm ("roman");
                  break;
                }
@@ -182,6 +184,8 @@ Mark_engraver::process_music ()
          if (gh_symbol_p (family))
            text_->set_grob_property ("font-family",  family);
        }
+
+      daddy_trans_->set_property ("rehearsalMark", m);
     }
 }
 

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 7cc71e4d5150a427017fd5bf84e7ac7a9095801d..2d557498fe75537b1dce357d75a7cb3e6f368dc3 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -89,9 +89,15 @@ Tie_engraver::acknowledge_grob (Grob_info i)
       for  (int i = heads_to_tie_.size (); i--;)
        {
          Grob *th =  heads_to_tie_[i];
-         int staff_pos = gh_scm2int (h->get_grob_property ("staff-position"));
-         int left_staff_pos = gh_scm2int (th->get_grob_property ("staff-position"));
-         if (staff_pos == left_staff_pos)
+         Music * right_mus = unsmob_music (h->get_grob_property ("cause"));
+         Music * left_mus = unsmob_music (th->get_grob_property ("cause"));
+
+         /*
+           maybe should check positions too.
+          */
+         if (right_mus && left_mus
+             && gh_equal_p (right_mus->get_mus_property ("pitch"),
+                            left_mus->get_mus_property ("pitch")))
            {
              Grob * p = new Spanner (get_property ("Tie"));
              Tie::set_interface (p); // cannot remove yet!

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 0270ad3803ca7fd5c13da58f71fd5123b01c43d8..cc26bcd01a58e846d325b20556624e6146704ecc 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -42,7 +42,7 @@ else:
 %      input feta-bolletjes;   
 %      input feta-banier;
 %      input feta-eindelijk;
-%      input feta-klef;
+       input feta-klef;
        input feta-toevallig;
 %      input feta-schrift;
 %      input feta-haak;