($(outdir)/%.pdf): add DVIPS_FLAGS. This will

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index b29c40425bb14982025c66dc83dcc5a1e8689504..0a4a585d03a693b04c65541222e023353b311249 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"
@@ -123,6 +123,12 @@ Spanner::do_break_processing ()
     broken_intos_[i]->break_index_ = i;
 }
 
+int
+Spanner::get_break_index ()const
+{
+  return break_index_;
+}
+
 void
 Spanner::set_my_columns ()
 {
@@ -202,9 +208,8 @@ Spanner::Spanner (SCM 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)
@@ -274,7 +279,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)
     {
       /*
        
@@ -289,7 +294,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.  */
@@ -336,14 +341,24 @@ 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_grob_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 )
 {
@@ -352,11 +367,10 @@ unsmob_spanner (SCM s )
 
 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.
-",
+"Other grobs have a shape that depends on the horizontal spacing. 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}s), 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");