X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=c711f8729ea42b5296223104dd1aa1c43f31b282;hb=17b9d0df3e7500a2dc328afc73aea21b7909d9ee;hp=9b53dc498ea13d68b30e0752affdff1b0eeedc55;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 9b53dc498e..c711f8729e 100644
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -3,99 +3,153 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "misc.hh"
-#include "dots.hh"
 #include "note-head.hh"
-#include "debug.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "molecule.hh"
-#include "musical-request.hh"
 
+#include <cmath>
+#include <cctype>
+#include <algorithm> 		//  min, max
 
-Note_head::Note_head ()
-{
-  x_dir_ = CENTER;
-  position_i_ = 0;
-  extremal_i_ = 0;
-}
+using namespace std;
+
+#include "directional-element-interface.hh"
+#include "font-interface.hh"
+#include "international.hh"
+#include "warn.hh"
+#include "grob.hh"
 
-void
-Note_head::do_pre_processing ()
+static Stencil
+internal_print (Grob *me, string *font_char)
 {
-  // 8 ball looks the same as 4 ball:
-  if (balltype_i_ > 2)
-    balltype_i_ = 2;
-  if (dots_l_)			// move into Rhythmic_head?
-    dots_l_->position_i_ = position_i_;
+  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));
+  if (style != ly_symbol2scm ("default"))
+    {
+      SCM gn = me->get_property ("glyph-name");
+      if (scm_is_string (gn))
+	suffix = ly_scm2string (gn);
+    }
+
+  Font_metric *fm = Font_interface::get_default_font (me);
+
+  string idx_symmetric;
+  string idx_directed;
+  string idx_either;
+  idx_symmetric = idx_either = "noteheads.s" + suffix;
+  Stencil out = fm->find_by_name (idx_symmetric);
+  if (out.is_empty ())
+    {
+      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_directed = idx_either =
+	prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
+      out = fm->find_by_name (idx_directed);
+    }
+
+
+  if (out.is_empty ())
+    {
+      me->warning (_f ("none of note heads `%s' or `%s' found",
+		       idx_symmetric.c_str (), idx_directed.c_str ()));
+      out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL);
+    }
+  else
+    *font_char = idx_either;
+
+  return out;
 }
 
-int
-Note_head::compare (Note_head *const  &a, Note_head * const &b)
+/*
+  TODO: make stem X-parent of notehead. 
+ */
+MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1);
+SCM
+Note_head::stem_x_shift (SCM smob)
 {
-  return a->position_i_ - b->position_i_;
+  Grob *me = unsmob_grob (smob);
+  Grob *stem = unsmob_grob (me->get_object ("stem"));
+  if (stem)
+    (void) stem->get_property ("positioning-done");
+
+  return scm_from_int (0);
 }
 
-Interval
-Note_head::do_width () const
+MAKE_SCHEME_CALLBACK (Note_head, print, 1);
+SCM
+Note_head::print (SCM smob)
 {
-  Molecule a =  lookup_l ()->ball (balltype_i_);
-  Interval i = a.dim_[X_AXIS];
-  i+= x_dir_ * i.length ();
-  return i;
+  Grob *me = unsmob_grob (smob);
+
+  string idx;
+  return internal_print (me, &idx).smobbed_copy ();
 }
 
-Molecule*
-Note_head::do_brew_molecule_p() const 
+Real
+Note_head::stem_attachment_coordinate (Grob *me, Axis a)
 {
-  Molecule*out = 0;
-  Paper_def *p = paper_l ();
-  Real inter_f = staff_line_leading_f ()/2;
-  int sz = lines_i ()-1;
-  // ugh
-  int streepjes_i = abs (position_i_) < sz 
-    ? 0
-    : (abs(position_i_) - sz) /2;
+  Offset off = robust_scm2offset (me->get_property ("stem-attachment"),
+				  Offset (0,0));
   
-  Molecule head; 
+  return off [a];
+}
 
-  if (note_head_type_str_.length_i ()) {
-    if (note_head_type_str_ == "normal") // UGH
-      note_head_type_str_ = "";
-    head = lookup_l()->special_ball (balltype_i_, note_head_type_str_);
-    }
-  else
-    head = lookup_l()->ball (balltype_i_);
+Offset
+Note_head::get_stem_attachment (Font_metric *fm, string key)
+{
+  Offset att;
   
-  out = new Molecule (Molecule (head));
-  out->translate_axis (x_dir_ * head.dim_[X_AXIS].length (), X_AXIS);
-
-
-
-  if (streepjes_i) 
+  int k = fm->name_to_index (key);
+  if (k >= 0)
     {
-      Direction dir = sign (position_i_);
-      Interval hd = head.dim_[X_AXIS];
-      Real hw = hd.length ()/4;
-      
-      Molecule ledger
-	= lookup_l ()->ledger_line  (Interval (hd[LEFT] - hw,
-					       hd[RIGHT] + hw));
-      
-      int parity =  abs(position_i_) % 2;
-      
-      for (int i=0; i < streepjes_i; i++)
+      Box b = fm->get_indexed_char (k);
+      Offset wxwy = fm->attachment_point (key);
+      for (int i = X_AXIS ; i < NO_AXES; i++)
 	{
-	  Molecule s (ledger);
-	  s.translate_axis (-dir * inter_f * (i*2 + parity),
-			   Y_AXIS);
-	  out->add_molecule (s);
+	  Axis a = Axis (i);
+	  
+	  Interval v = b[a];
+	  if (!v.is_empty ())
+	    {
+	      att[a] = (2 * (wxwy[a] - v.center ()) / v.length ());
+	    }
 	}
     }
-  
-  out->translate_axis (inter_f*position_i_, Y_AXIS);
-  return out;
+
+  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));
+}
+
+
+ADD_INTERFACE (Note_head,
+	       "Note head",
+
+	       /* properties */
+	       "note-names "
+	       "accidental-grob "
+	       "glyph-name "
+	       "stem-attachment "
+	       "style "
+	       );
+