X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=06a878d62b85925f39f91a8873c686d1d87f5041;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c519404a65d0f104a656a5fb5af82f89dfa98535;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index c519404a65..06a878d62b 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -1,72 +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--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-system.hh"
+#include "item.hh"
 
-#include "virtual-methods.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)
+Prob *
+make_paper_system (SCM immutable_init)
 {
-  is_title_ = is_title;
-  number_ = 0;
-  break_before_penalty_ = 0;
-  smobify_self ();
-  stencil_ = s;
-  staff_refpoints_ = Interval (0, 0);
+  Prob *prob = new Prob (ly_symbol2scm ("paper-system"), immutable_init);
+  return prob;
 }
 
-Paper_system::~Paper_system ()
+void
+paper_system_set_stencil (Prob *prob, Stencil s)
 {
-}
+  SCM yext = prob->get_property ("Y-extent");
 
-SCM
-Paper_system::mark_smob (SCM smob)
-{
-  Paper_system *system = (Paper_system *) SCM_CELL_WORD_1 (smob);
-  return system-> stencil_.expr ();
-}
+  if (is_number_pair (yext))
+    {
+      Box b = s.extent_box ();
+      b[Y_AXIS] = ly_scm2interval (yext);
 
-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;
-}
+      s = Stencil (b, s.expr ());
+    }
 
-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
-{
-  return stencil_;
+  prob->set_property ("stencil", s.smobbed_copy ());
 }