X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=064b91f6c9a973289b9d64684189829d6c8c149c;hb=36342ddfdbf0c112be9cb4ce471417e9c0e8fa1f;hp=ab2fc13f3db6e9ee33ac3f3b0cc6e84bc352bfd3;hpb=3427445a6d0d612d86e0e26e26179cf2033342d1;p=lilypond.git

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index ab2fc13f3d..064b91f6c9 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -3,13 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-system.hh"
-#include "stencil.hh"
-#include "string.hh"
-#include "virtual-methods.hh"
+#include "item.hh"
 
 #include "ly-smobs.icc"
 
@@ -17,16 +15,23 @@ 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)
+Paper_system::Paper_system (Stencil s, SCM immutable_init)
 {
-  is_title_ = is_title;
-  number_ = 0;
-  penalty_ = 0;
+  mutable_property_alist_ = SCM_EOL;
+  immutable_property_alist_ = immutable_init;
   smobify_self ();
-  stencil_ = s;
-  staff_refpoints_ = Interval(0,0);
+
+  SCM yext = get_property ("Y-extent");
+
+  if (is_number_pair (yext))
+    {
+      
+      Box b = s.extent_box();
+      b[Y_AXIS] = ly_scm2interval (yext);
+
+      s = Stencil (b, s.expr ());
+    }
+  set_property ("stencil", s.smobbed_copy ());
 }
 
 Paper_system::~Paper_system ()
@@ -36,101 +41,48 @@ Paper_system::~Paper_system ()
 SCM
 Paper_system::mark_smob (SCM smob)
 {
-  Paper_system *system = (Paper_system*) ly_cdr (smob);
-  return system-> stencil_.expr ();
+  Paper_system *system = (Paper_system *) SCM_CELL_WORD_1 (smob);
+  scm_gc_mark (system->mutable_property_alist_);
+  return system->immutable_property_alist_;
 }
 
 int
 Paper_system::print_smob (SCM smob, SCM port, scm_print_state*)
 {
-  Paper_system *p = (Paper_system*) ly_cdr (smob);
+  Paper_system *p = (Paper_system *) SCM_CELL_WORD_1 (smob);
   scm_puts ("#<", port);
-  scm_puts (classname (p), port);
-  scm_puts (" ", port);
-  scm_puts (to_string (p->number_).to_str0 (), port);
-  scm_puts ("p ", port);
-  scm_puts (to_string (p->penalty_).to_str0 (), port);
-  if (p->is_title ())
-    scm_puts (" t", port);
-  scm_puts (" >", port);
+  scm_puts ("Paper_system", port);
+  scm_display (p->mutable_property_alist_, port);
+  scm_display (p->immutable_property_alist_, port);
+  
+  scm_puts (" >\n", port);
   return 1;
 }
 
-bool
-Paper_system::is_title () const
-{
-  return is_title_;
-}
-
-Real
-Paper_system::penalty () const
-{
-  return penalty_;
-}
-
-Stencil
-Paper_system::to_stencil () const
-{
-  return stencil_;
-}
-
-LY_DEFINE (ly_paper_system_height, "ly:paper-system-extent",
-	   2, 0, 0, (SCM system, SCM axis),
-	   "Return the extent of @var{system}.")
+void
+Paper_system::init_vars ()
 {
-  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)ly_scm2int (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 ());
 }
 
-LY_DEFINE (ly_paper_system_number, "ly:paper-system-number",
-	   1, 0, 0, (SCM system),
-	   "Return the number of @var{system}.")
+SCM
+Paper_system::internal_get_property (SCM sym) const
 {
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  return scm_int2num (ps->number_);
-}
+  /*
+    TODO: type checking
+   */
+  SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
+  if (s != SCM_BOOL_F)
+    return scm_cdr (s);
 
-LY_DEFINE (ly_paper_system_break_score, "ly:paper-system-break-penalty",
-	   1, 0, 0, (SCM system),
-	   "Return the score for page break after @var{system}.")
-{
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  return scm_int2num (int (ps->penalty ()));
-}
+  s = scm_sloppy_assq (sym, immutable_property_alist_);
 
-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 ();
+     
+  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
-
-
-LY_DEFINE (ly_paper_system_staff_extent, "ly:paper-system-staff-extents",
-	   1, 0, 0, (SCM system),
-	   "Return the top and bottom staff refpoint.")
+void
+Paper_system::internal_set_property (SCM sym, SCM val) 
 {
-  Paper_system *ps = unsmob_paper_system (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
-  return ly_interval2scm (ps->staff_refpoints_);
+  mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, val);
 }
-