release: 0.1.11

[lilypond.git] / lily / p-col.cc

diff --git a/lily/p-col.cc b/lily/p-col.cc
index 7036bebee37137dfbb7eeca436d90f40c69a7e14..715adecd83122c555615721e43cfce11ad90658c 100644 (file)
--- a/lily/p-col.cc
+++ b/lily/p-col.cc
@@ -1,5 +1,5 @@
 /*
-  p-col.cc -- implement PCol
+  p-col.cc -- implement Paper_column
 
   source file of the GNU LilyPond music typesetter
 
@@ -8,142 +8,91 @@
 
 #include "p-col.hh"
 #include "p-score.hh"
-
 #include "debug.hh"
 
-Interval
-PCol::width() const
-{
-    Interval w;
-
-    for (iter_top(its,i); i.ok(); i++)
-       w.unite(i->width());
-    if (w.empty_b())
-       w.unite(Interval(0,0));
-    return w;
-}
-
-void
-PCol::clean_breakable_items()
-{
-    if (!line_l_) {
-       its.junk_links();
-    }
-    if (prebreak_p_) 
-       prebreak_p_->clean_breakable_items();
-    if (postbreak_p_) 
-       postbreak_p_->clean_breakable_items();
-}
 
 int
-PCol::rank_i() const
+Paper_column::rank_i() const
 {
-    return rank_i_;
+  return rank_i_;
 }
 
 void
-PCol::set_rank(int i)
+Paper_column::set_rank (int i)
 {
-    rank_i_ = i;
-    if (prebreak_p_)
-       prebreak_p_->rank_i_ = i;
-    if (postbreak_p_)
-       postbreak_p_->rank_i_ = i;
+  rank_i_ = i;
+  if (prebreak_l())
+    prebreak_l()->rank_i_ = i;
+  if (postbreak_l())
+    postbreak_l()->rank_i_ = i;
 }
 
 void
-PCol::print() const
+Paper_column::do_print() const
 {
 #ifndef NPRINT
-    mtor << "PCol {";
-
-    mtor << "rank: " << rank_i_ << '\n';
-
-    mtor << "# symbols: " << its.size() ;
-    if (breakable_b()){
-       mtor << "\npre,post: ";
-       prebreak_p_->print();
-       postbreak_p_->print();
-    } else if (daddy_l_) {
-       mtor<<'\n' << ((this == daddy_l_->prebreak_p_) ?
-                      "prebreak" : "postbreak");
-       mtor << '\n';
+  DOUT << "rank: " << rank_i_ << '\n';
+  if (prebreak_l())
+    {
+      DOUT << "\npre: ";
+      prebreak_l()->print();
+    }
+  if (postbreak_l()) 
+    {
+      DOUT << "post: ";
+      postbreak_l()->print();
+    } 
+  if (break_status_i_)
+    {
+      DOUT <<'\n' << ((break_status_i_ == -1)? "prebreak" : "postbreak");
+      DOUT << '\n';
     }
-    mtor << "extent: " << width().str() << "\n";
-    mtor << "}\n";
+  DOUT << "extent: " << width().str () << "\n";
 #endif 
 }
 
 int
-PCol::compare(PCol const &c1, PCol const &c2)
+Paper_column::compare (Paper_column const &c1, Paper_column const &c2)
 {
-    return c1.rank_i() - c2.rank_i();
+  return c1.rank_i() - c2.rank_i ();
 }
 
-void
-PCol::OK() const
+Paper_column*
+Paper_column::prebreak_l() const
 {
-#ifndef NDEBUG
-    if (prebreak_p_ || postbreak_p_ ) {
-       assert(prebreak_p_&&postbreak_p_);
-       assert(prebreak_p_->daddy_l_ == this);
-       assert(postbreak_p_->daddy_l_ == this);
-    }
-#endif
+  return (Paper_column*)broken_to_drul_[LEFT];
 }
 
-void
-PCol::set_breakable()
+Paper_column*
+Paper_column::postbreak_l() const
 {
-    if (breakable_b())
-       return;
-
-    prebreak_p_ = new PCol(this);
-    postbreak_p_ = new PCol(this);
-    prebreak_p_->pscore_l_ = pscore_l_;
-    postbreak_p_->pscore_l_ = pscore_l_;
+  return(Paper_column*) broken_to_drul_[RIGHT];
 }
-
 bool
-PCol::breakpoint_b() const
+Paper_column::breakpoint_b() const
 {
-    return !line_l_;
+  return !line_l_;
 }
 
-bool
-PCol::breakable_b() const
+Paper_column::Paper_column()
 {
-    return prebreak_p_||postbreak_p_;
+  used_b_ = false;
+  error_mark_b_ = false;
+  line_l_=0;
+  rank_i_ = -1;
 }
 
-PCol::PCol(PCol *parent)
+Line_of_score*
+Paper_column::line_l() const
 {
-    used_b_ = false;
-    error_mark_b_ = false;
-    daddy_l_ = parent;
-    prebreak_p_=0;
-    postbreak_p_=0;
-    line_l_=0;
-    hpos = -1.0;
-    pscore_l_ = 0;
-    rank_i_ = -1;
+  return line_l_;
 }
 
-PCol::~PCol()
+bool
+Paper_column::used_b() const
 {
-    delete prebreak_p_;
-    delete postbreak_p_;       
+  return linked_b();
 }
 
-void
-PCol::add( Item *i)
-{
-    its.bottom().add(i);
-    i->pcol_l_ = this; 
-}
+IMPLEMENT_IS_TYPE_B1(Paper_column, Horizontal_group_item);
 
-bool
-PCol::used_b()const
-{
-    return breakable_b() || its.size()|| used_b_;
-}