(print): always start from right edge of

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 8e4b060774c45a55762733c9d184683d76781870..058cc2f0ba4bd0fe19cb910737c1e917a1a0c236 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 #include <libc-extension.hh>
@@ -13,7 +13,7 @@
 #include "spanner.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-outputter.hh"
 #include "paper-column.hh"
 #include "system.hh"
@@ -37,7 +37,7 @@ Spanner::do_break_processing ()
     {
       if (Spanner* parent = dynamic_cast<Spanner*> (get_parent ((Axis)a)))
        {
-         if (!parent->spanned_rank_iv ().contains_b (this->spanned_rank_iv ()))
+         if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ()))
            {
              programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
                                         name ().to_str0 (),
@@ -46,7 +46,7 @@ Spanner::do_break_processing ()
        }
     }
   
-  if (get_system () || broken_b ())
+  if (get_system () || is_broken ())
     return;
 
   if (left == right)
@@ -119,6 +119,14 @@ Spanner::do_break_processing ()
        }
     }
   broken_intos_.sort (Spanner::compare);
+  for (int i= broken_intos_.size ();i--;)
+    broken_intos_[i]->break_index_ = i;
+}
+
+int
+Spanner::get_break_index () const
+{
+  return break_index_;
 }
 
 void
@@ -138,17 +146,14 @@ Spanner::spanned_rank_iv ()
 {
   Interval_t<int> iv (0, 0);
 
-  if (spanned_drul_[LEFT])
-    {
-      iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
-    }
-  if (spanned_drul_[RIGHT])
-    {
-      iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
-    }
+  if (spanned_drul_[LEFT] && spanned_drul_[LEFT]->get_column ())
+    iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
+  if (spanned_drul_[RIGHT] && spanned_drul_[RIGHT]->get_column ())
+    iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
   return iv;
 }
 
+
 Item*
 Spanner::get_bound (Direction d) const
 {
@@ -196,11 +201,11 @@ Spanner::set_bound (Direction d, Grob*s)
 Spanner::Spanner (SCM s)
   : Grob (s)
 {
+  break_index_ = 0;
   spanned_drul_[LEFT]=0;
   spanned_drul_[RIGHT]=0;
+
   Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("spanner-interface"));
-                    
-  
 }
 
 Spanner::Spanner (Spanner const &s)
@@ -251,7 +256,7 @@ Spanner::compare (Spanner * const &p1, Spanner * const &p2)
 }
 
 bool
-Spanner::broken_b () const
+Spanner::is_broken () const
 {
   return broken_intos_.size ();
 }
@@ -270,7 +275,7 @@ Spanner::get_broken_left_end_align () const
 
   // Relevant only if left span point is first column in line
   if (sc != NULL &&
-     sc->break_status_dir () == RIGHT)
+      sc->break_status_dir () == RIGHT)
     {
       /*
        
@@ -285,7 +290,7 @@ Spanner::get_broken_left_end_align () const
 }
 
 SCM
-Spanner::do_derived_mark ()
+Spanner::do_derived_mark () const
 {
   /*
     We'd be fucked if this is called before spanned_drul_[] is inited.  */
@@ -332,27 +337,36 @@ Spanner::set_spacing_rods (SCM smob)
   r.item_l_drul_[LEFT] = sp->get_bound (LEFT);
   r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT);
   r.distance_ =
-    gh_scm2double (me->get_grob_property ("minimum-length"))
-    * 1.0;
+    robust_scm2double (me->get_property ("minimum-length"), 0);
 
   r.add_to_cols ();
   return SCM_UNSPECIFIED;
 }
 
 
+/*
+  Return I such that SP == SP->ORIGINAL_->BROKEN_INTOS_[I]. 
+ */
+int
+broken_spanner_index (Spanner * sp)
+{
+  Spanner * parent = dynamic_cast<Spanner*> (sp->original_);
+  return parent->broken_intos_.find_index (sp);
+}
+                     
+
 Spanner*
 unsmob_spanner (SCM s )
 {
   return dynamic_cast<Spanner*> (unsmob_grob (s));
 }
 
-ADD_INTERFACE(Spanner,
+ADD_INTERFACE (Spanner,
              "spanner-interface",
-             "
-Other grobs have a shape that depends on the horizontal spacing. For
-example, slur, beam, tie, etc. These grobs form a subtype called
-@code{Spanner}. All spanners have two span-points (these must be
-@code{Item}s), one on the left and one on the right. The left bound is
-also the X-reference point of the spanner.
-",
+"Some objects are horizontally spanned between objects. For\n"
+"example, slur, beam, tie, etc. These grobs form a subtype called\n"
+"@code{Spanner}. All spanners have two span-points (these must be\n"
+"@code{Item} objects), one on the left and one on the right. The left bound is\n"
+"also the X-reference point of the spanner.\n"
+,
              "minimum-length");