(music_property_def): oops. SCM_UNDEFINED

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 49c907879e1a19f609eb3945fbe401c81db6554d..78c8a636781fe3b02e5b89e6be4747904a664f66 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -23,7 +23,7 @@
 #include "paper-def.hh"
 #include "rhythmic-head.hh"
 #include "font-interface.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-column.hh"
 #include "misc.hh"
 #include "beam.hh"
@@ -215,6 +215,9 @@ icmp (int const &a, int const &b)
   return a-b;
 }
 
+/*
+  The positions, in ascending order.
+ */
 Array<int>
 Stem::note_head_positions (Grob *me)
 {
@@ -248,7 +251,7 @@ Stem::add_head (Grob*me, Grob *n)
 }
 
 bool
-Stem::invisible_b (Grob*me)
+Stem::is_invisible (Grob*me)
 {
   return ! (head_count (me)
            && gh_scm2int (me->get_grob_property ("duration-log")) >= 1);
@@ -342,13 +345,13 @@ Stem::get_default_stem_end_position (Grob*me)
        Crude hack: add extra space if tremolo flag is there.
 
        We can't do this for the beam, since we get into a loop
-       (Stem_tremolo::raw_molecule() looks at the beam.)
+       (Stem_tremolo::raw_stencil() looks at the beam.)
        
         --hwn 
       */
       
       Real minlen =
-       1.0 + 2 * Stem_tremolo::raw_molecule (trem).extent (Y_AXIS).length  () / ss;
+       1.0 + 2 * Stem_tremolo::raw_stencil (trem).extent (Y_AXIS).length  () / ss;
       
       if (durlog >= 3)
        {
@@ -492,7 +495,7 @@ Stem::position_noteheads (Grob*me)
              Real reverse_overlap =0.5;
              heads[i]->translate_axis ((l-thick*reverse_overlap) * d, X_AXIS);
 
-             if (invisible_b(me))
+             if (is_invisible(me))
                heads[i]->translate_axis (-thick*(2 - reverse_overlap) * d , X_AXIS);
 
              
@@ -537,7 +540,7 @@ Stem::before_line_breaking (SCM smob)
     }
   else
     {
-      me->set_grob_property ("molecule-callback", SCM_EOL);
+      me->set_grob_property ("print-function", SCM_EOL);
     }
   
   return SCM_UNSPECIFIED;
@@ -556,10 +559,10 @@ Stem::height (SCM smob, SCM ax)
   Grob * me = unsmob_grob (smob);
   assert (a == Y_AXIS);
 
-  SCM mol = me->get_uncached_molecule ();
+  SCM mol = me->get_uncached_stencil ();
   Interval iv;
   if (mol != SCM_EOL)
-    iv = unsmob_molecule (mol)->extent (a);
+    iv = unsmob_stencil (mol)->extent (a);
   if (Grob *b =get_beam (me))
     {
       Direction d = get_direction (me);
@@ -570,7 +573,7 @@ Stem::height (SCM smob, SCM ax)
 }
 
 
-Molecule
+Stencil
 Stem::flag (Grob*me)
 {
   /* TODO: maybe property stroke-style should take different values,
@@ -586,7 +589,7 @@ Stem::flag (Grob*me)
 
   if (flag_style == "no-flag")
     {
-      return Molecule ();
+      return Stencil ();
     }
 
   bool adjust = to_boolean (me->get_grob_property ("adjust-if-on-staffline"));
@@ -645,7 +648,7 @@ Stem::flag (Grob*me)
   String font_char =
     flag_style + to_string (dir) + staffline_offs + to_string (duration_log (me));
   Font_metric *fm = Font_interface::get_default_font (me);
-  Molecule flag = fm->find_by_name ("flags-" + font_char);
+  Stencil flag = fm->find_by_name ("flags-" + font_char);
   if (flag.is_empty ())
     {
       me->warning (_f ("flag `%s' not found", font_char));
@@ -658,14 +661,14 @@ Stem::flag (Grob*me)
       if (!stroke_style.is_empty ())
        {
          String font_char = to_string (dir) + stroke_style;
-         Molecule stroke = fm->find_by_name ("flags-" + font_char);
+         Stencil stroke = fm->find_by_name ("flags-" + font_char);
          if (stroke.is_empty ())
            {
              me->warning (_f ("flag stroke `%s' not found", font_char));
            }
          else
            {
-             flag.add_molecule (stroke);
+             flag.add_stencil (stroke);
            }
        }
     }
@@ -698,13 +701,13 @@ Stem::thickness (Grob* me)
     * Staff_symbol_referencer::line_thickness (me);
 }
 
-MAKE_SCHEME_CALLBACK (Stem,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Stem,print,1);
 
 SCM
-Stem::brew_molecule (SCM smob) 
+Stem::print (SCM smob) 
 {
   Grob*me = unsmob_grob (smob);
-  Molecule mol;
+  Stencil mol;
   Direction d = get_direction (me);
      
   /*
@@ -718,7 +721,7 @@ Stem::brew_molecule (SCM smob)
   if (!lh)
     return SCM_EOL;
 
-  if (invisible_b (me))
+  if (is_invisible (me))
     return SCM_EOL;
   
   Real y1 = Staff_symbol_referencer::get_position (lh);
@@ -751,15 +754,15 @@ Stem::brew_molecule (SCM smob)
   Box b = Box (Interval (-stem_width/2, stem_width/2),
               Interval (stem_y[DOWN]*dy, stem_y[UP]*dy));
 
-  Molecule ss = Lookup::round_filled_box (b, blot);
-  mol.add_molecule (ss);
+  Stencil ss = Lookup::round_filled_box (b, blot);
+  mol.add_stencil (ss);
 
   if (!get_beam (me) && abs (duration_log (me)) > 2)
     {
-      Molecule fl = flag (me);
+      Stencil fl = flag (me);
       fl.translate_axis (stem_y[d]*dy - d * blot/2, Y_AXIS);
       fl.translate_axis (stem_width/2, X_AXIS);
-      mol.add_molecule (fl);
+      mol.add_stencil (fl);
     }
 
   return mol.smobbed_copy ();
@@ -787,7 +790,7 @@ Stem::off_callback (SCM element_smob, SCM)
       
       Real attach =0.0;
 
-      if (invisible_b (me))
+      if (is_invisible (me))
        {
          attach = 0.0;
        }
@@ -848,6 +851,13 @@ void
 Stem::calc_stem_info (Grob *me)
 {
   Direction my_dir = get_grob_direction (me);
+
+  if (!my_dir)
+    {
+      programming_error ("No stem dir set?");
+      my_dir  = UP;
+    }
+  
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Grob *beam = get_beam (me);
   Real beam_translation = Beam::get_beam_translation (beam);
@@ -913,8 +923,8 @@ Stem::calc_stem_info (Grob *me)
      
      Also, not for knees.  Seems to be a good thing. */
   bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend"));
-  bool knee_b = to_boolean (beam->get_grob_property ("knee"));
-  if (!no_extend_b && !knee_b)
+  bool is_knee = to_boolean (beam->get_grob_property ("knee"));
+  if (!no_extend_b && !is_knee)
     {
       /* Highest beam of (UP) beam must never be lower than middle
         staffline */
@@ -967,7 +977,12 @@ Stem::beam_multiplicity (Grob *stem)
   these are too many props.
  */
 ADD_INTERFACE (Stem,"stem-interface",
-              "A stem",
+              "The stem represent the graphical  stem. "
+              "  In addition, it internally connects note heads, beams, tremolos. Rests "
+              " and whole notes have invisible stems."
+
+,
+              
               "tremolo-flag french-beaming "
               "avoid-note-head adjust-if-on-staffline thickness "
               "stem-info beamed-lengths beamed-minimum-free-lengths "