X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fself-alignment-interface.cc;h=512f970e0e05fa500735eb9e93ec12039f58d5e1;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=9c73b6c7d8cf8cd6bf458b9648964150a28378b4;hpb=d935a5a0fac63dc0dcd8197d4d2286d235fe617c;p=lilypond.git

diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc
index 9c73b6c7d8..512f970e0e 100644
--- a/lily/self-alignment-interface.cc
+++ b/lily/self-alignment-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--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
@@ -29,30 +29,29 @@ MAKE_SCHEME_CALLBACK (Self_alignment_interface, y_aligned_on_self, 1);
 SCM
 Self_alignment_interface::y_aligned_on_self (SCM element)
 {
-  return aligned_on_self (Grob::unsmob (element), Y_AXIS, false, 0, 0);
+  return aligned_on_self (unsmob<Grob> (element), Y_AXIS, false, 0, 0);
 }
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_aligned_on_self, 1);
 SCM
 Self_alignment_interface::x_aligned_on_self (SCM element)
 {
-  return aligned_on_self (Grob::unsmob (element), X_AXIS, false, 0, 0);
+  return aligned_on_self (unsmob<Grob> (element), X_AXIS, false, 0, 0);
 }
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, pure_y_aligned_on_self, 3);
 SCM
 Self_alignment_interface::pure_y_aligned_on_self (SCM smob, SCM start, SCM end)
 {
-  return aligned_on_self (Grob::unsmob (smob), Y_AXIS, true, robust_scm2int (start, 0), robust_scm2int (end, INT_MAX));
+  return aligned_on_self (unsmob<Grob> (smob), Y_AXIS, true, robust_scm2int (start, 0), robust_scm2int (end, INT_MAX));
 }
 
 SCM
 Self_alignment_interface::aligned_on_self (Grob *me, Axis a, bool pure, int start, int end)
 {
-  SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
-            : ly_symbol2scm ("self-alignment-Y");
-
-  SCM align (me->internal_get_property (sym));
+  SCM align = (a == X_AXIS)
+          ? me->get_property ("self-alignment-X")
+          : me->get_property ("self-alignment-Y");
   if (scm_is_number (align))
     {
       Interval ext (me->maybe_pure_extent (me, a, pure, start, end));
@@ -76,28 +75,28 @@ MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_x_parent, 1);
 SCM
 Self_alignment_interface::centered_on_x_parent (SCM smob)
 {
-  return centered_on_object (Grob::unsmob (smob)->get_parent (X_AXIS), X_AXIS);
+  return centered_on_object (unsmob<Grob> (smob)->get_parent (X_AXIS), X_AXIS);
 }
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_y_parent, 1);
 SCM
 Self_alignment_interface::centered_on_y_parent (SCM smob)
 {
-  return centered_on_object (Grob::unsmob (smob)->get_parent (Y_AXIS), Y_AXIS);
+  return centered_on_object (unsmob<Grob> (smob)->get_parent (Y_AXIS), Y_AXIS);
 }
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_x_parent, 1);
 SCM
 Self_alignment_interface::aligned_on_x_parent (SCM smob)
 {
-  return aligned_on_parent (Grob::unsmob (smob), X_AXIS);
+  return aligned_on_parent (unsmob<Grob> (smob), X_AXIS);
 }
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_y_parent, 1);
 SCM
 Self_alignment_interface::aligned_on_y_parent (SCM smob)
 {
-  return aligned_on_parent (Grob::unsmob (smob), Y_AXIS);
+  return aligned_on_parent (unsmob<Grob> (smob), Y_AXIS);
 }
 
 SCM
@@ -105,7 +104,7 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
 {
   Grob *him = me->get_parent (a);
   Interval he;
-  if (Paper_column::has_interface (him))
+  if (has_interface<Paper_column> (him))
       /*
         PaperColumn extents aren't reliable (they depend on size and alignment
         of PaperColumn's children), so we align on NoteColumn instead.
@@ -115,22 +114,22 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
               (him, ly_symbol2scm ("note-column-interface"), a);
   else
     {
-      if (ly_scm2bool(me->internal_get_property (ly_symbol2scm ("X-align-on-main-noteheads")))
-          && Note_column::has_interface (him))
-        he = Note_column::calc_main_heads_extent(him);
+      if (to_boolean (me->get_property ("X-align-on-main-noteheads"))
+          && has_interface<Note_column> (him))
+        he = Note_column::calc_main_extent(him);
       else
         he = him->extent (him, a);
     }
 
   SCM self_align = (a == X_AXIS)
-          ? me->internal_get_property (ly_symbol2scm ("self-alignment-X"))
-          : me->internal_get_property (ly_symbol2scm ("self-alignment-Y"));
+          ? me->get_property ("self-alignment-X")
+          : me->get_property ("self-alignment-Y");
 
   SCM par_align = (a == X_AXIS)
-          ? me->internal_get_property (ly_symbol2scm ("parent-alignment-X"))
-          : me->internal_get_property (ly_symbol2scm ("parent-alignment-Y"));
+          ? me->get_property ("parent-alignment-X")
+          : me->get_property ("parent-alignment-Y");
 
-  if (par_align == SCM_EOL)
+  if (scm_is_null (par_align))
       par_align = self_align;
 
   Real x = 0.0;