Issue 5148/2: three-sided-box snippet: use #:properties keyword

[lilypond.git] / lily / spaceable-grob.cc

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 8aa3209f28e3c269ee3a3cf17c3431208b6308e5..c6ed9120396c3e9550edc8b4088f7bc081606aa3 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -1,77 +1,113 @@
-/*   
-  spaceable-grob.cc --  implement Spaceable_grob
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "spaceable-grob.hh"
-#include "grob.hh"
+
+#include <cstdio>
+
 #include "warn.hh"
+#include "spring.hh"
+#include "pointer-group-interface.hh"
+#include "grob.hh"
+#include "paper-column.hh"
+#include "international.hh"
 
 SCM
-Spaceable_grob::get_minimum_distances (Grob*me)
+Spaceable_grob::get_minimum_distances (Grob *me)
 {
-  return me->get_grob_property ("minimum-distances");
+  return me->get_object ("minimum-distances");
 }
 
 /*todo: merge code of spring & rod?
  */
 void
-Spaceable_grob::add_rod (Grob *me , Grob * p, Real d)
+Spaceable_grob::add_rod (Grob *me, Grob *p, Real d)
 {
+  //  printf ("rod %lf\n", d);
+  if (d < 0)
+    return;
+
+  if (isinf (d))
+    programming_error ("infinite rod");
+
   SCM mins = get_minimum_distances (me);
-  SCM newdist = gh_double2scm (d);
-  for (SCM s = mins; gh_pair_p (s); s = gh_cdr (s))
+  SCM newdist = scm_from_double (d);
+  for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM dist = gh_car (s);
-      if (gh_car (dist) == p->self_scm ())
-       {
-         gh_set_cdr_x (dist, scm_max (gh_cdr (dist),
-                                      newdist));
-         return ;
-       }
+      SCM dist = scm_car (s);
+      if (scm_is_eq (scm_car (dist), p->self_scm ()))
+        {
+          scm_set_cdr_x (dist, scm_max (scm_cdr (dist),
+                                        newdist));
+          return;
+        }
     }
 
-  mins = gh_cons (gh_cons (p->self_scm (), newdist), mins);
-  me->set_grob_property ("minimum-distances", mins);
+  if (Paper_column::get_rank (p) < Paper_column::get_rank (me))
+    programming_error ("Adding reverse rod");
+
+  mins = scm_cons (scm_cons (p->self_scm (), newdist), mins);
+  me->set_object ("minimum-distances", mins);
 }
 
 void
-Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength)
+Spaceable_grob::add_spring (Grob *me, Grob *other, Spring sp)
 {
-  SCM mins = me->get_grob_property ("ideal-distances");
-  SCM newdist= gh_double2scm (d);
-  for (SCM s = mins; gh_pair_p (s); s = gh_cdr (s))
-    {
-      SCM dist = gh_car (s);
-      if (gh_car (dist) == p->self_scm ())
-       {
-         programming_error ("already have that spring");
-         return ;
-       }
-    }
-  SCM newstrength= gh_double2scm (strength);  
-  
-  mins = gh_cons (gh_cons (p->self_scm (), gh_cons (newdist, newstrength)), mins);
-  me->set_grob_property ("ideal-distances", mins);
+  SCM ideal = me->get_object ("ideal-distances");
+
+  ideal = scm_cons (scm_cons (sp.smobbed_copy (), other->self_scm ()), ideal);
+  me->set_object ("ideal-distances", ideal);
 }
 
+Spring
+Spaceable_grob::get_spring (Grob *this_col, Grob *next_col)
+{
+  Spring *spring = 0;
 
+  for (SCM s = this_col->get_object ("ideal-distances");
+       !spring && scm_is_pair (s);
+       s = scm_cdr (s))
+    {
+      if (scm_is_pair (scm_car (s))
+          && unsmob<Grob> (scm_cdar (s)) == next_col
+          && unsmob<Spring> (scm_caar (s)))
+        spring = unsmob<Spring> (scm_caar (s));
+    }
 
-void
-Spaceable_grob::remove_interface (Grob*me)
-{
-  me->remove_grob_property ("minimum-distances");
-  me->remove_grob_property ("ideal-distances");
-  me->remove_grob_property ("dir-list");
+  if (!spring)
+    programming_error (to_string ("No spring between column %d and next one",
+                                  Paper_column::get_rank (this_col)));
+
+  return spring ? *spring : Spring ();
 }
 
+ADD_INTERFACE (Spaceable_grob,
+               "A layout object that takes part in the spacing problem.",
+
+               /* properties */
+               "allow-loose-spacing "
+               "ideal-distances "
+               "keep-inside-line "
+               "left-neighbor "
+               "measure-length "
+               "minimum-distances "
+               "right-neighbor "
+               "spacing-wishes "
+              );
 
-void
-Spaceable_grob::set_interface (Grob*me)
-{
-  me->set_interface (ly_symbol2scm ("spaceable-grob-interface"));
-}