Remove Font_metric::get_ascii_char() and descendents.

[lilypond.git] / lily / span-bar.cc

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 76e1b60280970bb5eeadbdb9d77ed85f0d6283df..3ef38ec8125e9a2ac5ea291632511860c988a3be 100644 (file)
--- 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--2007 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"
@@ -180,12 +191,18 @@ Span_bar::calc_glyph_name (SCM smob)
     }
 
   string type = ly_scm2string (gl);
-  if (type == "|:")
+  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 ly_string2scm (type);
 }