patch::: 1.3.62.hwn1

* Bugfix: use deep copies for resetting keys.

diff --git a/CHANGES b/CHANGES
index 9d3aa6b1705c27ba2b4ea16392cf0110c0fdf703..b75707b55b92270b9d18202bfac6e6796b066d46 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Score_element::after_line_breaking()
 
 * Removed --ignore-version option. Added --verbose option.
 
+* Bugfix: use deep copies for resetting keys.
+
 1.3.61
 ======
 

diff --git a/VERSION b/VERSION
index e2d5f09aafef7304dee4135c516c5e0e50eb8e59..68a66150c180fb21cb445e6a09304446cc49f12e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=62
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index ba9751c4b50f903e4e41409733b675ea5a061cb1..7c91bbd276dbb6c07cb6de6a9eaf4e3ba9056c4b 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -29,6 +29,9 @@
     A ly_B2A (B b);
  */
 SCM ly_str02scm (char const*c);
+SCM ly_deep_copy (SCM);
+
+
 SCM ly_symbol2scm (char const *);
 String ly_scm2string (SCM s);
 String ly_symbol2string (SCM);

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 550ed5e0f45a844239b64c0bb44dee5f913cc2f0..10b8ac01c17aef4f625e4cfd733e602539550b5e 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -20,7 +20,7 @@ public:
     
   Rest_collision(SCM);
 
-  SCM member_before_line_breaking ();
-  static SCM before_line_breaking (SCM);
+  SCM member_after_line_breaking ();
+  static SCM after_line_breaking (SCM);
 };
 #endif // REST_COLLISION_HH

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index e40605572296fb36da5a90be2842a53091de9b6e..f02685cf4475384bc15dc1d3b2c55b20d14e1e89 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -404,3 +404,15 @@ init_functions ()
 }
 
 ADD_SCM_INIT_FUNC(funcs, init_functions);
+
+SCM
+ly_deep_copy (SCM l)
+{
+  if (gh_pair_p (l))
+    {
+      return gh_cons (ly_deep_copy (gh_car (l)), ly_deep_copy (gh_cdr (l)));
+    }
+  else
+    return l;
+}
+

diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index 172961dacf264c9164b4ea34fa727eccd4d0fcb3..302a1a06300c34ace2d8f66380ca532fd2008466 100644 (file)
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -208,6 +208,9 @@ Local_key_engraver::acknowledge_element (Score_element_info info)
     }
 }
 
+/*
+  ugh. deep_copy uses lots of space.
+ */
 void
 Local_key_engraver::do_process_music()
 {
@@ -218,11 +221,11 @@ Local_key_engraver::do_process_music()
   if (!mp)
     {
       if (!to_boolean (get_property ("noResetKey")))
-       daddy_trans_l_->set_property ("localKeySignature",  sig);
+       daddy_trans_l_->set_property ("localKeySignature",  ly_deep_copy (sig));
     }
   else if (last_keysig_ != sig) 
     {
-      daddy_trans_l_->set_property ("localKeySignature",  sig);
+      daddy_trans_l_->set_property ("localKeySignature",  ly_deep_copy (sig));
     }
 }
 

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index f7474eccb33de0678df690d1ff6115eeb9f5ee9b..a72e0504e30807a98188f432a72c7c813cde513c 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -60,15 +60,16 @@ col2rhythmic_head (Note_column* c)
   return dynamic_cast<Rhythmic_head*> (e);
 }
 
-GLUE_SCORE_ELEMENT(Rest_collision,before_line_breaking);
+GLUE_SCORE_ELEMENT(Rest_collision,after_line_breaking);
+
 SCM
-Rest_collision::member_before_line_breaking ()
+Rest_collision::member_after_line_breaking ()
 {
   Link_array<Note_column> rest_l_arr =
     Pointer_group_interface__extract_elements (this, (Note_column*) 0, "rests");
   Link_array<Note_column> ncol_l_arr =
     Pointer_group_interface__extract_elements (this, (Note_column*) 0, "notes");
-                                     
+
   
   /* 
      handle rest-rest and rest-note collisions

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 10a44a2db828259e985f42027e9e864b8d50c93a..dcf9a7ebb1abc2bc8feb1ad3958dd66e1430cca6 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -549,6 +549,7 @@ ScoreContext = \translator {
        )
        
        basicRestCollisionProperties = #`(
+               (after-line-breaking-callback . ,Rest_collision::after_line_breaking)
        )
        basicScriptProperties    = #`(
                (molecule-callback . ,Script::brew_molecule)
@@ -615,10 +616,10 @@ ScoreContext = \translator {
        )
        basicTieProperties = #`(
                (molecule-callback . ,Tie::brew_molecule)
-               (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)           
+               (after-line-breaking-callback . ,Tie::after_line_breaking)              
        )
        basicTieColumnProperties = #`(
-               (after-line-breaking-callback .,Tie_engraver::after_line_breaking)
+               (after-line-breaking-callback . ,Tie_column::after_line_breaking)
        )
        basicTupletSpannerProperties = #`(
                (number-gap . 2.0)