Run `make grand-replace'.

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

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index d5e8b914bac08c0ec240bca7b34646fd24adac54..06a878d62b85925f39f91a8873c686d1d87f5041 100644 (file)
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -1,41 +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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-system.hh"
 #include "item.hh"
 
-Paper_system::Paper_system (Stencil s, SCM immutable_init)
-  : Prob (immutable_init)
+Prob *
+make_paper_system (SCM immutable_init)
 {
-  SCM yext = get_property ("Y-extent");
+  Prob *prob = new Prob (ly_symbol2scm ("paper-system"), immutable_init);
+  return prob;
+}
+
+void
+paper_system_set_stencil (Prob *prob, Stencil s)
+{
+  SCM yext = prob->get_property ("Y-extent");
 
   if (is_number_pair (yext))
     {
-      
-      Box b = s.extent_box();
+      Box b = s.extent_box ();
       b[Y_AXIS] = ly_scm2interval (yext);
 
       s = Stencil (b, s.expr ());
     }
 
-  set_property ("stencil", s.smobbed_copy ());
-}
-
-Paper_system *
-unsmob_paper_system (SCM x)
-{
-  Prob *prob = unsmob_prob (x);
-  return dynamic_cast<Paper_system*> (prob);
-}
-
-LY_DEFINE(ly_paper_system_p, "ly:paper-system?",
-         1,0,0, (SCM obj),
-         "Type predicate.")
-{
-  return scm_from_bool (unsmob_paper_system (obj));
+  prob->set_property ("stencil", s.smobbed_copy ());
 }