X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=63bc9c342c3ab530f91018025c31155418c395d1;hb=57be7394ffa2e7d7ba6d60548dba563f3409d472;hp=8e8da2d500aadcb6015c8949d29da00d6ca84bb1;hpb=f93a69795ef171d9a486c46d6d2a0480aee4e438;p=lilypond.git

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 8e8da2d500..63bc9c342c 100644
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -3,12 +3,12 @@
 
   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 <cmath>
+#include <math.h>
 #include <cctype>
 
 #include "directional-element-interface.hh"
@@ -27,9 +27,9 @@
   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 ();
@@ -39,31 +39,29 @@ internal_print (Grob *me, String * font_char)
   SCM proc = me->get_property ("glyph-name-procedure");
   SCM scm_font_char = scm_call_2 (proc, log, style);
 
-  Font_metric * fm = Font_interface::get_default_font (me);
+  Font_metric *fm = Font_interface::get_default_font (me);
 
   Direction stem_dir = CENTER;
   if (Grob *stem = unsmob_grob (me->get_property ("stem")))
     {
       stem_dir = get_grob_direction (stem);
       if (stem_dir == CENTER)
-	{
-	  programming_error ("Must have stem dir for note head");
-	}
+	programming_error ("must have stem dir for note head");
     }
-  
+
   Stencil out;
 
-  String prefix = "noteheads-";
-  String idx =
-    prefix + ((stem_dir == UP) ? "u" : "d")  + ly_scm2string (scm_font_char);
+  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())
+
+  if (out.is_empty ())
     {
       me->warning (_f ("note head `%s' not found", idx.to_str0 ()));
     }
@@ -75,10 +73,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,8 +83,7 @@ Note_head::print (SCM smob)
   return internal_print (me, &idx).smobbed_copy ();
 }
 
-
-MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1);
+MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1);
 SCM
 Note_head::brew_ez_stencil (SCM smob)
 {
@@ -98,12 +94,12 @@ Note_head::brew_ez_stencil (SCM smob)
 
   SCM cause = me->get_property ("cause");
   SCM spitch = unsmob_music (cause)->get_property ("pitch");
-  Pitch* pit =  unsmob_pitch (spitch);
+  Pitch *pit = unsmob_pitch (spitch);
 
   SCM idx = scm_int2num (pit->get_notename ());
   SCM names = me->get_property ("note-names");
   SCM charstr = SCM_EOL;
-  if (ly_c_vector_p (names))
+  if (scm_is_vector (names))
     charstr = scm_vector_ref (names, idx);
   else
     {
@@ -116,7 +112,7 @@ Note_head::brew_ez_stencil (SCM smob)
   SCM at = scm_list_n (ly_symbol2scm ("ez-ball"),
 		       charstr,
 		       scm_int2num (b),
-		       scm_int2num (1-b),
+		       scm_int2num (1 - b),
 		       SCM_UNDEFINED);
   Box bx (Interval (0, 1.0), Interval (-0.5, 0.5));
   Stencil m (bx, at);
@@ -124,53 +120,52 @@ Note_head::brew_ez_stencil (SCM smob)
   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);
-	  Offset wxwy = fm->get_indexed_wxwy (k);
+	  Offset wxwy = fm->attachment_point (key);
 	  Interval v = b[a];
 	  if (!v.is_empty ())
 	    return 2 * (wxwy[a] - v.center ()) / v.length ();
 	}
     }
-  
+
   /*
     Fallback
-   */
+  */
   SCM v = me->get_property ("stem-attachment-function");
   if (!ly_c_procedure_p (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;
 }
 
-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");