($(outdir)/%.pdf): add DVIPS_FLAGS. This will

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index d729f83429b7a6f44b6c20243fcc778870bb6e43..39934f72f231efd024eba7b92325f894cce6c038 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <math.h>
@@ -13,7 +13,7 @@
 #include "grob.hh"
 #include "bar-line.hh"
 #include "string.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"
 
@@ -21,10 +21,10 @@
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
 
-MAKE_SCHEME_CALLBACK (Bar_line,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Bar_line,print,1);
 
 SCM 
-Bar_line::brew_molecule (SCM smob) 
+Bar_line::print (SCM smob) 
 {
   Grob * me = unsmob_grob (smob);
 
@@ -34,7 +34,7 @@ Bar_line::brew_molecule (SCM smob)
     {
       String str  =ly_scm2string (s);
       SCM siz = gh_call1 (barsiz_proc, me->self_scm ());
-      Real sz =  gh_scm2double (siz);
+      Real sz = robust_scm2double (siz, 0);
       if (sz < 0)
        return SCM_EOL;
       
@@ -44,13 +44,13 @@ Bar_line::brew_molecule (SCM smob)
 }
 
 
-Molecule
+Stencil
 Bar_line::compound_barline (Grob*me, String str, Real h)
 {
-  Real kern = gh_scm2double (me->get_grob_property ("kern"));
-  Real thinkern = gh_scm2double (me->get_grob_property ("thin-kern"));
-  Real hair = gh_scm2double (me->get_grob_property ("hair-thickness"));
-  Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness"));
+  Real kern = robust_scm2double (me->get_grob_property ("kern"), 1);
+  Real thinkern = robust_scm2double (me->get_grob_property ("thin-kern"), 1);
+  Real hair = robust_scm2double (me->get_grob_property ("hair-thickness"), 1);
+  Real fatline = robust_scm2double (me->get_grob_property ("thick-thickness"), 1);
 
   Real staffline = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
   Real staff_space = Staff_symbol_referencer::staff_space (me);
@@ -60,17 +60,17 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   hair *= staffline;
   fatline *= staffline;
   
-  Molecule thin = simple_barline (me, hair, h);
-  Molecule thick = simple_barline (me, fatline, h);
-  Molecule dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+  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;
-  Molecule colon (dot);
+  Stencil colon (dot);
   colon.translate_axis(dist,Y_AXIS);
-  colon.add_molecule(dot);
+  colon.add_stencil(dot);
   colon.translate_axis(-dist/2,Y_AXIS);
 
-  Molecule m;
+  Stencil m;
   
   if (str == "")
     {
@@ -130,16 +130,16 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
       for (int i = 0 ; i < c - 1; i++)
        {
          Real y = (- (c-1.0) / 2 + 0.5  +   i * staff_space);
-         Molecule d (dot);
+         Stencil d (dot);
 
          d. translate_axis (y,Y_AXIS);
-         m.add_molecule (d);
+         m.add_stencil (d);
        }
     }
   return m;
 }
 
-Molecule
+Stencil
 Bar_line::simple_barline (Grob *me,Real w, Real h) 
 {
   Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
@@ -165,7 +165,7 @@ Bar_line::before_line_breaking (SCM smob)
   
   if (!gh_string_p (g))
     {
-      me->set_grob_property ("molecule-callback", SCM_EOL);
+      me->set_grob_property ("print-function", SCM_EOL);
       me->set_extent (SCM_EOL, X_AXIS);
       // leave y_extent for spanbar? 
     }