X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=00e22fb0855e016d3f1750369a26e64634fc5df9;hb=717f02443c1b93426f4f5d3b18fc8c5045b89a03;hp=6290277358bcf80e7c5cb6902445b74aaed3e558;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 6290277358..00e22fb085 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -1,9 +1,20 @@
 /*
-  span-bar.cc -- implement Span_bar
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "span-bar.hh"
@@ -17,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)
@@ -53,26 +66,30 @@ Span_bar::print (SCM smobbed_me)
   if (!scm_is_string (glyph))
     return SCM_EOL;
 
-  std::string glyph_string = ly_scm2string (glyph);
+  string glyph_string = ly_scm2string (glyph);
 
   /* compose span_bar_mol */
-  std::vector<Interval> extents;
+  vector<Interval> extents;
+  vector<bool> make_span_bar;
   Grob *model_bar = 0;
   for (vsize i = elements.size (); i--;)
     {
       Grob *bar = elements[i];
-      Interval ext = bar->extent (refp, Y_AXIS);
+      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;
 
       extents.push_back (ext);
+      make_span_bar.push_back (to_boolean (bar->get_property ("allow-span-bar")));
       model_bar = bar;
     }
 
   if (!model_bar)
     model_bar = me;
 
-  extents.sort (&Interval::left_comparison);
+  vector_sort (extents, Interval::left_less);
 
   Stencil span_bar;
   for (vsize i = 1; i < extents.size (); i++)
@@ -84,7 +101,7 @@ Span_bar::print (SCM smobbed_me)
 	  Interval l (prev_extent [UP],
 		      ext[DOWN]);
 
-	  if (l.is_empty ())
+	  if (l.is_empty () || !make_span_bar[i])
 	    {
 	      /* There is overlap between the bar lines.  Do nothing. */
 	    }
@@ -92,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);
 	    }
 	}
@@ -115,13 +131,14 @@ Span_bar::width (SCM smob)
   SCM gn = me->get_property ("glyph-name");
   if (!me->is_live ())
     return ly_interval2scm (Interval ());
-  
-  std::string gl = ly_scm2string (gn);
+
+  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));
 }
@@ -177,15 +194,29 @@ Span_bar::calc_glyph_name (SCM smob)
       return SCM_UNSPECIFIED;
     }
 
-  std::string type = ly_scm2string (gl);
-  if (type == "|:")
+  string type = ly_scm2string (gl);
+  if (type == "|:" || type == "||:")
     type = ".|";
   else if (type == ":|")
     type = "|.";
   else if (type == ":|:")
     type = ".|.";
+  else if (type == ":|.|:")
+    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 = "";
 
-  return scm_makfrom0str (type.c_str ());
+  return ly_string2scm (type);
 }
 
 Interval
@@ -194,26 +225,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, "span-bar-interface",
-	       "A bar line that spanned between other barlines. This interface is "
-	       " used for  bar lines that connect different staves.",
+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");
+	       "elements "
+	       "pure-Y-common "
+	       "pure-relevant-grobs "
+	       "pure-relevant-items "
+	       "pure-relevant-spanners "
+	       );