Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index f7cd30334c1a5eed226e03c4d78e39e154c638d0..2636b20fe4bccee354e4b9b915f060f8e6f082af 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -34,9 +34,9 @@ Paper_column::do_break_processing ()
 }
 
 int
-Paper_column::get_rank (Grob *me)
+Paper_column::get_rank (Grob const *me)
 {
-  return dynamic_cast<Paper_column *> (me)->rank_;
+  return dynamic_cast<Paper_column const *> (me)->rank_;
 }
 
 System *
@@ -45,6 +45,12 @@ Paper_column::get_system () const
   return system_;
 }
 
+void
+Paper_column::set_system (System *s)
+{
+  system_ = s;
+}
+
 Paper_column *
 Paper_column::get_column () const
 {
@@ -65,6 +71,24 @@ Paper_column::Paper_column (Paper_column const &src, int count)
   rank_ = src.rank_;
 }
 
+int
+Paper_column::compare (Grob * const &a,
+                      Grob * const &b)
+{
+  return sign (dynamic_cast<Paper_column*> (a)->rank_
+              - dynamic_cast<Paper_column*> (b)->rank_);
+}
+
+bool
+Paper_column::less_than (Grob *const &a,
+                        Grob *const &b)
+{
+  Paper_column *pa = dynamic_cast<Paper_column*> (a);
+  Paper_column *pb = dynamic_cast<Paper_column*> (b);
+  
+  return pa->rank_ < pb->rank_;
+}
+
 Moment
 Paper_column::when_mom (Grob *me)
 {
@@ -95,7 +119,7 @@ Paper_column::is_used (Grob *me)
   if (bbm.size ())
     return true;
   
-  if (Item::is_breakable (me))
+  if (Paper_column::is_breakable (me))
     return true;
 
   if (to_boolean (me->get_property ("used")))
@@ -103,6 +127,12 @@ Paper_column::is_used (Grob *me)
   return false;
 }
 
+bool
+Paper_column::is_breakable (Grob *me)
+{
+  return scm_is_symbol (me->get_property ("line-break-permission"));
+}
+
 /*
   Print a vertical line and  the rank number, to aid debugging.
 */
@@ -113,19 +143,19 @@ Paper_column::print (SCM p)
 {
   Grob *me = unsmob_grob (p);
 
-  String r = to_string (Paper_column::get_rank (me));
+  string r = to_string (Paper_column::get_rank (me));
 
   Moment *mom = unsmob_moment (me->get_property ("when"));
-  String when = mom ? mom->to_string () : "?/?";
+  string when = mom ? mom->to_string () : "?/?";
 
   SCM properties = Font_interface::text_font_alist_chain (me);
 
   SCM scm_mol = Text_interface::interpret_markup (me->layout ()->self_scm (),
                                                  properties,
-                                                 scm_makfrom0str (r.to_str0 ()));
+                                                 scm_makfrom0str (r.c_str ()));
   SCM when_mol = Text_interface::interpret_markup (me->layout ()->self_scm (),
                                                   properties,
-                                                  scm_makfrom0str (when.to_str0 ()));
+                                                  scm_makfrom0str (when.c_str ()));
   Stencil t = *unsmob_stencil (scm_mol);
   t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1, 0.1);
   t.align_to (X_AXIS, CENTER);
@@ -157,16 +187,15 @@ Paper_column::before_line_breaking (SCM grob)
   if (!ga)
     return SCM_UNSPECIFIED;
 
-  Link_array<Grob> &array (ga->array_reference ());
+  vector<Grob*> &array (ga->array_reference ());
 
-  for (int i = array.size (); i--;)
+  for (vsize i = array.size (); i--;)
     {
       Grob *g = array[i];
 
       if (!g || !g->is_live ())
-       {                       // UGH . potentially quadratic.
-         array.del (i);
-       }
+       /* UGH . potentially quadratic. */
+       array.erase (array.begin () + i);
     }
 
   return SCM_UNSPECIFIED;
@@ -174,8 +203,6 @@ Paper_column::before_line_breaking (SCM grob)
 
 
 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. "
@@ -193,10 +220,18 @@ ADD_INTERFACE (Paper_column,
               /* properties */
               "between-cols "
               "bounded-by-me "
+              "grace-spacing " 
               "line-break-system-details "
-              "page-penalty "
+              "line-break-penalty "
+              "line-break-permission "
+              "page-break-penalty "
+              "page-break-permission "
+              "page-turn-penalty "
+              "page-turn-permission "
+              "rhythmic-location "
               "shortest-playing-duration "
               "shortest-starter-duration "
+              "spacing "
               "used "
               "when ");