(internal_print): only call

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

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 9f2dff2c80782b72bcbd1fb0927e961b7751c8ec..b2e451e54c977619553a43198e10fb79cb8e21ca 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -3,13 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-head.hh"
 
 #include <math.h>
 #include <cctype>
+#include <algorithm>           //  min, max
+
+using namespace std; 
 
 #include "directional-element-interface.hh"
 #include "staff-symbol.hh"
@@ -17,7 +20,7 @@
 #include "dots.hh"
 #include "warn.hh"
 #include "font-interface.hh"
-#include "event.hh"
+#include "music.hh"
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "lookup.hh"
@@ -27,43 +30,40 @@
   clean up the mess left by ledger line handling.
 */
 static Stencil
-internal_print (Grob *me, String * font_char)
+internal_print (Grob *me, String *font_char)
 {
-  SCM style  = me->get_property ("style");
+  SCM style = me->get_property ("style");
   if (!scm_is_symbol (style))
     {
-      return Stencil ();
+      style = ly_symbol2scm ("default");
     }
 
   SCM log = scm_int2num (Note_head::get_balltype (me));
-  SCM proc = me->get_property ("glyph-name-procedure");
-  SCM scm_font_char = scm_call_2 (proc, log, style);
+  String suffix =  to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2));
+  if (style != ly_symbol2scm ("default"))
+    {
+      SCM proc = me->get_property ("glyph-name-procedure");
+      if (ly_is_procedure (proc))
+       suffix = ly_scm2string (scm_call_2 (proc, log, style));
+    }  
+  Font_metric *fm = Font_interface::get_default_font (me);
 
-  Font_metric * fm = Font_interface::get_default_font (me);
+  String idx = "noteheads.s" + suffix;
 
-  Direction stem_dir = CENTER;
-  if (Grob *stem = unsmob_grob (me->get_property ("stem")))
+  Stencil out = fm->find_by_name (idx);
+  if (out.is_empty ())
     {
-      stem_dir = get_grob_direction (stem);
+      String prefix = "noteheads.";
+      Grob *stem = unsmob_grob (me->get_object ("stem"));
+      Direction stem_dir = stem ? get_grob_direction (stem) : CENTER;
+      
       if (stem_dir == CENTER)
-       {
-         programming_error ("Must have stem dir for note head");
-       }
+       programming_error ("must have stem dir for note head");
+      String idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
+      out = fm->find_by_name (idx);
     }
-  
-  Stencil out;
 
-  String prefix = "noteheads.";
-  String idx =
-    prefix + ((stem_dir == UP) ? "u" : "d")  + ly_scm2string (scm_font_char);
-  out = fm->find_by_name (idx);
   if (out.is_empty ())
-    {
-      idx = prefix + "s" + ly_scm2string (scm_font_char);
-      out = fm->find_by_name (idx);
-    }
-  
-  if (out.is_empty())
     {
       me->warning (_f ("note head `%s' not found", idx.to_str0 ()));
     }
@@ -75,10 +75,9 @@ internal_print (Grob *me, String * font_char)
   return out;
 }
 
-
-MAKE_SCHEME_CALLBACK (Note_head,print,1);
+MAKE_SCHEME_CALLBACK (Note_head, print, 1);
 SCM
-Note_head::print (SCM smob)  
+Note_head::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
@@ -86,57 +85,18 @@ Note_head::print (SCM smob)
   return internal_print (me, &idx).smobbed_copy ();
 }
 
-
-MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1);
-SCM
-Note_head::brew_ez_stencil (SCM smob)
-{
-  Grob *me = unsmob_grob (smob);
-  int l = Note_head::get_balltype (me);
-
-  int b = (l >= 2);
-
-  SCM cause = me->get_property ("cause");
-  SCM spitch = unsmob_music (cause)->get_property ("pitch");
-  Pitch* pit =  unsmob_pitch (spitch);
-
-  SCM idx = scm_int2num (pit->get_notename ());
-  SCM names = me->get_property ("note-names");
-  SCM charstr = SCM_EOL;
-  if (scm_is_vector (names))
-    charstr = scm_vector_ref (names, idx);
-  else 
-    {
-      char s[2] = "a";
-      s[0] = (pit->get_notename () + 2)%7 + 'a';
-      s[0] = toupper (s[0]);
-      charstr = scm_makfrom0str (s);
-    }
-  
-  SCM at = scm_list_n (ly_symbol2scm ("ez-ball"),
-                      charstr,
-                      scm_int2num (b),
-                      scm_int2num (1-b),
-                      SCM_UNDEFINED);
-  Box bx (Interval (0, 1.0), Interval (-0.5, 0.5));
-  Stencil m (bx, at);
-
-  return m.smobbed_copy ();
-}
-
-
 Real
 Note_head::stem_attachment_coordinate (Grob *me, Axis a)
 {
   SCM brewer = me->get_property ("print-function");
-  Font_metric * fm  = Font_interface::get_default_font (me);
-  
+  Font_metric *fm = Font_interface::get_default_font (me);
+
   if (brewer == Note_head::print_proc)
     {
       String key;
       internal_print (me, &key);
 
-      int k = fm->name_to_index (key) ;
+      int k = fm->name_to_index (key);
       if (k >= 0)
        {
          Box b = fm->get_indexed_char (k);
@@ -146,31 +106,31 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
            return 2 * (wxwy[a] - v.center ()) / v.length ();
        }
     }
-  
+
   /*
     Fallback
-   */
+  */
   SCM v = me->get_property ("stem-attachment-function");
-  if (!ly_c_procedure_p (v))
+  if (!ly_is_procedure (v))
     return 0.0;
-  
+
   SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a));
   if (!scm_is_pair (result))
     return 0.0;
 
   result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result);
-  
-  return robust_scm2double (result,0);
+
+  return robust_scm2double (result, 0);
 }
 
 int
-Note_head::get_balltype (Grob*me) 
+Note_head::get_balltype (Grob *me)
 {
   SCM s = me->get_property ("duration-log");
-  return scm_is_number (s) ? scm_to_int (s) <? 2 : 0;
+  return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
 }
 
-ADD_INTERFACE (Note_head,"note-head-interface",
-  "Note head",
-  "note-names glyph-name-procedure accidental-grob style stem-attachment-function");
+ADD_INTERFACE (Note_head, "note-head-interface",
+              "Note head",
+              "note-names glyph-name-procedure accidental-grob style stem-attachment-function");