X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=00e22fb0855e016d3f1750369a26e64634fc5df9;hb=ce4579d52589eea2d01717ee8362fe851fb9a295;hp=a5602934f4928cd55e8487da602c4a9b2da64001;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index a5602934f4..00e22fb085 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,8 @@
 #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,6 +76,8 @@ 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;
 
@@ -105,9 +109,8 @@ Span_bar::print (SCM smobbed_me)
 	    {
 	      Stencil interbar = Bar_line::compound_barline (model_bar,
 							     glyph_string,
-							     l.length (),
+							     l,
 							     false);
-	      interbar.translate_axis (l.center (), Y_AXIS);
 	      span_bar.add_stencil (interbar);
 	    }
 	}
@@ -128,13 +131,14 @@ Span_bar::width (SCM smob)
   SCM gn = me->get_property ("glyph-name");
   if (!me->is_live ())
     return ly_interval2scm (Interval ());
-  
+
   string gl = ly_scm2string (gn);
 
   /*
     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));
 }
@@ -191,7 +195,7 @@ Span_bar::calc_glyph_name (SCM smob)
     }
 
   string type = ly_scm2string (gl);
-  if (type == "|:")
+  if (type == "|:" || type == "||:")
     type = ".|";
   else if (type == ":|")
     type = "|.";
@@ -201,6 +205,14 @@ Span_bar::calc_glyph_name (SCM smob)
     type = "|.|";
   else if (type == ":|.:")
     type = "|.";
+  else if (type == "S" || type == "S|" || type == "|S")
+    type = "||";
+  else if (type == "S|:" || type == ".S|:")
+    type = ".|";
+  else if (type == ":|S" || type == ":|S.")
+    type = "|.";
+    else if (type == ":|S|:" || type == ":|S.|:")
+    type = "|._.|";
   else if (type == "'")
     type = "";
 
@@ -213,21 +225,6 @@ 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"
@@ -236,5 +233,9 @@ ADD_INTERFACE (Span_bar,
 	       /* properties */
 	       "glyph-name "
 	       "elements "
+	       "pure-Y-common "
+	       "pure-relevant-grobs "
+	       "pure-relevant-items "
+	       "pure-relevant-spanners "
 	       );