X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=56609b231f9e7b940d5aa27310c3d1d1fb3e2766;hb=faaee71fb44c8e1040239797aad336f4e46c2c21;hp=6f51478f337f57c6210b839d9d5ac7ec550c1d50;hpb=e7020dbb36a9e9c10bda48e5197213e8a3bacef6;p=lilypond.git

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 6f51478f33..56609b231f 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -14,7 +14,7 @@
 #include "bar-line.hh"
 #include "string.hh"
 #include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 
 #include "all-font-metrics.hh"
@@ -30,12 +30,12 @@ Bar_line::print (SCM smob)
 
   SCM s = me->get_property ("glyph");
   SCM barsiz_proc = me->get_property ("bar-size-procedure");
-  if (ly_c_string_p (s) && ly_c_procedure_p (barsiz_proc))
+  if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc))
     {
       String str  =ly_scm2string (s);
       SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
       Real sz = robust_scm2double (siz, 0);
-      if (sz < 0)
+      if (sz <= 0)
 	return SCM_EOL;
       
       return compound_barline (me, str, sz).smobbed_copy ();
@@ -59,18 +59,24 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   thinkern *= staffline;
   hair *= staffline;
   fatline *= staffline;
-  
+
   Stencil thin = simple_barline (me, hair, h);
   Stencil thick = simple_barline (me, fatline, h);
   Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
-  Real dist = ( Staff_symbol_referencer::line_count (me) & 1 ? 1 :
-		(staff_space<2 ? 2 : .5) ) * staff_space;
+
+  int lines =Staff_symbol_referencer::line_count (me);
+  Real dist 
+    = ((lines & 1 || lines == 0)
+       ? 1
+       : (staff_space < 2 ? 2 : .5) ) * staff_space;
   Stencil colon (dot);
   colon.translate_axis (dist,Y_AXIS);
   colon.add_stencil (dot);
   colon.translate_axis (-dist/2,Y_AXIS);
 
   Stencil m;
+  if (str == "||:")
+    str = "|:";
   
   if (str == "")
     {
@@ -140,9 +146,12 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
 }
 
 Stencil
-Bar_line::simple_barline (Grob *me,Real w, Real h) 
+Bar_line::simple_barline (Grob *me,
+			  Real w,
+			  Real h) 
 {
   Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  
   return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot);
 }
 
@@ -157,13 +166,13 @@ Bar_line::before_line_breaking (SCM smob)
   SCM g = me->get_property ("glyph");
   SCM orig = g;
   Direction bsd = item->break_status_dir ();
-  if (ly_c_string_p (g) && bsd)
+  if (scm_is_string (g) && bsd)
     {
       SCM proc = me->get_property ("break-glyph-function");
       g = scm_call_2 (proc, g, scm_int2num (bsd));
     }
   
-  if (!ly_c_string_p (g))
+  if (!scm_is_string (g))
     {
       me->set_property ("print-function", SCM_EOL);
       me->set_extent (SCM_EOL, X_AXIS);
@@ -186,8 +195,8 @@ Bar_line::get_staff_bar_size (SCM smob)
   Grob*me = unsmob_grob (smob);
   Real ss = Staff_symbol_referencer::staff_space (me);
   SCM size = me->get_property ("bar-size");
-  if (is_number (size))
-    return scm_make_real (ly_scm2double (size)*ss);
+  if (ly_c_number_p (size))
+    return scm_make_real (scm_to_double (size)*ss);
   else if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       /*