X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=6653b6ddc7deb9e60582752206eda332470d27f2;hb=6fca7798a50bb054669a44b0cceb9b6ca208e4b7;hp=87925402d467edefa6c04925bf88529a0c395faf;hpb=89c96b5833d2e0bb9d1781e6d88246992aeaef99;p=lilypond.git

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 87925402d4..6653b6ddc7 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -1,122 +1,33 @@
 /*
-  paper-system.cc -- implement Paper_system
+  paper-system.cc -- implement Prob functions for paper-system
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-system.hh"
 #include "item.hh"
 
-#include "ly-smobs.icc"
-
-IMPLEMENT_SMOBS (Paper_system);
-IMPLEMENT_TYPE_P (Paper_system, "ly:paper-system?");
-IMPLEMENT_DEFAULT_EQUAL_P (Paper_system);
-
-Paper_system::Paper_system (Stencil s, bool is_title)
-{
-  is_title_ = is_title;
-  number_ = 0;
-  break_before_penalty_ = 0;
-  smobify_self ();
-  stencil_ = s;
-  staff_refpoints_ = Interval (0, 0);
-}
-
-Paper_system::~Paper_system ()
-{
-}
-
-SCM
-Paper_system::mark_smob (SCM smob)
-{
-  Paper_system *system = (Paper_system *) SCM_CELL_WORD_1 (smob);
-  scm_gc_mark (system->details_);
-  return system->stencil_.expr ();
-}
-
-int
-Paper_system::print_smob (SCM smob, SCM port, scm_print_state*)
-{
-  Paper_system *p = (Paper_system *) SCM_CELL_WORD_1 (smob);
-  scm_puts ("#<", port);
-  scm_puts (classname (p), port);
-  scm_puts ("n ", port);
-  scm_puts (to_string (p->number_).to_str0 (), port);
-  scm_puts (", p ", port);
-  scm_puts (to_string (p->break_before_penalty_).to_str0 (), port);
-  if (p->is_title ())
-    scm_puts (" t", port);
-  scm_puts (" >", port);
-  return 1;
-}
-
-bool
-Paper_system::is_title () const
-{
-  return is_title_;
-}
-
-Real
-Paper_system::break_before_penalty () const
-{
-  return break_before_penalty_;
-}
-
-Stencil
-Paper_system::to_stencil () const
+Prob *
+make_paper_system (SCM immutable_init)
 {
-  return stencil_;
+  Prob *prob = new Prob (ly_symbol2scm ("paper-system"), immutable_init);
+  return prob;
 }
 
 void
-Paper_system::read_left_bound (Item *left)
+paper_system_set_stencil (Prob *prob, Stencil s)
 {
-  break_before_penalty_
-    = robust_scm2double (left->get_property ("page-penalty"), 0.0);
-
-  details_
-    = left->get_property ("line-break-system-details");
+  SCM yext = prob->get_property ("Y-extent");
 
-  SCM yext
-    = scm_assq (ly_symbol2scm ("Y-extent"), details_);
-  
-  SCM staff_ext
-    = scm_assq (ly_symbol2scm ("refpoint-Y-extent"), details_);
-
-  if (scm_is_pair (yext)
-      && is_number_pair (scm_cdr (yext)))
+  if (is_number_pair (yext))
     {
-      Box b = stencil_.extent_box();
-      b[Y_AXIS] = ly_scm2interval (scm_cdr (yext));
-      
-      stencil_ = Stencil (b, stencil_.expr ());
-    }
+      Box b = s.extent_box ();
+      b[Y_AXIS] = ly_scm2interval (yext);
 
-  if (scm_is_pair (staff_ext)
-      && is_number_pair (scm_cdr (staff_ext)))
-    {
-      staff_refpoints_ = ly_scm2interval (scm_cdr (staff_ext));
+      s = Stencil (b, s.expr ());
     }
-}
 
-SCM
-Paper_system::internal_get_property (SCM sym) const
-{
-  SCM handle = scm_assq (sym, details_);
-  if (scm_is_pair (handle))
-    return scm_cdr (handle);
-  else
-    return SCM_EOL;
-}
-
-/*
-  todo: move to Paper_system property.
- */
-Interval
-Paper_system::staff_refpoints () const
-{
-  return staff_refpoints_;
+  prob->set_property ("stencil", s.smobbed_copy ());
 }