X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=4cc9971d5da80fc3550f077a53cdad6014da9182;hb=16e626a8524421eda692cb19be6d0ec5bff723b7;hp=36590c30a598fb1c6c4188c3bc46bc83749ca0c5;hpb=27a4d9354effb09c696925881ec4df007da8a0db;p=lilypond.git

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 36590c30a5..4cc9971d5d 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include "bar-line.hh"
 #include "grob.hh"
 #include "pointer-group-interface.hh"
+#include "staff-symbol-referencer.hh"
 
 void
 Span_bar::add_bar (Grob *me, Grob *b)
@@ -74,8 +75,10 @@ Span_bar::print (SCM smobbed_me)
     {
       Grob *bar = elements[i];
       Interval ext = Bar_line::bar_y_extent (bar, refp);
+      if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (bar))
+        ext.unite (staff->extent (refp, Y_AXIS));
       if (ext.is_empty ())
-	continue;
+        continue;
 
       extents.push_back (ext);
       make_span_bar.push_back (to_boolean (bar->get_property ("allow-span-bar")));
@@ -93,29 +96,28 @@ Span_bar::print (SCM smobbed_me)
       Interval prev_extent = extents[i - 1];
       Interval ext = extents[i];
       if (!prev_extent.is_empty ())
-	{
-	  Interval l (prev_extent [UP],
-		      ext[DOWN]);
-
-	  if (l.is_empty () || !make_span_bar[i])
-	    {
-	      /* There is overlap between the bar lines.  Do nothing. */
-	    }
-	  else
-	    {
-	      Stencil interbar = Bar_line::compound_barline (model_bar,
-							     glyph_string,
-							     l.length (),
-							     false);
-	      interbar.translate_axis (l.center (), Y_AXIS);
-	      span_bar.add_stencil (interbar);
-	    }
-	}
+        {
+          Interval l (prev_extent [UP],
+                      ext[DOWN]);
+
+          if (l.is_empty () || !make_span_bar[i])
+            {
+              /* There is overlap between the bar lines.  Do nothing. */
+            }
+          else
+            {
+              Stencil interbar = Bar_line::compound_barline (model_bar,
+                                                             glyph_string,
+                                                             l,
+                                                             false);
+              span_bar.add_stencil (interbar);
+            }
+        }
       prev_extent = ext;
     }
 
   span_bar.translate_axis (- me->relative_coordinate (refp, Y_AXIS),
-			   Y_AXIS);
+                           Y_AXIS);
 
   return span_bar.smobbed_copy ();
 }
@@ -134,7 +136,8 @@ Span_bar::width (SCM smob)
   /*
     urg.
   */
-  Stencil m = Bar_line::compound_barline (me, gl, 40 PT, false);
+  Stencil m
+    = Bar_line::compound_barline (me, gl, Interval (-20 PT, 20 PT), false);
 
   return ly_interval2scm (m.extent (X_AXIS));
 }
@@ -171,9 +174,7 @@ Span_bar::center_on_spanned_callback (SCM smob)
   return scm_from_double (i.center ());
 }
 
-
-
-MAKE_SCHEME_CALLBACK(Span_bar, calc_glyph_name, 1);
+MAKE_SCHEME_CALLBACK (Span_bar, calc_glyph_name, 1);
 SCM
 Span_bar::calc_glyph_name (SCM smob)
 {
@@ -207,7 +208,7 @@ Span_bar::calc_glyph_name (SCM smob)
     type = ".|";
   else if (type == ":|S" || type == ":|S.")
     type = "|.";
-    else if (type == ":|S|:" || type == ":|S.|:")
+  else if (type == ":|S|:" || type == ":|S.|:")
     type = "|._.|";
   else if (type == "'")
     type = "";
@@ -221,28 +222,17 @@ Span_bar::get_spanned_interval (Grob *me)
   return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS));
 }
 
-MAKE_SCHEME_CALLBACK (Span_bar, calc_bar_size, 1);
-SCM
-Span_bar::calc_bar_size (SCM smob)
-{
-  Grob *me = unsmob_grob (smob);
-  Interval iv (get_spanned_interval (me));
-  if (iv.is_empty ())
-    {
-      /* This happens if the bars are hara-kiried from under us. */
-      me->suicide ();
-      return scm_from_double (-1);
-    }
-  return scm_from_double (iv.length ());
-}
-
 ADD_INTERFACE (Span_bar,
-	       "A bar line that is spanned between other barlines.  This"
-	       " interface is used for bar lines that connect different"
-	       " staves.",
-
-	       /* properties */
-	       "glyph-name "
-	       "elements "
-	       );
+               "A bar line that is spanned between other barlines.  This"
+               " interface is used for bar lines that connect different"
+               " staves.",
+
+               /* properties */
+               "glyph-name "
+               "elements "
+               "pure-Y-common "
+               "pure-relevant-grobs "
+               "pure-relevant-items "
+               "pure-relevant-spanners "
+              );