X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=5d3d19c513e2fe096dc7426c1242754f055d3971;hb=16c174dd8fc82d6fdde10af1077cc3e0bfc08b22;hp=0d206a0aae64135f1c7fcd00953ce44034eeeb7c;hpb=4700a805e1627eb33cc38d7d3fa20e9d96ffe70f;p=lilypond.git

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 0d206a0aae..5d3d19c513 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -1,94 +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--2006 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, SCM immutable_init)
+Prob *
+make_paper_system (SCM immutable_init)
 {
-  mutable_property_alist_ = SCM_EOL;
-  immutable_property_alist_ = immutable_init;
-  smobify_self ();
-  stencil_ = s;
-  init_vars ();
-}
-
-
-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->mutable_property_alist_);
-  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_display (p->mutable_property_alist_, port);
-  scm_display (p->immutable_property_alist_, port);
-  
-  scm_puts (" >\n", port);
-  return 1;
-}
-
-
-Stencil
-Paper_system::to_stencil () const
-{
-  return stencil_;
+  Prob *prob = new Prob (ly_symbol2scm ("paper-system"), immutable_init);
+  return prob;
 }
 
 void
-Paper_system::init_vars ()
+paper_system_set_stencil (Prob *prob, Stencil s)
 {
-  SCM yext = get_property ("Y-extent");
+  SCM yext = prob->get_property ("Y-extent");
 
   if (is_number_pair (yext))
     {
-      Box b = stencil_.extent_box();
+      Box b = s.extent_box();
       b[Y_AXIS] = ly_scm2interval (yext);
-      
-      stencil_ = Stencil (b, stencil_.expr ());
-    }
-}
-
-SCM
-Paper_system::internal_get_property (SCM sym) const
-{
-  /*
-    TODO: type checking
-   */
-  SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
-  if (s != SCM_BOOL_F)
-    return scm_cdr (s);
-
-  s = scm_sloppy_assq (sym, immutable_property_alist_);
 
-     
-  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
-}
+      s = Stencil (b, s.expr ());
+    }
 
-void
-Paper_system::internal_set_property (SCM sym, SCM val) 
-{
-  mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, val);
+  prob->set_property ("stencil", s.smobbed_copy ());
 }