X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fself-alignment-interface.cc;h=bdb2854fd45daf711679571b85d69f5b606324b0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=27800679701299f0ec4f33eef5eee748a44ca3c9;hpb=5bbfc22fce036b9b69df5e420de93e11da23c05e;p=lilypond.git

diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc
index 2780067970..bdb2854fd4 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
@@ -49,10 +49,9 @@ Self_alignment_interface::pure_y_aligned_on_self (SCM smob, SCM start, SCM end)
 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));
@@ -115,37 +114,45 @@ 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")))
+      if (to_boolean (me->get_property ("X-align-on-main-noteheads"))
           && Note_column::has_interface (him))
-        he = Note_column::calc_main_heads_extent(him);
+        he = Note_column::calc_main_extent(him);
       else
         he = him->extent (him, a);
     }
 
-  SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
-            : ly_symbol2scm ("self-alignment-Y");
-  SCM align_prop (me->internal_get_property (sym));
+  SCM self_align = (a == X_AXIS)
+          ? me->get_property ("self-alignment-X")
+          : me->get_property ("self-alignment-Y");
 
-  if (!scm_is_number (align_prop))
-    return scm_from_int (0);
+  SCM par_align = (a == X_AXIS)
+          ? me->get_property ("parent-alignment-X")
+          : me->get_property ("parent-alignment-Y");
 
-  Real x = 0.0;
-  Real align = scm_to_double (align_prop);
+  if (par_align == SCM_EOL)
+      par_align = self_align;
 
+  Real x = 0.0;
   Interval ext (me->extent (me, a));
 
-  // Empty extent doesn't mean an error - we simply don't align such grobs.
-  // However, empty extent and non-empty stencil would be suspicious.
-  if (!ext.is_empty ())
-    x -= ext.linear_combination (align);
-  else if (me->get_stencil ())
-    warning (me->name () + " has empty extent and non-empty stencil.");
+  if (scm_is_number (self_align))
+    {
+      // Empty extent doesn't mean an error - we simply don't align such grobs.
+      // However, empty extent and non-empty stencil would be suspicious.
+      if (!ext.is_empty ())
+        x -= ext.linear_combination (scm_to_double (self_align));
+      else if (me->get_stencil ())
+        warning (me->name () + " has empty extent and non-empty stencil.");
+    }
 
-  // See comment above.
-  if (!he.is_empty ())
-    x += he.linear_combination (align);
-  else if (him->get_stencil ())
-    warning (him->name () + " has empty extent and non-empty stencil.");
+  if (scm_is_number (par_align))
+    {
+      // See comment above.
+      if (!he.is_empty ())
+        x += he.linear_combination (scm_to_double (par_align));
+      else if (him->get_stencil ())
+        warning (him->name () + " has empty extent and non-empty stencil.");
+    }
 
   return scm_from_double (x);
 }
@@ -173,6 +180,8 @@ ADD_INTERFACE (Self_alignment_interface,
                "@end table\n",
 
                /* properties */
+               "parent-alignment-X "
+               "parent-alignment-Y "
                "self-alignment-X "
                "self-alignment-Y "
                "X-align-on-main-noteheads "