X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=7ac3140141065c5a4b7fe359d8725d21a0cce230;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=9b4a3831b0199b46d98ed4e0436175b88d38fd10;hpb=bf562afb0241f46a8e899d73adeb39b5dfdcbda8;p=lilypond.git

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 9b4a3831b0..7ac3140141 100644
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -17,8 +17,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "dot-column.hh"
-
 #include <cstdio>
 #include <cmath>
 #include <map>
@@ -45,13 +43,13 @@ MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1);
 SCM
 Dot_column::calc_positioning_done (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   /*
     Trigger note collision resolution first, since that may kill off
     dots when merging.
   */
-  if (Grob *collision = unsmob_grob (me->get_object ("note-collision")))
+  if (Grob *collision = unsmob<Grob> (me->get_object ("note-collision")))
     (void) collision->get_property ("positioning-done");
 
   me->set_property ("positioning-done", SCM_BOOL_T);
@@ -68,7 +66,7 @@ Dot_column::calc_positioning_done (SCM smob)
       Grob *n = dots[i]->get_parent (Y_AXIS);
       commonx = n->common_refpoint (commonx, X_AXIS);
 
-      if (Grob *stem = unsmob_grob (n->get_object ("stem")))
+      if (Grob *stem = unsmob<Grob> (n->get_object ("stem")))
         {
           commonx = stem->common_refpoint (commonx, X_AXIS);
 
@@ -97,12 +95,12 @@ Dot_column::calc_positioning_done (SCM smob)
          Rest collisions should wait after line breaking.
       */
       Interval y;
-      if (Rest::has_interface (s))
+      if (has_interface<Rest> (s))
         {
           base_x.unite (s->extent (commonx, X_AXIS));
           continue;
         }
-      else if (Stem::has_interface (s))
+      else if (has_interface<Stem> (s))
         {
           Real y1 = Stem::head_positions (s)[-get_grob_direction (s)];
           Real y2 = y1 + get_grob_direction (s) * 7;
@@ -112,7 +110,7 @@ Dot_column::calc_positioning_done (SCM smob)
 
           stems.insert (s);
         }
-      else if (Note_head::has_interface (s))
+      else if (has_interface<Note_head> (s))
         y = Interval (-1.1, 1.1);
       else
         {
@@ -125,7 +123,7 @@ Dot_column::calc_positioning_done (SCM smob)
       Box b (s->extent (commonx, X_AXIS), y);
       boxes.push_back (b);
 
-      if (Grob *stem = unsmob_grob (s->get_object ("stem")))
+      if (Grob *stem = unsmob<Grob> (s->get_object ("stem")))
         stems.insert (stem);
     }
 
@@ -159,7 +157,7 @@ Dot_column::calc_positioning_done (SCM smob)
       // Sort dots by stem, then check for dots above the limit for each stem
       vector <vector <Grob *> > dots_each_stem (parent_stems.size ());
       for (vsize i = 0; i < dots.size (); i++)
-        if (Grob *stem = unsmob_grob (dots[i]->get_parent (Y_AXIS)
+        if (Grob *stem = unsmob<Grob> (dots[i]->get_parent (Y_AXIS)
                                       -> get_object ("stem")))
           for (vsize j = 0; j < parent_stems.size (); j++)
             if (stem == parent_stems[j])
@@ -202,7 +200,7 @@ Dot_column::calc_positioning_done (SCM smob)
       Grob *note = dots[i]->get_parent (Y_AXIS);
       if (note)
         {
-          if (Note_head::has_interface (note))
+          if (has_interface<Note_head> (note))
             dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
 
           dp.x_extent_ = note->extent (commonx, X_AXIS);
@@ -217,8 +215,9 @@ Dot_column::calc_positioning_done (SCM smob)
 
       cfg.remove_collision (p);
       cfg[p] = dp;
-      if (Staff_symbol_referencer::on_line (dp.dot_, p) &&
-          dp.dot_->get_property ("style") != ly_symbol2scm ("kievan"))
+      if (Staff_symbol_referencer::on_line (dp.dot_, p)
+          && !scm_is_eq (dp.dot_->get_property ("style"),
+                         ly_symbol2scm ("kievan")))
         cfg.remove_collision (p);
     }
 
@@ -241,7 +240,7 @@ Dot_column::calc_positioning_done (SCM smob)
 void
 Dot_column::add_head (Grob *me, Grob *head)
 {
-  Grob *d = unsmob_grob (head->get_object ("dot"));
+  Grob *d = unsmob<Grob> (head->get_object ("dot"));
   if (d)
     {
       Side_position_interface::add_support (me, head);
@@ -253,7 +252,7 @@ Dot_column::add_head (Grob *me, Grob *head)
       // correct X-offset of the dots for horizontal collision avoidance.
       // The translation here is undone in calc_positioning_done, where we
       // do the X-offset properly.
-      if (Rest::has_interface (head))
+      if (has_interface<Rest> (head))
         d->translate_axis (head->extent (head, X_AXIS).length (), X_AXIS);
       else
         d->set_property ("X-offset", Grob::x_parent_positioning_proc);