Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 3b80b114ba0abb21a1e4944429138a15caa8b1af..5f86f6e401d7ee869fcab4062d4e02051aeda8a7 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
@@ -14,28 +14,26 @@
 using namespace std;
 
 #include "directional-element-interface.hh"
-#include "staff-symbol.hh"
-#include "misc.hh"
 #include "dots.hh"
-#include "warn.hh"
 #include "font-interface.hh"
+#include "international.hh"
+#include "lookup.hh"
+#include "misc.hh"
 #include "music.hh"
+#include "output-def.hh"
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
-#include "lookup.hh"
-#include "output-def.hh"
+#include "staff-symbol.hh"
+#include "warn.hh"
 
-/*
-  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");
   if (!scm_is_symbol (style))
     style = ly_symbol2scm ("default");
 
-  String suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2));
+  string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2));
   if (style != ly_symbol2scm ("default"))
     {
       SCM gn = me->get_property ("glyph-name");
@@ -45,25 +43,26 @@ internal_print (Grob *me, String *font_char)
 
   Font_metric *fm = Font_interface::get_default_font (me);
 
-  String idx = "noteheads.s" + suffix;
-
+  string idx = "noteheads.s" + suffix;
   Stencil out = fm->find_by_name (idx);
   if (out.is_empty ())
     {
-      String prefix = "noteheads.";
+      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");
-
+      
       idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
       out = fm->find_by_name (idx);
     }
 
+
   if (out.is_empty ())
     {
-      me->warning (_f ("note head `%s' not found", idx.to_str0 ()));
+      me->warning (_f ("note head `%s' not found", idx.c_str ()));
       out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL);
     }
   else
@@ -75,12 +74,10 @@ internal_print (Grob *me, String *font_char)
 /*
   TODO: make stem X-parent of notehead. 
  */
-MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 2);
+MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1);
 SCM
-Note_head::stem_x_shift (SCM smob, SCM axis)
+Note_head::stem_x_shift (SCM smob)
 {
-  (void) axis;
-  
   Grob *me = unsmob_grob (smob);
   Grob *stem = unsmob_grob (me->get_object ("stem"));
   if (stem)
@@ -95,7 +92,7 @@ Note_head::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  String idx;
+  string idx;
   return internal_print (me, &idx).smobbed_copy ();
 }
 
@@ -108,15 +105,9 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
   return off [a];
 }
 
-MAKE_SCHEME_CALLBACK(Note_head, calc_stem_attachment, 1);
-SCM
-Note_head::calc_stem_attachment (SCM smob)
+Offset
+Note_head::get_stem_attachment (Font_metric *fm, string key)
 {
-  Grob *me  = unsmob_grob (smob);
-  Font_metric *fm = Font_interface::get_default_font (me);
-  String key;
-  internal_print (me, &key);
-
   Offset att;
   
   int k = fm->name_to_index (key);
@@ -136,15 +127,26 @@ Note_head::calc_stem_attachment (SCM smob)
        }
     }
 
-  return ly_offset2scm (att);
+  return att;
 }
 
+MAKE_SCHEME_CALLBACK(Note_head, calc_stem_attachment, 1);
+SCM
+Note_head::calc_stem_attachment (SCM smob)
+{
+  Grob *me  = unsmob_grob (smob);
+  Font_metric *fm = Font_interface::get_default_font (me);
+  string key;
+  internal_print (me, &key);
+
+  return ly_offset2scm (get_stem_attachment (fm, key));
+}
 
 int
 Note_head::get_balltype (Grob *me)
 {
   SCM s = me->get_property ("duration-log");
-  return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
+  return scm_is_number (s) ? min (int (scm_to_int (s)), 2) : 0;
 }
 
 ADD_INTERFACE (Note_head, "note-head-interface",