lilypond-1.3.65

diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc
index 74d165a141f7fb6270a374f4c846c34e8663302a..f346fb9191a36e914465c550327512e29941c502 100644 (file)
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -60,7 +60,7 @@ Align_note_column_engraver::do_removal_processing ()
   if (isdir_b (al))
     {
       Direction d = to_dir (al);
-      directional_element (align_item_p_).set (d);
+      Directional_element_interface (align_item_p_).set (d);
     }
   
   typeset_element (align_item_p_);

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 6c337642d1fa21efbb0ff64c57735a3e0f80265a..c8a7a0c1a2f14db0065b734d9997c14c525fbd0c 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -50,11 +50,11 @@ SCM
 Breathing_sign::member_after_line_breaking ()
 {
   Real space = staff_symbol_referencer (this).staff_space();
-  Direction d = directional_element (this). get ();
+  Direction d = Directional_element_interface (this). get ();
   if (!d)
     {
       d = UP;
-      directional_element(this).set (d);
+      Directional_element_interface (this).set (d);
     }
 
   translate_axis(2.0 * space * d, Y_AXIS);

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 86707e1d8fc067b8635837d0cbeb20757c00bea5..5ab38f6f853025be68c40af6dc1c1282e7f1617a 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -142,7 +142,7 @@ Chord_tremolo_engraver::acknowledge_element (Score_element_info info)
            It's amazing Mike:
            
              Stem:: type_i () ->first_head ()->get_direction () ->
-                     directional_element (me).set (d);
+                     Directional_element_interface (me).set (d);
 
 
              don't understand this comment.

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 1caf93797849862849291611f95fec7c5be9508f..f3d3fccf3fe255ed018c18359f6ea5487e7aaf37 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -53,7 +53,7 @@ Dot_column::Dot_column (SCM s)
 {
   Pointer_group_interface gi (this, "dots");
   gi.set_interface ();
-  directional_element (this).set (RIGHT);
+  Directional_element_interface (this).set (RIGHT);
   
   Axis_group_interface (this).set_interface ();
   Axis_group_interface (this).set_axes(X_AXIS,X_AXIS);

diff --git a/lily/dots.cc b/lily/dots.cc
index 9dc8c8b75b97067de064041ef749d43c07caa2d3..edd64f01445d4d92eb1af5ec4821a530d7b1b68d 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -25,13 +25,13 @@ Dots::member_after_line_breaking ()
   SCM d= get_elt_property ("dot-count");
   if (gh_number_p (d) && gh_scm2int (d))
     {
-      if (!directional_element (this).get ())
-       directional_element (this).set (UP);
+      if (!Directional_element_interface (this).get ())
+       Directional_element_interface (this).set (UP);
 
       Staff_symbol_referencer_interface si (this);
       int p = int (si.position_f ());
       if (!(p % 2))
-       si.set_position (p  + directional_element (this).get ());
+       si.set_position (p  + Directional_element_interface (this).get ());
     }
 
     return SCM_UNDEFINED;

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index a209a04a633e9d0e44ada2c213e802c58139faf1..0d26fcd52a52604f4db37607d9e9b9f21a673b9c 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -105,7 +105,7 @@ Stem_tremolo::member_brew_molecule () const
       int beams_i = stem->beam_count(RIGHT) >? stem->beam_count (LEFT);
       mol.translate (Offset(stem->relative_coordinate (0, X_AXIS) - relative_coordinate (0, X_AXIS),
                            stem->stem_end_position () * ss / 2 - 
-                           directional_element (beam).get () * beams_i * interbeam_f));
+                           Directional_element_interface (beam).get () * beams_i * interbeam_f));
     }
   else
     {  

diff --git a/lily/stem.cc b/lily/stem.cc
index e1b53608c82bf03420f1756dc4bc643e4319a36c..ab18bcd9b1167eeab7b9e7156628bac05c466893 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -95,14 +95,14 @@ Stem::stem_end_position () const
 Direction
 Stem::get_direction () const
 {
-  Direction d = directional_element (this).get ();
+  Direction d = Directional_element_interface (this).get ();
 
   if (!d)
     {
        Stem * me = (Stem*) this;
        d = get_default_dir ();
        // urg, AAARGH!
-       directional_element (me).set (d);
+       Directional_element_interface (me).set (d);
     }
   return d ;
 }
@@ -301,7 +301,7 @@ Stem::get_default_stem_end_position () const
   if (!dir)
     {
       dir = get_default_dir ();
-      directional_element (this).set (dir);
+      Directional_element_interface (this).set (dir);
     }
   
   /* 
@@ -533,7 +533,7 @@ Stem::calc_stem_info () const
 {
   assert (beam_l ());
 
-  Direction beam_dir = directional_element (beam_l ()).get ();
+  Direction beam_dir = Directional_element_interface (beam_l ()).get ();
   if (!beam_dir)
     {
       programming_error ("Beam dir not set.");
@@ -575,7 +575,7 @@ Stem::calc_stem_info () const
 
   Real stem_length =  a[multiplicity <? (a.size () - 1)] * staff_space;
 
-  if (!beam_dir || (beam_dir == directional_element (this).get ()))
+  if (!beam_dir || (beam_dir == Directional_element_interface (this).get ()))
     /* normal beamed stem */
     {
       if (multiplicity)

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 08e242bb6180db35b2852b196d56b6e9b07fe608..a1910eeabc4c69e7426a5c1cfb11b3102527377c 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -55,37 +55,45 @@ tie_compare (Tie* const & s1,
 void
 Tie_column::set_directions ()
 {
-  Link_array<Tie> s =
+  Link_array<Tie> ties =
     Pointer_group_interface__extract_elements (this, (Tie*)0, "ties");
 
 
-  Direction d = directional_element (this).get ();
+  Direction d = Directional_element_interface (this).get ();
 
   if (d)
     {
-      for (int i = s.size (); i--;)
-       directional_element (s[i]).set (d);
+      for (int i = ties.size (); i--;)
+       {
+         Tie * t = ties[i];
+         Directional_element_interface (t).set (d);
+       }
       return;
     }
   
-  if (s.size () == 1)
+  if (ties.size () == 1)
     {
-      directional_element (s[0]).set (s[0]->get_default_dir ());
+      Tie * t = ties[0];      
+      Directional_element_interface (t).set (t->get_default_dir ());
       return;
     }
   
-  s.sort (tie_compare);
-  directional_element (s[0]).set (DOWN);
-  s.del (0);
-  directional_element (s.pop ()).set (UP);
+  ties.sort (tie_compare);
+  Directional_element_interface tie0(ties[0]);
+  tie0.set (DOWN);
+  ties.del (0);
+  
+  Directional_element_interface tietop(ties.pop ());
+  tietop.set (UP);
 
-  for (int i=s.size(); i--; )
+  for (int i=ties.size(); i--; )
     {
-      Real p = s[i]->position_f ();
+      Tie * t = ties[i];
+      Real p = t->position_f ();
       Direction d = (Direction) sign (p);
       if (!d)
        d = UP;
-      directional_element (s[i]).set (d);
+      Directional_element_interface (t).set (d);
     }
   
 }