X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=cee5f222430220f906f1120dfb6ff7660673406d;hb=c633bea462ad673cf59f5288b87027c7519c4d4f;hp=e256e8fe55f16ceb8626bc134b08c0ef3c5f8e43;hpb=f7278543a3ca65ee239696c21b4a8d0155bb79db;p=lilypond.git

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index e256e8fe55..cee5f22243 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 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
@@ -46,9 +46,9 @@ Bar_line::calc_bar_extent (SCM smob)
       */
       SCM bar_line_color = me->get_property ("color");
       SCM staff_color = staff->get_property ("color");
-      if (bar_line_color == staff_color)
-	result *= (1 - 0.5 * (Staff_symbol_referencer::line_thickness (me) /
-			      Staff_symbol_referencer::staff_radius (me)));
+      Real radius = Staff_symbol_referencer::staff_radius (me);
+      if (bar_line_color == staff_color && radius)
+        result *= (1 - 0.5 * (Staff_symbol_referencer::line_thickness (me) / radius));
     }
   return ly_interval2scm (result);
 }
@@ -286,7 +286,8 @@ Bar_line::compound_barline (Grob *me, string str, Interval const &extent,
     m = dashed_bar_line (me, extent, hair);
   else if (str == "'")
     m = tick_bar_line (me, extent.at (UP), rounded);
-
+  else if (str == "kievan")
+    m.add_stencil (Font_interface::get_default_font (me)->find_by_name ("scripts.barline.kievan"));
   return m;
 }
 
@@ -467,6 +468,7 @@ ADD_INTERFACE (Bar_line,
                "kern "
                "thin-kern "
                "hair-thickness "
+               "has-span-bar "
                "thick-thickness "
                "glyph "
                "glyph-name "