X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=897acf0b31f4e0251e37b76069c5be12504e2202;hb=0f2133cac2c3400eb883b5a00e5bb4fd98bb38a6;hp=08a04e3cffc6d9b538f2c627703c47a6ec19c141;hpb=62f221b6b3861ff055dc0384ec3c48cc665688cd;p=lilypond.git

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 08a04e3cff..897acf0b31 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--2008 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"
@@ -117,7 +128,7 @@ 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);
 
   /*
@@ -180,7 +191,7 @@ Span_bar::calc_glyph_name (SCM smob)
     }
 
   string type = ly_scm2string (gl);
-  if (type == "|:")
+  if (type == "|:" || type == "||:")
     type = ".|";
   else if (type == ":|")
     type = "|.";
@@ -190,6 +201,16 @@ 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 = "";
 
   return ly_string2scm (type);
 }
@@ -223,5 +244,9 @@ ADD_INTERFACE (Span_bar,
 	       /* properties */
 	       "glyph-name "
 	       "elements "
+	       "pure-Y-common "
+	       "pure-relevant-grobs "
+	       "pure-relevant-items "
+	       "pure-relevant-spanners "
 	       );