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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 6290277358..3ef38ec812 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--2010 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"
@@ -53,26 +64,28 @@ 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 (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 +97,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. */
 	    }
@@ -116,7 +129,7 @@ Span_bar::width (SCM smob)
   if (!me->is_live ())
     return ly_interval2scm (Interval ());
   
-  std::string gl = ly_scm2string (gn);
+  string gl = ly_scm2string (gn);
 
   /*
     urg.
@@ -177,15 +190,21 @@ 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 == "'")
+    type = "";
 
-  return scm_makfrom0str (type.c_str ());
+  return ly_string2scm (type);
 }
 
 Interval
@@ -209,11 +228,13 @@ Span_bar::calc_bar_size (SCM smob)
   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 "
+	       );