* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / note-head.cc

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 08b7c057c6176fe8f58e39a1b104d83e0129846a..16c58ebaea15aa1137b235a6ea3dc07e50862290 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -11,7 +11,7 @@
 #include "misc.hh"
 #include "dots.hh"
 #include "note-head.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-interface.hh"
 #include "molecule.hh"
 #include "musical-request.hh"
@@ -73,24 +73,16 @@ Note_head::brew_ledger_lines (Grob *me,
   if (lines_i)
     {
       Real ledgerlinethickness =
-       (me->paper_l ()->get_var ("ledgerlinethickness"));
+       (me->get_paper ()->get_var ("ledgerlinethickness"));
       Real blotdiameter = ledgerlinethickness;
-      //       (me->paper_l ()->get_var ("blotdiameter"));
+      //       (me->get_paper ()->get_var ("blotdiameter"));
       Interval y_extent =
-       Interval (-0.5*(ledgerlinethickness - blotdiameter),
-                 +0.5*(ledgerlinethickness - blotdiameter));
+       Interval (-0.5*(ledgerlinethickness),
+                 +0.5*(ledgerlinethickness));
       Box ledger_line (x_extent, y_extent);
 
-      // FIXME: Currently need blotdiameter factor 2.0 to compensate
-      // for error somewhere else.  (Maybe draw_box confuses radius
-      // and diameter?)
-#if 1
-       Molecule proto_ledger_line =
-         Lookup::roundfilledbox (ledger_line, ledgerlinethickness );
-#else
-      Molecule proto_ledger_line = // if you like it the old way
-       Lookup::filledbox (ledger_line);
-#endif
+      Molecule proto_ledger_line =
+       Lookup::roundfilledbox (ledger_line, blotdiameter);
       
       if (!take_space)
         proto_ledger_line.set_empty (true);
@@ -111,7 +103,7 @@ Note_head::brew_ledger_lines (Grob *me,
 }
 
 Molecule
-internal_brew_molecule (Grob *me,  bool ledger_take_space)
+internal_brew_molecule (Grob *me, bool ledger_take_space)
 {
   SCM style  = me->get_grob_property ("style");
   if (!gh_symbol_p (style))
@@ -124,22 +116,29 @@ internal_brew_molecule (Grob *me,  bool ledger_take_space)
 
     UGH: use grob-property.
   */
-  SCM log = gh_int2scm (Rhythmic_head::balltype_i (me));
+  SCM log = gh_int2scm (Note_head::get_balltype (me));
   SCM exp = scm_list_n (ly_symbol2scm ("find-notehead-symbol"), log,
                        ly_quote_scm (style),
                        SCM_UNDEFINED);
-  String name = "noteheads-" + ly_scm2string (scm_primitive_eval (exp));
-  Molecule out = Font_interface::get_default_font (me)->find_by_name (name);
+  SCM scm_font_char = scm_primitive_eval (exp);
+  String font_char = "noteheads-" + ly_scm2string (scm_font_char);
+
+  Font_metric * fm = Font_interface::get_default_font (me);
+  Molecule out = fm->find_by_name (font_char);
+  if (out.empty_b())
+    {
+      me->warning (_f ("note head `%s' not found", font_char.to_str0 ()));
+    }
 
   int interspaces = Staff_symbol_referencer::line_count (me)-1;
-  int pos = (int)rint (Staff_symbol_referencer::position_f (me));
+  int pos = (int)rint (Staff_symbol_referencer::get_position (me));
   if (abs (pos) - interspaces > 1)
     {
       Interval hd = out.extent (X_AXIS);
       Real left_ledger_protusion = hd.length ()/4;
       Real right_ledger_protusion = left_ledger_protusion;
 
-      if (unsmob_grob(me->get_grob_property ("accidentals-grob")))
+      if (unsmob_grob(me->get_grob_property ("accidental-grob")))
        {
          /*
            make a little room for accidentals.
@@ -176,18 +175,17 @@ Note_head::brew_molecule (SCM smob)
 
 /*
   Compute the width the head without ledgers.
+
+  -- there used to be some code from the time that ledgers
+  did take space. Nowadays, we can simply take the standard extent.
  */
 Interval
 Note_head::head_extent (Grob *me, Axis a)
 {
-  return internal_brew_molecule (me, false).extent (a);
+  Molecule * mol = me->get_molecule();
+  return mol ? mol ->extent (a) : Interval(0,0);
 }
 
-bool
-Note_head::has_interface (Grob*m)
-{
-  return m&& m->has_interface (ly_symbol2scm ("note-head-interface"));
-}
 
 
 MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1);
@@ -196,7 +194,7 @@ SCM
 Note_head::brew_ez_molecule (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  int l = Rhythmic_head::balltype_i (me);
+  int l = Note_head::get_balltype (me);
 
   int b = (l >= 2);
 
@@ -205,10 +203,10 @@ Note_head::brew_ez_molecule (SCM smob)
   Pitch* pit =  unsmob_pitch (spitch);
 
   char s[2] = "a";
-  s[0] = (pit->notename_i_ + 2)%7 + 'a';
+  s[0] = (pit->notename_ + 2)%7 + 'a';
   s[0] = toupper (s[0]);
   
-  SCM charstr = ly_str02scm (s);
+  SCM charstr = scm_makfrom0str (s);
   
   SCM at = scm_list_n (ly_symbol2scm ("ez-ball"),
                       charstr,
@@ -218,7 +216,7 @@ Note_head::brew_ez_molecule (SCM smob)
   Box bx (Interval (0, 1.0), Interval (-0.5, 0.5));
   Molecule m (bx, at);
 
-  int pos = (int)rint (Staff_symbol_referencer::position_f (me));
+  int pos = (int)rint (Staff_symbol_referencer::get_position (me));
   int interspaces = Staff_symbol_referencer::line_count (me)-1;
   if (abs (pos) - interspaces > 1)
     {
@@ -241,7 +239,8 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
     return 0.0;
 
   SCM st = me->get_grob_property ("style");
-  SCM result = gh_apply (v, scm_list_n (st, SCM_UNDEFINED));
+  SCM log = gh_int2scm (get_balltype (me));
+  SCM result = gh_apply (v, scm_list_n (st, log, SCM_UNDEFINED));
 
   if (!gh_pair_p (result))
     return 0.0;
@@ -251,6 +250,14 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
   return gh_number_p (result) ?  gh_scm2double (result) : 0.0;
 }
 
+int
+Note_head::get_balltype (Grob*me) 
+{
+  SCM s = me->get_grob_property ("duration-log");
+  return gh_number_p (s) ? gh_scm2int (s) <? 2 : 0;
+}
+
 ADD_INTERFACE (Note_head,"note-head-interface",
   "Note head",
-  "accidentals-grob style stem-attachment-function");
+  "accidental-grob style stem-attachment-function");
+