X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=4343c2dc5a9bf75e473b4d31c7b8a454b3910f2e;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=dc3c873878f095709d4c7187bf37f30bcbbf0849;hpb=99b6f3aa3558b01c9d4158b19a1f1794c534f89c;p=lilypond.git

diff --git a/lily/accidental.cc b/lily/accidental.cc
index dc3c873878..4343c2dc5a 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2001--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2001--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include "paper-column.hh"
 #include "pitch.hh"
 #include "stencil.hh"
+#include "system.hh"
 #include "skyline-pair.hh"
 
 Stencil
@@ -43,51 +44,20 @@ 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 ());
-}
-
-MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1);
-SCM
-Accidental_interface::height (SCM 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, horizontal_skylines, 1);
 SCM
 Accidental_interface::horizontal_skylines (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   if (!me->is_live ())
     return Skyline_pair ().smobbed_copy ();
 
-  /*
-   * Using the print function may trigger a suicide
-   * before line breaking. It is therefore `unpure' (c).
-   * We use the more basic get_stencil.
-   */
-  Stencil *my_stencil = unsmob_stencil (get_stencil (me));
+  Stencil *my_stencil = unsmob<Stencil> (me->get_property ("stencil"));
   if (!my_stencil)
     return Skyline_pair ().smobbed_copy ();
 
   Skyline_pair *sky =
-    Skyline_pair::unsmob
+    unsmob<Skyline_pair>
       (Stencil::skylines_from_stencil
         (my_stencil->smobbed_copy (), 0.0, Y_AXIS));
 
@@ -116,41 +86,42 @@ Accidental_interface::horizontal_skylines (SCM smob)
   return sky->smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Accidental_interface, pure_height, 3);
+MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1);
 SCM
-Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM)
+Accidental_interface::height (SCM smob)
 {
-  Item *me = dynamic_cast<Item *> (unsmob_grob (smob));
-  int start = scm_to_int (start_scm);
-  int rank = me->get_column ()->get_rank ();
-
-  if (to_boolean (me->get_property ("forced"))
-      || !unsmob_grob (me->get_object ("tie"))
-      || (rank == start + 1 && /* we are at the start of a line */
-          !to_boolean (me->get_property ("hide-tied-accidental-after-break"))))
-    {
-      Stencil *s = unsmob_stencil (get_stencil (me));
-      if (s)
-        return ly_interval2scm (s->extent (Y_AXIS));
-    }
+  Grob *me = unsmob<Grob> (smob);
+  Grob *tie = unsmob<Grob> (me->get_object ("tie"));
+
+  if (tie
+      && !to_boolean (me->get_property ("forced"))
+      && to_boolean (me->get_property ("hide-tied-accidental-after-break")))
+    return ly_interval2scm (Interval ());
 
-  return ly_interval2scm (Interval ());
+  return Grob::stencil_height (smob);
 }
 
-MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1);
+MAKE_SCHEME_CALLBACK (Accidental_interface, remove_tied, 1);
 SCM
-Accidental_interface::print (SCM smob)
+Accidental_interface::remove_tied (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
-  Grob *tie = unsmob_grob (me->get_object ("tie"));
+  Grob *me = unsmob<Grob> (smob);
+  Grob *tie = unsmob<Grob> (me->get_object ("tie"));
 
   if (tie
+      && !to_boolean (me->get_property ("forced"))
       && (to_boolean (me->get_property ("hide-tied-accidental-after-break"))
-          || (!tie->original () && !to_boolean (me->get_property ("forced")))))
-    {
-      me->suicide ();
-      return SCM_EOL;
-    }
+          || !tie->original()))
+    me->suicide ();
+
+  return SCM_UNSPECIFIED;
+}
+
+MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1);
+SCM
+Accidental_interface::print (SCM smob)
+{
+  Grob *me = unsmob<Grob> (smob);
 
   return get_stencil (me);
 }