lilypond-1.3.21

diff --git a/CHANGES b/CHANGES
index 01c0f2c09e67375227c4864fca643a3bac454d2f..b1c73c72761c664523beb2aa52ef4859aafce4ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+1.3.19.hwn2
+===========
+* Fix disappearing clefs when clefs are not printed with a barline.
+
+1.3.20.jcn2
+==========
+
+* SCM properties beamHeight and beamVerticalposition now use half-spaces:
+  input/test/beam-control.fly
+* Added \context Voice to .fly and .sly; the default \context Staff is almost
+  never what you expect
+* Fixed decision for .sly/.fly in lilypond-mode.
+
 1.3.19.hwn1
 ==========
 

diff --git a/VERSION b/VERSION
index 3c2e8037c53ad3b11327d8b957106d20f7ccc3a1..5c90fcb688c1bc6fd7bb9d879143721a96b37242 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=20
+PATCH_LEVEL=21
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh
index a223d5657d9f673b61cbe468655715d7bc7cb167..f37990f7ee71c83a71a351f75612bc78ecf0357b 100644 (file)
--- a/lily/include/score-element.hh
+++ b/lily/include/score-element.hh
@@ -72,6 +72,22 @@ public:
    */
   SCM get_elt_property (String nm) const;
   void set_elt_property (String, SCM val);
+
+  /**
+     UGH! JUNKME ?
+
+     This gets messy because it changes state
+
+     calling 
+
+     Bar::proc ()
+     {
+       s->remove_elt_property ("foo")
+     } 
+
+     twice may do weird things if Bar::foo has a default set.
+     
+   */
   SCM remove_elt_property (String nm);
 
   void Score_element::set_real (String, Real);

diff --git a/lily/item.cc b/lily/item.cc
index 2b70a03e97554f8d262970cbbc6cb7e2c46fc2f8..d9abade41bf7e23fb80ad3bff5b1bc4f89eb568f 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -76,8 +76,8 @@ Item::try_visibility_lambda ()
     {
       SCM args = scm_listify (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
       SCM result = gh_apply (vis, args);
-      int trans = gh_scm2bool (gh_car (result));
-      int empty = gh_scm2bool (gh_cdr (result));
+      bool trans = gh_scm2bool (gh_car (result));
+      bool empty = gh_scm2bool (gh_cdr (result));
 
       if (empty)
        {
@@ -148,26 +148,15 @@ Item::find_broken_piece (Direction d) const
   Item * me = (Item *) (this); 
   if (!d)
     return me;
-  else 
+  else if (breakable_b ())
     {
       me->do_break ();
       return dynamic_cast<Item*> (broken_to_drul_[d]);
     }
+  else
+    return 0;
 }
 
-
-
-
-#if 0
-int
-Item::left_right_compare(Item const *l, Item const *r)
-{
-  Paper_column *p1 = l->column_l ();
-  Paper_column* p2 = r->column_l ();
-  return p1->rank_i () - p2->rank_i ();
-}
-#endif
-
 Paper_column *
 Item::column_l () const
 {