X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system-scheme.cc;h=1f5a39b96af82208e73285d8595951a3b992fccd;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=2baaceef4b8fd0b7016f2eea4f1f6ecd7c40268d;hpb=d372176add53661074bf57362acbdf31eb8350cb;p=lilypond.git

diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc
index 2baaceef4b..1f5a39b96a 100644
--- a/lily/paper-system-scheme.cc
+++ b/lily/paper-system-scheme.cc
@@ -1,42 +1,56 @@
 /*
-  paper-system-scheme.cc -- implement Paper_system bindings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2008--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
-  (c) 2005 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 "paper-system.hh"
+#include "prob.hh"
 
-LY_DEFINE (ly_paper_system_set_property_x, "ly:paper-system-set-property!",
-	   2, 1, 0, (SCM system, SCM sym, SCM value),
-	   "Set property @var{sym} of @var{system} to @var{value}")
-{
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
+#include "skyline-pair.hh"
 
-  ps->internal_set_property (sym, value);
-  return SCM_UNSPECIFIED;
+LY_DEFINE (ly_paper_system_p, "ly:paper-system?",
+           1, 0, 0, (SCM obj),
+           "Is @var{obj} a C++ @code{Prob} object of type"
+           " @code{paper-system}?")
+{
+  return ly_prob_type_p (obj, ly_symbol2scm ("paper-system"));
 }
 
-LY_DEFINE (ly_paper_system_property, "ly:paper-system-property",
-	   2, 1, 0, (SCM system, SCM sym, SCM dfault),
-	   "Return the value for @var{sym}. Properties may be set by "
-	   "setting the @code{line-break-system-details} property of "
-	   "NonMusicalPaperColumn.  If the property is not found, "
-	   "return @var{dfault}, "
-	   "or @code{'()} if undefined.")
+LY_DEFINE (ly_paper_system_minimum_distance, "ly:paper-system-minimum-distance",
+           2, 0, 0, (SCM sys1, SCM sys2),
+           "Measure the minimum distance between these two paper-systems,"
+           " using their stored skylines if possible and falling back to"
+           " their extents otherwise.")
 {
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  if (dfault == SCM_UNDEFINED)
-    dfault = SCM_EOL;
-
-  SCM retval = ps->internal_get_property (sym);
-  if (retval == SCM_EOL)
-    return dfault;
+  Real ret = 0;
+  Prob *p1 = unsmob<Prob> (sys1);
+  Prob *p2 = unsmob<Prob> (sys2);
+  Skyline_pair *sky1 = unsmob<Skyline_pair> (p1->get_property ("vertical-skylines"));
+  Skyline_pair *sky2 = unsmob<Skyline_pair> (p2->get_property ("vertical-skylines"));
+
+  if (sky1 && sky2)
+    ret = (*sky1)[DOWN].distance ((*sky2)[UP]);
   else
-    return retval;
+    {
+      Stencil *s1 = unsmob<Stencil> (p1->get_property ("stencil"));
+      Stencil *s2 = unsmob<Stencil> (p2->get_property ("stencil"));
+      Interval iv1 = s1->extent (Y_AXIS);
+      Interval iv2 = s2->extent (Y_AXIS);
+      ret = iv2[UP] - iv1[DOWN];
+    }
+  return scm_from_double (ret);
 }
-
-