(ly:optimal-page-breaks): Bugfix: underful

[lilypond.git] / lily / key-signature-interface.cc

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 81946e2769ef161fa84c51ba8c11a58e9b3f53c7..7ccd2179ed400d6028d748ea0201524bc77378ae 100644 (file)
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   keyplacement by Mats Bengtsson
 */
 
 #include "item.hh"
 
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"
 #include "staff-symbol-referencer.hh"
@@ -21,7 +21,7 @@
 
 struct Key_signature_interface
 {
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK (print, (SCM ));
 
   static bool has_interface (Grob*);
 };
@@ -50,6 +50,8 @@ const int NATURAL_TOP_PITCH = 4;
   - lots of values trivially shared (key doesn't change very
   often). Compute those once, and use that as cache for the rest.
 
+  TODO: can  we do without c0pos? it's partly musical. 
+
 */
 int
 alteration_pos  (SCM what, int alter, int c0p)
@@ -92,29 +94,29 @@ alteration_pos  (SCM what, int alter, int c0p)
   TODO
   - space the `natural' signs wider
  */
-MAKE_SCHEME_CALLBACK (Key_signature_interface,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Key_signature_interface,print,1);
 SCM
-Key_signature_interface::brew_molecule (SCM smob)
+Key_signature_interface::print (SCM smob)
 {
   Grob*me =unsmob_grob (smob);
 
   Real inter = Staff_symbol_referencer::staff_space (me)/2.0;
 
-  SCM scm_style = me->get_grob_property ("style");
+  SCM scm_style = me->get_property ("style");
   String style;
   if (gh_symbol_p (scm_style))
     {
-      style = ly_scm2string (scm_symbol_to_string (scm_style));
+      style = ly_symbol2string (scm_style);
     }
   else
     {
       style = "";
     }
 
-  SCM newas = me->get_grob_property ("new-accidentals");  
-  Molecule mol;
+  SCM newas = me->get_property ("new-accidentals");  
+  Stencil mol;
 
-  SCM c0s = me->get_grob_property ("c0-position");
+  SCM c0s = me->get_property ("c0-position");
   int c0p = 0;
   if (gh_number_p (c0s))
     c0p = gh_scm2int (c0s);
@@ -130,9 +132,9 @@ Key_signature_interface::brew_molecule (SCM smob)
       int alteration = gh_scm2int (ly_cdar (s));
       String font_char =
        Accidental_interface::get_fontcharname (style, alteration);
-      Molecule acc (fm->find_by_name ("accidentals-" + font_char));
+      Stencil acc (fm->find_by_name ("accidentals-" + font_char));
 
-      if (acc.empty_b())
+      if (acc.is_empty ())
        {
          me->warning (_f ("accidental `%s' not found", font_char));
        }
@@ -141,14 +143,14 @@ Key_signature_interface::brew_molecule (SCM smob)
          SCM what = ly_caar (s);
          int pos = alteration_pos (what, alteration, c0p);
          acc.translate_axis (pos * inter, Y_AXIS);
-         mol.add_at_edge (X_AXIS, LEFT, acc, 0);
+         mol.add_at_edge (X_AXIS, LEFT, acc, 0, 0);
        }
     }
 
   Item *it = dynamic_cast<Item*> (me) ;
   if (it->break_status_dir () != RIGHT)
     {
-      SCM old = me->get_grob_property ("old-accidentals");
+      SCM old = me->get_property ("old-accidentals");
       
       /*
        Add half a space between  cancellation and key sig.
@@ -158,9 +160,9 @@ Key_signature_interface::brew_molecule (SCM smob)
       Interval x (0, inter);
       Interval y (0,0);
 
-      mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)),0);
+      mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)), 0, 0);
 
-      Molecule natural;
+      Stencil natural;
       if (gh_pair_p (old))
        natural=Font_interface::get_default_font (me)->
            find_by_name (String ("accidentals-") + style + String ("0"));
@@ -175,7 +177,7 @@ Key_signature_interface::brew_molecule (SCM smob)
              int alteration = 0;
              int pos = alteration_pos (what, alteration, c0p);
 
-             Molecule m = natural;
+             Stencil m = natural;
               m.translate_axis (pos* inter, Y_AXIS);
 
              /*
@@ -184,7 +186,7 @@ Key_signature_interface::brew_molecule (SCM smob)
                needed to prevent collisions.
               */
              Real padding = 0.1 ;
-             mol.add_at_edge (X_AXIS, LEFT, m, padding);
+             mol.add_at_edge (X_AXIS, LEFT, m, padding, 0);
             }
         }
     }