* lily/parser.yy (relative_music): start at middle C without pitch

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index cd42feb77838fc12c7bb71bd01d23af7c9cfef2d..28d4e88ca70c03dc6183d2673a6db32e6b3a3e6a 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -13,27 +13,27 @@
 #include "grob.hh"
 #include "bar-line.hh"
 #include "string.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "stencil.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 
 #include "all-font-metrics.hh"
 #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);
 
-  SCM s = me->get_grob_property ("glyph");
-  SCM barsiz_proc = me->get_grob_property ("bar-size-procedure");
-  if (gh_string_p (s) && gh_procedure_p (barsiz_proc))
+  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))
     {
       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)
        return SCM_EOL;
@@ -44,15 +44,15 @@ Bar_line::brew_molecule (SCM smob)
 }
 
 
-Molecule
+Stencil
 Bar_line::compound_barline (Grob*me, String str, Real h)
 {
-  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 kern = robust_scm2double (me->get_property ("kern"), 1);
+  Real thinkern = robust_scm2double (me->get_property ("thin-kern"), 1);
+  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;
@@ -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);
-  colon.translate_axis(dist,Y_AXIS);
-  colon.add_molecule(dot);
-  colon.translate_axis(-dist/2,Y_AXIS);
+  Stencil colon (dot);
+  colon.translate_axis (dist,Y_AXIS);
+  colon.add_stencil (dot);
+  colon.translate_axis (-dist/2,Y_AXIS);
 
-  Molecule m;
+  Stencil m;
   
   if (str == "")
     {
@@ -130,19 +130,19 @@ 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"));
+  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);
 }
 
@@ -154,24 +154,24 @@ Bar_line::before_line_breaking (SCM smob)
   Grob*me=unsmob_grob (smob);
   Item * item = dynamic_cast<Item*> (me);
   
-  SCM g = me->get_grob_property ("glyph");
+  SCM g = me->get_property ("glyph");
   SCM orig = g;
   Direction bsd = item->break_status_dir ();
-  if (gh_string_p (g) && bsd)
+  if (ly_c_string_p (g) && bsd)
     {
-      SCM proc = me->get_grob_property ("break-glyph-function");
-      g = gh_call2 (proc, g, scm_int2num (bsd));
+      SCM proc = me->get_property ("break-glyph-function");
+      g = scm_call_2 (proc, g, scm_int2num (bsd));
     }
   
-  if (!gh_string_p (g))
+  if (!ly_c_string_p (g))
     {
-      me->set_grob_property ("molecule-callback", SCM_EOL);
+      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))
-    me->set_grob_property ("glyph", g);
+  if (! ly_c_equal_p (g, orig))
+    me->set_property ("glyph", g);
 
   return SCM_UNSPECIFIED;
 }
@@ -185,9 +185,9 @@ 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_grob_property ("bar-size");
-  if (gh_number_p (size))
-    return gh_double2scm (gh_scm2double (size)*ss);
+  SCM size = me->get_property ("bar-size");
+  if (ly_c_number_p (size))
+    return scm_make_real (ly_scm2double (size)*ss);
   else if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       /*
@@ -195,7 +195,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);