From: fred <fred>
Date: Sun, 24 Mar 2002 19:54:10 +0000 (+0000)
Subject: lilypond-0.1.9
X-Git-Tag: release/1.5.59~4095
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=28b58515a41ede4890b3e78319a04196cd0d88d1;p=lilypond.git

lilypond-0.1.9
---

diff --git a/lily/p-col.cc b/lily/p-col.cc
index 69813e8a7e..9e5be11664 100644
--- a/lily/p-col.cc
+++ b/lily/p-col.cc
@@ -14,40 +14,41 @@
 Interval
 PCol::width() const
 {
-    Interval w;
+  Interval w;
 
-    for (iter_top (its,i); i.ok(); i++)
+  for (iter_top (its,i); i.ok(); i++)
 	w.unite (i->width());
-    if (w.empty_b())
+  if (w.empty_b())
 	w.unite (Interval (0,0));
-    return w;
+  return w;
 }
 
 void
 PCol::clean_breakable_items()
 {
-    if (!line_l_) {
+  if (!line_l_) 
+    {
 	its.junk_links();
     }
-    if (prebreak_p_) 
+  if (prebreak_p_) 
 	prebreak_p_->clean_breakable_items();
-    if (postbreak_p_) 
+  if (postbreak_p_) 
 	postbreak_p_->clean_breakable_items();
 }
 
 int
 PCol::rank_i() const
 {
-    return rank_i_;
+  return rank_i_;
 }
 
 void
 PCol::set_rank (int i)
 {
-    rank_i_ = i;
-    if (prebreak_p_)
+  rank_i_ = i;
+  if (prebreak_p_)
 	prebreak_p_->rank_i_ = i;
-    if (postbreak_p_)
+  if (postbreak_p_)
 	postbreak_p_->rank_i_ = i;
 }
 
@@ -55,36 +56,42 @@ void
 PCol::print() const
 {
 #ifndef NPRINT
-    DOUT << "PCol {";
+  DOUT << "PCol {";
 
-    DOUT << "rank: " << rank_i_ << '\n';
+  DOUT << "rank: " << rank_i_ << '\n';
 
-    DOUT << "# symbols: " << its.size() ;
-    if (breakable_b()){
-	DOUT << "\npre,post: ";
-	prebreak_p_->print();
-	postbreak_p_->print();
-    } else if (daddy_l_) {
+  DOUT << "# symbols: " << its.size() ;
+     if (prebreak_p_){
+        DOUT << "\npre: ";
+        prebreak_p_->print();
+    }
+    if (postbreak_p_) {
+      DOUT << "post: ";
+      postbreak_p_->print();
+    } 
+  else if (daddy_l_) 
+    {
 	DOUT <<'\n' << ((this == daddy_l_->prebreak_p_) ?
 		       "prebreak" : "postbreak");
 	DOUT << '\n';
     }
-    DOUT << "extent: " << width().str () << "\n";
-    DOUT << "}\n";
+  DOUT << "extent: " << width().str () << "\n";
+  DOUT << "}\n";
 #endif 
 }
 
 int
 PCol::compare (PCol const &c1, PCol const &c2)
 {
-    return c1.rank_i() - c2.rank_i ();
+  return c1.rank_i() - c2.rank_i ();
 }
 
 void
 PCol::OK() const
 {
 #ifndef NDEBUG
-    if (prebreak_p_ || postbreak_p_) {
+  if (prebreak_p_ || postbreak_p_) 
+    {
 	assert (prebreak_p_&&postbreak_p_);
 	assert (prebreak_p_->daddy_l_ == this);
 	assert (postbreak_p_->daddy_l_ == this);
@@ -95,63 +102,63 @@ PCol::OK() const
 void
 PCol::set_breakable()
 {
-    if (breakable_b())
+  if (breakable_b())
 	return;
 
-    do_set_breakable();
-    prebreak_p_->pscore_l_ = pscore_l_;
-    postbreak_p_->pscore_l_ = pscore_l_;
+  do_set_breakable();
+  prebreak_p_->pscore_l_ = pscore_l_;
+  postbreak_p_->pscore_l_ = pscore_l_;
 
-    prebreak_p_->daddy_l_ = postbreak_p_->daddy_l_ = this;
+  prebreak_p_->daddy_l_ = postbreak_p_->daddy_l_ = this;
 }
 void
 PCol::do_set_breakable()
 {
-     prebreak_p_ = new PCol;
-    postbreak_p_ = new PCol;
+   prebreak_p_ = new PCol;
+  postbreak_p_ = new PCol;
 }
   
 
 bool
 PCol::breakpoint_b() const
 {
-    return !line_l_;
+  return !line_l_;
 }
 
 bool
 PCol::breakable_b() const
 {
-    return prebreak_p_||postbreak_p_;
+  return prebreak_p_||postbreak_p_||daddy_l_;
 }
 
 PCol::PCol()
 {
-    used_b_ = false;
-    error_mark_b_ = false;
-    daddy_l_ = 0;
-    prebreak_p_=0;
-    postbreak_p_=0;
-    line_l_=0;
-    hpos_f_ = -1.0;
-    pscore_l_ = 0;
-    rank_i_ = -1;
+  used_b_ = false;
+  error_mark_b_ = false;
+  daddy_l_ = 0;
+  prebreak_p_=0;
+  postbreak_p_=0;
+  line_l_=0;
+  hpos_f_ = -1.0;
+  pscore_l_ = 0;
+  rank_i_ = -1;
 }
 
 PCol::~PCol()
 {
-    delete prebreak_p_;
-    delete postbreak_p_;
+  delete prebreak_p_;
+  delete postbreak_p_;
 }
 
 void
 PCol::add (Item *i)
 {
-    its.bottom().add (i);
-    i->pcol_l_ = this; 
+  its.bottom().add (i);
+  i->pcol_l_ = this; 
 }
 
 bool
 PCol::used_b()const
 {
-    return daddy_l_ || breakable_b() || its.size ()|| used_b_;
+  return daddy_l_ || breakable_b() || its.size ()|| used_b_;
 }