lilypond-1.3.86

diff --git a/input/test/stacked-scripts.ly b/input/test/stacked-scripts.ly
new file mode 100644 (file)
index 0000000..fa21ad8
--- /dev/null
+++ b/input/test/stacked-scripts.ly
@@ -0,0 +1,7 @@
+\score {
+       \notes {
+               c2_"geen gedonder"_"jij gaat onder"
+               c2^^^.^|^"down"^"up"
+        }
+       \paper { linewidth = -1. ; }
+}

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 38777cb5696fd811924f2f2690ff0efce6e90193..738052d5a213d020da2409b1f5f086575881b939 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -39,7 +39,7 @@ Dot_column::add_head (Score_element * me, Score_element *rh)
 void
 Dot_column::set_interface (Score_element* me)
 {
-  me->set_elt_property  ("dots", SCM_EOL);
+
   Directional_element_interface::set (me, RIGHT);
   
   Axis_group_interface::set_interface (me);

diff --git a/lily/group-interface.cc b/lily/group-interface.cc
index ffbbf06c5d9d795af84f518d0e3d683c589e6274..b82807d5b23f8f8d1067ecf113aac85220d8632e 100644 (file)
--- a/lily/group-interface.cc
+++ b/lily/group-interface.cc
@@ -53,7 +53,7 @@ Group_interface::set_interface ()
 {
   if (!has_interface ())
     {
-      elt_l_->set_elt_property (name_.ch_C (), SCM_EOL);
+
     }
 }
 

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 25680db3ef26eca41d0d08886515c6dfb4bf1530..bbc6bfc643ed84b61dc9794b9435632b5ccc8908 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -16,7 +16,6 @@
 void
 Hara_kiri_group_spanner::set_interface (Score_element*me)
 {
-  me->set_elt_property ("items-worth-living", SCM_EOL);
   me->add_offset_callback (force_hara_kiri_callback, Y_AXIS);
   me->set_interface (ly_symbol2scm ("hara-kiri-spanner-interface"));
   me->set_extent_callback (Hara_kiri_group_spanner::y_extent, Y_AXIS);

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 4b57a9662c37ada2054729331612a3f97d2c156d..4803ce3437764eb5a1aea5960c94b2c5f6b55111 100644 (file)
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -13,7 +13,11 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 #include "rod.hh"
+/*
+  properties:
 
+  columns -- list of paper-columns
+ */
 class Multi_measure_rest
 {
 public:

diff --git a/lily/include/spaceable-element.hh b/lily/include/spaceable-element.hh
index 72a713ed4cf9ee210d4fcd5b973577aff4251f62..9b719077072d641e5f015fb6c4393e9e8d7567e8 100644 (file)
--- a/lily/include/spaceable-element.hh
+++ b/lily/include/spaceable-element.hh
@@ -12,7 +12,15 @@
 
 #include "lily-guile.hh"
 #include "lily-proto.hh"
+/*
+  properties :
 
+  minimum-distances -- list of rods (ie. (OBJ . DIST) pairs)
+
+  ideal-distances -- (OBJ . (DIST . STRENGTH)) pairs
+  
+  dir-list -- list of stem directions.
+ */
 
 struct Spaceable_element
 {

diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh
index 71ad91559327317b5b9154112c09312f70735220..c8c29a678a50469c3b6f0cb828dfe67c8c171f2a 100644 (file)
--- a/lily/include/stem-tremolo.hh
+++ b/lily/include/stem-tremolo.hh
@@ -13,6 +13,9 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
+/*
+  stem -- pointer to the stem object.
+ */
 class Stem_tremolo
 {
 public:

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index 4ecd9e56d054ea07bf3c2c0c97f0f7b8fc22d828..329e41fb0bf211dd6ec212bb16dfc108a9f413bd 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -13,6 +13,10 @@
 #include "lily-guile.hh"
 #include "lily-proto.hh"
 
+
+/*
+  heads -- pair of element pointers, pointing to the two heads of the
+  tie.  */
 class Tie
 {
 public:

diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh
index 0bebbf3805e333cd5077480d54810a6f4de84eda..49a5bac13c4b730d870fe06b290a5acf0cb0bc15 100644 (file)
--- a/lily/include/tuplet-spanner.hh
+++ b/lily/include/tuplet-spanner.hh
@@ -15,7 +15,14 @@
     (or should we be above staff?)
 
   todo: handle breaking elegantly.
+properties:
+
+  beams -- list of beam ptrs.
+
+  columns -- list of note-columns.
+
 */
+
 class Tuplet_spanner
 {
 public:

diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh
index 733c43b1e0b93e70b76de92fb2a024939ce11e07..4697b8d8b6214ad6b268b1d3c5982e3032f00cdd 100644 (file)
--- a/lily/include/volta-spanner.hh
+++ b/lily/include/volta-spanner.hh
@@ -10,7 +10,13 @@
 
 #include "spanner.hh"
 
-/** Volta bracket with number */
+/** Volta bracket with number
+
+properties:
+
+bars -- list of barline ptrs.
+
+*/
 
 class Volta_spanner
 {

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 6429df3684cbdb10f4d1d98bfe1df3f44e9fd2ce..f5605bc6677ba0d4d119dc3447f99a8ca1b852ac 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -218,6 +218,5 @@ Rest_collision::set_interface (Score_element*me)
 {
   me->set_extent_callback (0, X_AXIS);
   me->set_extent_callback (0, Y_AXIS);
-  me->set_elt_property ("elements", SCM_EOL);
 }
 

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 23df7b72af0e3a00dbeef709b2c18215cf785493..0a30bea2496d66a366dd9af421d90d2fbe37b8cc 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -54,13 +54,12 @@ Script_column_engraver::do_post_move_processing ()
 }
 
 void
-Script_column_engraver::acknowledge_element( Score_element_info inf) 
+Script_column_engraver::acknowledge_element(Score_element_info inf) 
 {
-  if (Side_position::has_interface (inf.elem_l_)) // ugh FIXME
+  Item *thing = dynamic_cast<Item*> (inf.elem_l_);
+  if (thing && Side_position::has_interface (inf.elem_l_)) // ugh FIXME
     {
-      Item *thing = dynamic_cast<Item*> (inf.elem_l_);
-      if (thing
-         && !Item::breakable_b (thing)
+      if (!Item::breakable_b (thing)
          && Side_position::get_axis (inf.elem_l_) == Y_AXIS)
        {
          script_l_arr_.push (thing);
@@ -74,7 +73,7 @@ Script_column_engraver::process_acknowledged ()
   if (!scol_p_ && script_l_arr_.size () > 1)
     {
       scol_p_ = new Item (get_property ("basicScriptColumnProperties"));
-      scol_p_->set_elt_property ("scripts", SCM_EOL);  
+
 
       announce_element (scol_p_, 0);
     }

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 15b2eb58e982dee8397e0d2548a80b99cdc395bf..51055a3a9a36c7b995239e2370688a33201ab128 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,5 +1,5 @@
 /*   
-  g-script-column.cc --  implement Script_column
+  script-column.cc --  implement Script_column
   
   source file of the GNU LilyPond music typesetter
   

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index d740483ac8016287c4f8d7fc30c33740d829096b..a50bea8d4f51af988151cbaa3ef1ae244998cf7b 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -15,7 +15,6 @@
 void
 Separation_item::set_interface (Score_element*s)
 {
-  s->set_elt_property ("elements", SCM_EOL);
   s->set_extent_callback (0, X_AXIS);
   s->set_extent_callback (0,  Y_AXIS);
 }

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index de2d398b70ad7eb9776fa2af73bcc4c7b6f5bb92..e82bf70465d60084707dab3d3db906cd9f261a0c 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -219,11 +219,6 @@ Side_position::add_staff_support (Score_element*me)
 void
 Side_position::set_axis (Score_element*me, Axis a)
 {
-  /*
-  // prop transparent ? 
-  if (me->get_elt_property ("side-support-elements") == SCM_UNDEFINED)
-    me->set_elt_property ("side-support-elements" ,SCM_EOL);
-  */
   if (!me->has_offset_callback_b (aligned_side, a))
     me->add_offset_callback (aligned_side, a);
 }
@@ -263,14 +258,14 @@ Side_position::set_padding (Score_element*me, Real p)
 bool
 Side_position::has_interface (Score_element*me) 
 {
-  return me->get_elt_property ("side-support-elements") != SCM_EOL;
+  return me->has_interface (ly_symbol2scm ("side-position-interface"));
 }
 
 bool
 Side_position::supported_b (Score_element*me) 
 {
   SCM s = me->get_elt_property  ("side-support-elements"); 
-  return s != SCM_UNDEFINED && s != SCM_EOL;
+  return gh_pair_p(s);
 }
 
 

diff --git a/lily/spaceable-element.cc b/lily/spaceable-element.cc
index b11f9842184203c10f3f954037c9027982302513..37cac89a5e29e8a316c4bc4461241b0bbe7b59a3 100644 (file)
--- a/lily/spaceable-element.cc
+++ b/lily/spaceable-element.cc
@@ -78,7 +78,4 @@ Spaceable_element::remove_interface (Score_element*me)
 void
 Spaceable_element::set_interface (Score_element*me)
 {
-  me->set_elt_property ("minimum-distances", SCM_EOL);
-  me->set_elt_property ("ideal-distances", SCM_EOL);
-  me->set_elt_property ("dir-list",SCM_EOL) ;  
 }

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index e52df9fd05dda4888bd0f73f0cbc1bfdb665f9f5..e2cd5c6b2c3bea76ca2dcbce2608ed8a458d2bd8 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -25,7 +25,6 @@
 void
 Stem_tremolo::set_interface (Score_element *me)
 {
-me->set_elt_property ("stem", SCM_EOL);
 }
 
 

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index b634bf70e6a9809afb4a04e2c964c738fb320d09..4d72b074dbf1273afcdf7039a7827e26e0c40474 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -13,7 +13,7 @@
 #include "item.hh"
 #include "musical-request.hh"
 #include "stem.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
 
 /**
    typeset directions that are  plain text.
@@ -48,7 +48,7 @@ Text_engraver::do_try_music (Music *m)
 void
 Text_engraver::acknowledge_element (Score_element_info inf)
 {
-  if (Note_head::has_interface (inf.elem_l_))
+  if (Rhythmic_head::has_interface (inf.elem_l_))
     {
       for (int i=0; i < texts_.size (); i++)
        {

diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc
index a74e155f0f05d7921e97188453c0598502ce32e3..4600df3e2ddcea5d697657590725385eb92204f3 100644 (file)
--- a/lily/tuplet-spanner.cc
+++ b/lily/tuplet-spanner.cc
@@ -27,8 +27,6 @@
 void
 Tuplet_spanner::set_interface (Score_element*me)
 {
-  me-> set_elt_property ("beams", SCM_EOL);
-  me->set_elt_property ("columns", SCM_EOL);
 }
 
 /*

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 7e738429893b004adaa029ba74fc6f6d2933bcfe..c2d6c7511be00bbddd782b83cc6ea8a762f33fcd 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -22,7 +22,6 @@
 void
 Volta_spanner::set_interface (Score_element*me)
 {
-  me->set_elt_property ("bars", SCM_EOL);
   Side_position::set_axis (me, Y_AXIS);
   Directional_element_interface::set (me, UP);
 }