X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=14de60d2dcebd156f0607748ea43beb23c8364e7;hb=f4c0b9541aceba91c49b08207e7fa9a1adb0d2c7;hp=c94541577ac2d021252523c0dab33156fc600319;hpb=b0fc2bbf6d5f9b64c8bba3b7b5e4e50297c36e00;p=lilypond.git

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index c94541577a..14de60d2dc 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,79 +3,167 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "moment.hh"
+
 #include "paper-column.hh"
+
+#include "moment.hh"
 #include "paper-score.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "axis-group-interface.hh"
-#include "spaceable-element.hh"
+#include "spaceable-grob.hh"
+#include "text-item.hh"
+#include "lookup.hh"
+#include "font-interface.hh"
+#include "output-def.hh"
+
+Grob *
+Paper_column::clone (int count) const
+{
+  return new Paper_column (*this, count);
+}
+
+ADD_INTERFACE (Paper_column, "paper-column-interface",
+	       "@code{Paper_column} objects form the top-most X-parents for items. "
+	       "  The are two types of columns: musical columns, where are attached to, and "
+	       "  non-musical columns, where bar-lines, clefs etc. are attached to. "
+	       "  The spacing engine determines the X-positions of these objects."
+	       "\n\n"
+	       "They are\n"
+	       "  numbered, the first (leftmost) is column 0. Numbering happens before\n"
+	       "  line-breaking, and columns are not renumbered after line breaking.\n"
+	       "  Since many columns go unused, you should only use the rank field to\n"
+	       "  get ordering information.  Two adjacent columns may have\n"
+	       "  non-adjacent numbers.\n"
+	       "\n",
+	       "between-cols when bounded-by-me "
+	       "page-penalty shortest-playing-duration shortest-starter-duration");
 
 void
 Paper_column::do_break_processing ()
 {
-  Spaceable_element::remove_interface(this);
+  Spaceable_grob::remove_interface (this);
   Item::do_break_processing ();
 }
 
 int
-Paper_column::rank_i(Score_element*me) 
+Paper_column::get_rank (Grob *me)
 {
-  return dynamic_cast<Paper_column*> (me)->rank_i_;
+  return dynamic_cast<Paper_column *> (me)->rank_;
 }
 
-Line_of_score*
-Paper_column::line_l() const
+System *
+Paper_column::get_system () const
 {
-  return line_l_;
+  return system_;
 }
 
-Paper_column*
-Paper_column::column_l () const
+Paper_column *
+Paper_column::get_column () const
 {
-  return (Paper_column*)(this);
+  return (Paper_column *) (this);
 }
 
-Paper_column::Paper_column (SCM l)
-  : Item (l)		// guh.?
+Paper_column::Paper_column (SCM l, Object_key const *key)
+  : Item (l, key)		// guh.?
 {
-  Axis_group_interface::set_interface (this);
-  Axis_group_interface::set_axes (this, X_AXIS, X_AXIS);
-  Spaceable_element::set_interface (this);
+  system_ = 0;
+  rank_ = -1;
+}
 
-  line_l_=0;
-  rank_i_ = -1;
+Paper_column::Paper_column (Paper_column const &src, int count)
+  : Item (src, count)
+{
+  system_ = 0;
+  rank_ = src.rank_;
 }
 
 Moment
-Paper_column::when_mom (Score_element*me)
+Paper_column::when_mom (Grob *me)
 {
-  SCM m = me->get_elt_property ("when");
-  Moment s (0);
-  if (unsmob_moment (m))
-    {
-      return *unsmob_moment (m);
-    }
-  return s;
+  SCM m = me->get_property ("when");
+  if (Moment *when = unsmob_moment (m))
+    return *when;
+  return Moment (0);
 }
-  
+
 bool
-Paper_column::musical_b () const
+Paper_column::is_musical (Grob *me)
 {
-  SCM m = get_elt_property ("shortest-starter-duration");
+  SCM m = me->get_property ("shortest-starter-duration");
   Moment s (0);
   if (unsmob_moment (m))
     {
       s = *unsmob_moment (m);
     }
-  return s != Moment(0);
+  return s != Moment (0);
 }
 
 bool
-Paper_column::used_b (Score_element*me )
+Paper_column::is_used (Grob *me)
 {
-  return gh_pair_p (me->get_elt_property ("elements")) ||  Item::breakable_b (me)
-    || gh_pair_p (me->get_elt_property ("bounded-by-me"))
-    ;
+  return scm_is_pair (me->get_property ("elements")) || Item::is_breakable (me)
+    || scm_is_pair (me->get_property ("bounded-by-me"));
+}
+
+/*
+  Print a vertical line and  the rank number, to aid debugging.
+*/
+
+MAKE_SCHEME_CALLBACK (Paper_column, print, 1);
+SCM
+Paper_column::print (SCM p)
+{
+  Grob *me = unsmob_grob (p);
+
+  String r = to_string (Paper_column::get_rank (me));
+  SCM properties = Font_interface::text_font_alist_chain (me);
+
+  SCM scm_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (),
+						  properties,
+						  scm_makfrom0str (r.to_str0 ()));
+  Stencil t = *unsmob_stencil (scm_mol);
+  t.align_to (X_AXIS, CENTER);
+  t.align_to (Y_AXIS, DOWN);
+
+  Stencil l = Lookup::filled_box (Box (Interval (-0.01, 0.01),
+				       Interval (-2, -1)));
+
+  t.add_stencil (l);
+  return t.smobbed_copy ();
+}
+
+/*
+  This is all too hairy. We use bounded-by-me to make sure that some
+  columns are kept "alive". Unfortunately, when spanners are suicided,
+  this falls apart again. (sigh.)
+
+  THIS IS BROKEN KLUDGE. WE SHOULD INVENT SOMETHING BETTER.
+*/
+MAKE_SCHEME_CALLBACK (Paper_column, before_line_breaking, 1);
+SCM
+Paper_column::before_line_breaking (SCM grob)
+{
+  Grob *me = unsmob_grob (grob);
+
+  SCM c = me->get_property ("bounded-by-me");
+  SCM *ptrptr = &c;
+
+  while (scm_is_pair (*ptrptr))
+    {
+      Grob *g = unsmob_grob (scm_car (*ptrptr));
+
+      if (!g || !g->is_live ())
+	{
+	  *ptrptr = scm_cdr (*ptrptr);
+	}
+      else
+	{
+	  ptrptr = SCM_CDRLOC (*ptrptr);
+	}
+    }
+
+  me->set_property ("bounded-by-me", c);
+  return SCM_UNSPECIFIED;
 }