* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 42f03f423ca041da343e91fe8e6f85f9382147cd..de9c1a2a9458dca90dd93d400f5f79dc79d15d72 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -17,7 +17,7 @@
 #include "all-font-metrics.hh"
 #include "staff-symbol-referencer.hh"
 
-MAKE_SCHEME_CALLBACK (Bar_line,print,1);
+MAKE_SCHEME_CALLBACK (Bar_line, print, 1);
 
 SCM 
 Bar_line::print (SCM smob) 
@@ -28,7 +28,7 @@ Bar_line::print (SCM smob)
   SCM barsiz_proc = me->get_property ("bar-size-procedure");
   if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc))
     {
-      String str  =ly_scm2string (s);
+      String str  = ly_scm2string (s);
       SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
       Real sz = robust_scm2double (siz, 0);
       if (sz <= 0)
@@ -58,17 +58,17 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
 
   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");
+  Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
 
-  int lines =Staff_symbol_referencer::line_count (me);
+  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.translate_axis (dist, Y_AXIS);
   colon.add_stencil (dot);
-  colon.translate_axis (-dist/2,Y_AXIS);
+  colon.translate_axis (-dist/2, Y_AXIS);
 
   Stencil m;
   if (str == "||:")
@@ -85,7 +85,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   else if (str == "|." || (h == 0 && str == ":|"))
     {
       m.add_at_edge (X_AXIS, LEFT, thick, 0, 0);      
-      m.add_at_edge (X_AXIS, LEFT, thin, kern,0 );
+      m.add_at_edge (X_AXIS, LEFT, thin, kern, 0 );
     }
   else if (str == ".|" || (h == 0 && str == "|:"))
     {
@@ -134,7 +134,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
          Real y = (- (c-1.0) / 2 + 0.5  +   i * staff_space);
          Stencil d (dot);
 
-         d. translate_axis (y,Y_AXIS);
+         d. translate_axis (y, Y_AXIS);
          m.add_stencil (d);
        }
     }
@@ -148,15 +148,15 @@ Bar_line::simple_barline (Grob *me,
 {
   Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
   
-  return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot);
+  return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h/2, h/2)), blot);
 }
 
-MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1);
+MAKE_SCHEME_CALLBACK (Bar_line, before_line_breaking , 1);
 
 SCM
 Bar_line::before_line_breaking (SCM smob)
 {
-  Grob*me=unsmob_grob (smob);
+  Grob*me = unsmob_grob (smob);
   Item * item = dynamic_cast<Item*> (me);
   
   SCM g = me->get_property ("glyph");
@@ -184,7 +184,7 @@ Bar_line::before_line_breaking (SCM smob)
 
 
 
-MAKE_SCHEME_CALLBACK (Bar_line,get_staff_bar_size,1);
+MAKE_SCHEME_CALLBACK (Bar_line, get_staff_bar_size, 1);
 SCM
 Bar_line::get_staff_bar_size (SCM smob) 
 {
@@ -216,7 +216,7 @@ ADD_INTERFACE (Bar_line, "bar-line-interface",
 "Print a special bar symbol. It replaces the \n"
 "regular bar symbol with a special\n"
 "symbol.  The argument @var{bartype} is a string which specifies the\n"
-"kind of bar to print.  Options are @code{:|},\n"
+"kind of bar to print.  Options are @code{:|}, \n"
 "@code{|:}, @code{:|:},\n"
 "@code{||}, @code{|.},\n"
 "@code{.|}, and @code{.|.}. \n"