* lily/lyric-engraver.cc (get_current_rest): New function.

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index aa454acac27259ab57ce4aedae40643f43a9d16f..4a4a4513b572a42dc3c92c06eeb1a718e863b1d6 100644 (file)
--- 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 (gh_string_p (s) && gh_procedure_p (barsiz_proc))
+  if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc))
     {
       String str  =ly_scm2string (s);
-      SCM siz = gh_call1 (barsiz_proc, me->self_scm ());
+      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 ();
@@ -52,25 +52,31 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
   Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
 
-  Real staffline = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real staffline = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
   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);
+  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_realvar (ly_symbol2scm ("blotdiameter"));
+  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,20 +166,20 @@ Bar_line::before_line_breaking (SCM smob)
   SCM g = me->get_property ("glyph");
   SCM orig = g;
   Direction bsd = item->break_status_dir ();
-  if (gh_string_p (g) && bsd)
+  if (scm_is_string (g) && bsd)
     {
       SCM proc = me->get_property ("break-glyph-function");
-      g = gh_call2 (proc, g, scm_int2num (bsd));
+      g = scm_call_2 (proc, g, scm_int2num (bsd));
     }
   
-  if (!gh_string_p (g))
+  if (!scm_is_string (g))
     {
       me->set_property ("print-function", SCM_EOL);
       me->set_extent (SCM_EOL, X_AXIS);
       // leave y_extent for spanbar? 
     }
 
-  if (! gh_equal_p (g, orig))
+  if (! ly_c_equal_p (g, orig))
     me->set_property ("glyph", g);
 
   return SCM_UNSPECIFIED;
@@ -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 (gh_number_p (size))
-    return gh_double2scm (gh_scm2double (size)*ss);
+  if (scm_is_number (size))
+    return scm_make_real (scm_to_double (size)*ss);
   else if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       /*
@@ -195,7 +204,7 @@ Bar_line::get_staff_bar_size (SCM smob)
        calculation. That's a nonsense value, which would collapse the
        barline so we return 0.0 in the next alternative.
       */
-      return gh_double2scm ((Staff_symbol_referencer::line_count (me) -1) * ss);
+      return scm_make_real ((Staff_symbol_referencer::line_count (me) -1) * ss);
     }
   else
     return scm_int2num (0);