Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / paper-system-scheme.cc

diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc
index e6da5d276b25caec42c147dcf4dc265c349d1880..b0f74eac0effbc7b77146b61788b427507bd6461 100644 (file)
--- a/lily/paper-system-scheme.cc
+++ b/lily/paper-system-scheme.cc
@@ -1,66 +1,44 @@
-/*
-  paper-system-scheme.cc -- implement Paper_system bindings
-
+/* 
+  paper-system-scheme.cc -- implement Paper_system bindings.
+  
   source file of the GNU LilyPond music typesetter
-
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  
+  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
+  
 */
 
-#include "paper-system.hh"
-
-LY_DEFINE (ly_paper_system_height, "ly:paper-system-extent",
-          2, 0, 0, (SCM system, SCM axis),
-          "Return the extent of @var{system}.")
-{
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
-  Axis ax = (Axis)scm_to_int (axis);
-  return ly_interval2scm (ps->to_stencil ().extent (ax));
-}
-
-LY_DEFINE (ly_paper_system_title_p, "ly:paper-system-title?",
-          1, 0, 0, (SCM system),
-          "Is  @var{system} a title system?")
-{
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  return SCM_BOOL (ps->is_title ());
-}
+#include "prob.hh"
 
-LY_DEFINE (ly_paper_system_number, "ly:paper-system-number",
-          1, 0, 0, (SCM system),
-          "Return the number of @var{system}.")
+#include "skyline-pair.hh"
+  
+LY_DEFINE (ly_paper_system_p, "ly:paper-system?",
+         1, 0, 0, (SCM obj),
+         "Is @var{obj} a Prob object of type @code{paper-system}?")
 {
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  return scm_int2num (ps->number_);
+  return ly_prob_type_p (obj, ly_symbol2scm ("paper-system"));
 }
 
-LY_DEFINE (ly_paper_system_break_before_penalty, "ly:paper-system-break-before-penalty",
-          1, 0, 0, (SCM system),
-          "Return the score for page break after @var{system}.")
+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");
-  return scm_int2num (int (ps->break_before_penalty ()));
+  Real ret = 0;
+  Prob *p1 = unsmob_prob (sys1);
+  Prob *p2 = unsmob_prob (sys2);
+  Skyline_pair *sky1 = Skyline_pair::unsmob (p1->get_property ("vertical-skylines"));
+  Skyline_pair *sky2 = Skyline_pair::unsmob (p2->get_property ("vertical-skylines"));
+
+  if (sky1 && sky2)
+    ret = (*sky1)[DOWN].distance ((*sky2)[UP]);
+  else
+    {
+      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);
 }
-
-LY_DEFINE (ly_paper_system_stencil, "ly:paper-system-stencil",
-          1, 0, 0, (SCM system),
-          "Return the height of @var{system}.")
-{
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  return ps->to_stencil ().smobbed_copy ();
-}
-
-LY_DEFINE (ly_paper_system_staff_extent, "ly:paper-system-staff-extents",
-          1, 0, 0, (SCM system),
-          "Return the top and bottom staff refpoint.")
-{
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  return ly_interval2scm (ps->staff_refpoints_);
-}
-