* flower/include/offset.hh (class Offset): new operator /=

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

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 5f5e1702c965bfb425953d49cd5334a3c1aa3cab..064b91f6c9a973289b9d64684189829d6c8c149c 100644 (file)
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -15,14 +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;
-  break_before_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 ()
@@ -33,7 +42,8 @@ SCM
 Paper_system::mark_smob (SCM smob)
 {
   Paper_system *system = (Paper_system *) SCM_CELL_WORD_1 (smob);
-  return system->stencil_.expr ();
+  scm_gc_mark (system->mutable_property_alist_);
+  return system->immutable_property_alist_;
 }
 
 int
@@ -41,68 +51,38 @@ 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);
+  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::break_before_penalty () const
+void
+Paper_system::init_vars ()
 {
-  return break_before_penalty_;
-}
 
-Stencil
-Paper_system::to_stencil () const
-{
-  return stencil_;
 }
 
-void
-Paper_system::read_left_bound (Item *left)
+SCM
+Paper_system::internal_get_property (SCM sym) const
 {
-  break_before_penalty_
-    = robust_scm2double (left->get_property ("page-penalty"), 0.0);
-
-  SCM details
-    = left->get_property ("line-break-system-details");
-
-  SCM yext
-    = scm_assoc (ly_symbol2scm ("Y-extent"), details);
-  
-  SCM staff_ext
-    = scm_assoc (ly_symbol2scm ("refpoint-Y-extent"), details);
+  /*
+    TODO: type checking
+   */
+  SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
+  if (s != SCM_BOOL_F)
+    return scm_cdr (s);
 
-  if (scm_is_pair (yext)
-      && is_number_pair (scm_cdr (yext)))
-    {
-      Box b = stencil_.extent_box();
-      b[Y_AXIS] = ly_scm2interval (scm_cdr (yext));
-      
-      stencil_ = Stencil (b, stencil_.expr ());
-    }
+  s = scm_sloppy_assq (sym, immutable_property_alist_);
 
-  if (scm_is_pair (staff_ext)
-      && is_number_pair (scm_cdr (staff_ext)))
-    {
-      staff_refpoints_ = ly_scm2interval (scm_cdr (staff_ext));
-    }
+     
+  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
-Interval
-Paper_system::staff_refpoints () const
+void
+Paper_system::internal_set_property (SCM sym, SCM val) 
 {
-  return staff_refpoints_;
+  mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, val);
 }