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

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 0d206a0aae..b67eb0123b 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -1,94 +1,94 @@
 /*
-  paper-system.cc -- implement Paper_system
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "paper-system.hh"
+#include "international.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 ();
+  Prob *prob = new Prob (ly_symbol2scm ("paper-system"), immutable_init);
+  return prob;
 }
 
+/*
+  TODO
+  it might be interesting to split off the footnotes as well, ie.
 
-Paper_system::~Paper_system ()
-{
-}
+  get_footnotes(SCM expr, SCM* footnotes, SCM* cleaned)
 
+  by doing it this way and overwriting the old expr in the caller,
+  you can make sure nobody tries to handle footnotes differently
+  downstream.
+*/
 SCM
-Paper_system::mark_smob (SCM smob)
+get_footnotes (SCM expr)
 {
-  Paper_system *system = (Paper_system *) SCM_CELL_WORD_1 (smob);
-  scm_gc_mark (system->mutable_property_alist_);
-  return system->stencil_.expr ();
-}
+  if (!scm_is_pair (expr))
+    return SCM_EOL;
 
-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;
-}
+  SCM head = scm_car (expr);
 
+  if (scm_is_eq (head, ly_symbol2scm ("delay-stencil-evaluation")))
+    {
+      // we likely need to do something here...just don't know what...
+      return SCM_EOL;
+    }
 
-Stencil
-Paper_system::to_stencil () const
-{
-  return stencil_;
+  if (scm_is_eq (head, ly_symbol2scm ("combine-stencil")))
+    {
+      SCM out = SCM_EOL;
+      SCM *tail = &out;
+
+      for (SCM x = scm_cdr (expr); scm_is_pair (x); x = scm_cdr (x))
+        {
+          SCM footnote = get_footnotes (scm_car (x));
+          if (!scm_is_null (footnote))
+            {
+              *tail = scm_cons (footnote, SCM_EOL);
+              tail = SCM_CDRLOC (*tail);
+            }
+        }
+      return scm_append (out);
+    }
+  if (scm_is_eq (head, ly_symbol2scm ("translate-stencil")))
+    return get_footnotes (scm_caddr (expr));
+
+  if (scm_is_eq (head, ly_symbol2scm ("footnote")))
+    return scm_list_1 (scm_cdr (expr));
+
+  return SCM_EOL;
 }
 
 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 ());
 }