X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=1c2418500d750319a1ca67a76f21503c867f7bd5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=571c33cbea497e5c8db3cf9eaa305c5b154dc952;hpb=d2300573cae3c1920400d040faddd33f17b43c2d;p=lilypond.git

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 571c33cbea..1c2418500d 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "accidental-interface.hh"
@@ -31,14 +31,30 @@ parenthesize (Grob *me, Stencil m)
   return m;
 }
 
+/* If this gets called before line breaking, we will return a non-trivial
+   extent even if we belong to a tie and won't actually get printed. */
+static SCM
+get_extent (Grob *me, Axis a)
+{
+  Stencil *s = unsmob_stencil (Accidental_interface::get_stencil (me));
+
+  if (s)
+    return ly_interval2scm (s->extent (a));
+  return ly_interval2scm (Interval ());
+}
 
-/* This callback exists for the sole purpose of allowing us to override
-   its pure equivalent to accidental-interface::pure-height */
 MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1);
 SCM
 Accidental_interface::height (SCM smob)
 {
-  return Grob::stencil_height (smob);
+  return get_extent (unsmob_grob (smob), Y_AXIS);
+}
+
+MAKE_SCHEME_CALLBACK (Accidental_interface, width, 1);
+SCM
+Accidental_interface::width (SCM smob)
+{
+  return get_extent (unsmob_grob (smob), X_AXIS);
 }
 
 MAKE_SCHEME_CALLBACK (Accidental_interface, pure_height, 3);
@@ -49,11 +65,16 @@ Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM)
   int start = scm_to_int (start_scm);
   int rank = me->get_column ()->get_rank ();
 
-  bool visible = to_boolean (me->get_property ("forced"))
-    || !unsmob_grob (me->get_object ("tie"))
-    || rank != start + 1; /* we are in the middle of a line */
+  if (to_boolean (me->get_property ("forced"))
+      || !unsmob_grob (me->get_object ("tie"))
+      || rank == start + 1) /* we are at the start of a line */
+    {
+      Stencil *s = unsmob_stencil (get_stencil (me));
+      if (s)
+	return ly_interval2scm (s->extent (Y_AXIS));
+    }
 
-  return visible ? Grob::stencil_height (smob) : ly_interval2scm (Interval ());
+  return ly_interval2scm (Interval ());
 }
 
 vector<Box>
@@ -72,9 +93,13 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common)
   if (!to_boolean (me->get_property ("restore-first"))
       && !parens)
     {
-      Rational alteration
-	= robust_scm2rational (me->get_property ("alteration"), 0);
-      if (alteration == FLAT_ALTERATION)
+      SCM alist = me->get_property ("glyph-name-alist");
+      SCM alt = me->get_property ("alteration");
+      string glyph_name = robust_scm2string (ly_assoc_get (alt, alist, SCM_BOOL_F),
+					     "");
+      
+      if (glyph_name == "accidentals.flat"
+	  || glyph_name == "accidentals.mirroredflat")
 	{
 	  Box stem = b;
 	  Box bulb = b;
@@ -83,7 +108,9 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common)
 	    we could make the stem thinner, but that places the flats
 	    really close.
 	  */
-	  stem[X_AXIS][RIGHT] *= .5;
+	  Direction bulb_dir =
+	    glyph_name == "accidentals.mirroredflat" ? LEFT : RIGHT;
+	  stem[X_AXIS][bulb_dir] = stem[X_AXIS].center ();
 
 	  /*
 	    To prevent vertical alignment for 6ths
@@ -94,7 +121,7 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common)
 	  boxes.push_back (bulb);
 	  boxes.push_back (stem);
 	}
-      else if (alteration == NATURAL_ALTERATION)
+      else if (glyph_name ==  "accidentals.natural")
 	{
 	  Box lstem = b;
 	  Box rstem = b;
@@ -142,7 +169,13 @@ Accidental_interface::print (SCM smob)
       me->suicide ();
       return SCM_EOL;
     }
-  
+
+  return get_stencil (me);
+}
+
+SCM
+Accidental_interface::get_stencil (Grob *me)
+{
   Font_metric *fm = Font_interface::get_default_font (me);
 
   SCM alist = me->get_property ("glyph-name-alist");
@@ -156,7 +189,7 @@ Accidental_interface::print (SCM smob)
       return SCM_EOL;
     }
   
-  Stencil mol (fm->find_by_name (scm_i_string_chars (glyph_name)));
+  Stencil mol (fm->find_by_name (ly_scm2string (glyph_name)));
   if (to_boolean (me->get_property ("restore-first")))
     {
       /*
@@ -179,9 +212,9 @@ Accidental_interface::print (SCM smob)
 
   
 ADD_INTERFACE (Accidental_interface,
-	       "a single accidental",
+	       "A single accidental.",
 	       
-	       /* props */
+	       /* properties */
 	       "alteration "
 	       "avoid-slur "
 	       "forced "