Web-ja: update introduction

[lilypond.git] / lily / self-alignment-interface.cc

diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc
index bdb2854fd45daf711679571b85d69f5b606324b0..512f970e0e05fa500735eb9e93ec12039f58d5e1 100644 (file)
--- a/lily/self-alignment-interface.cc
+++ b/lily/self-alignment-interface.cc
@@ -29,21 +29,21 @@ 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
@@ -75,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
@@ -104,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,7 +115,7 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
   else
     {
       if (to_boolean (me->get_property ("X-align-on-main-noteheads"))
-          && Note_column::has_interface (him))
+          && has_interface<Note_column> (him))
         he = Note_column::calc_main_extent(him);
       else
         he = him->extent (him, a);
@@ -129,7 +129,7 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
           ? 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;