lilypond-0.0.65

diff --git a/lily/scoreline.cc b/lily/scoreline.cc
index d1837b4a679eed47d71e36124a7db226d459b2a3..c3edbdcc144ad42a470445aba79ec49bde9a6919 100644 (file)
--- a/lily/scoreline.cc
+++ b/lily/scoreline.cc
@@ -1,7 +1,7 @@
 /*
   scoreline.cc -- implement Line_of_score
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -16,47 +16,148 @@
 #include "p-score.hh"
 
 
+/* To do:
+   take out hard coded TeX stuff.
+   
+   */
 String
-Line_of_score::TeXstring() const
+Line_of_score::TeX_string() const
 {
-     String s("\\vbox{%<- line of score\n");
+     String s("\\hbox{%<- line of score\n");
      if (error_mark_b_)
         s+= "\\scorelineerrormark";
-     for (iter_top(staffs,sc); sc.ok(); sc++){
-        s += sc->TeXstring();
-        if ((sc+1).ok())
-            s+= "\\interstaffline\n";
+     
+     
+     Real lastpos = cols[0]->hpos;
+     for (int i=0; i < cols.size();  i++){
+        PCol* col_l= cols[i];
+        // all items in the current line & staff.
+        String chunk_str;
+        Real delta  = col_l->hpos - lastpos;
+           
+           
+        if (col_l->error_mark_b_) {
+            chunk_str += String("\\columnerrormark");
+        }
+        // now output the items.
+        for (iter_top(col_l->its,j); j.ok(); j++) {
+            chunk_str += j->TeX_string();
+        }
+        // spanners.
+        for (iter_top(col_l->starters,j); j.ok(); j++) {
+            if (j->name() != name())
+                chunk_str += j->TeX_string();
+        }
+        if (chunk_str!="") {
+            // moveover
+            if (delta)
+                s +=String( "\\kern ") + print_dimen(delta);
+            s += chunk_str;
+            lastpos = col_l->hpos;
+        }
      }
      s += "}";
      return s;
 }
 
 
-Line_of_score::Line_of_score(Array<PCol *> sv,
-                            PScore *ps)
+Line_of_score::Line_of_score()
 {
     error_mark_b_ = 0;
-    pscore_l_ = ps;
-    for (int i=0; i< sv.size(); i++) {
-       PCol *p=(PCol *) sv[i];
-       cols.bottom().add(p);
-       p->line_l_=this;
+}
+
+
+void
+Line_of_score::do_substitute_dependency(Score_elem*o, Score_elem*n)
+{
+    Spanner_elem_group::do_substitute_dependency(o,n);
+    
+    int i;
+    while ((i =line_arr_.find_i((Spanner_elem_group*)o->spanner())) >=0)
+       if (n)
+           line_arr_[i] = (Spanner_elem_group*)n->spanner();
+       else 
+           line_arr_.del(i);
+}
+
+
+void
+Line_of_score::do_post_processing()
+{
+    Real y_pos=0;
+    for (int i=line_arr_.size(); i--; ) {
+       Interval y = line_arr_[i]->height() ;
+       if (y.empty_b())
+           continue;
+       line_arr_[i]->translate(Offset(0, -y[-1] + y_pos));
+       y_pos += y.length();
     }
+    translate(Offset(0, -y_pos));
+}
+
+IMPLEMENT_STATIC_NAME(Line_of_score);
 
-    for (iter_top(pscore_l_->staffs,sc); sc.ok(); sc++)
-       staffs.bottom().add(new Line_of_staff(this, sc));    
+void
+Line_of_score::add_line(Spanner_elem_group*e)
+{
+    add_element(e);
+    line_arr_.push(e);
 }
-/* construct a line with the named columns. Make the line field
-    in each column point to this
-    
-    #sv# isn't really const!!
-    */
 
+bool
+Line_of_score::contains_b(PCol const* c)const
+{
+    return cols.find_l((PCol*)c);
+}
 
 void
-Line_of_score::process()
+Line_of_score::do_pre_processing()
 {
-    for (iter_top(staffs,i); i.ok(); i++)
-       i->process();
+    left_col_l_ = pscore_l_->cols.top();
+    right_col_l_ = pscore_l_->cols.bottom();
+    for (int i=0; i < line_arr_.size(); i++){
+       line_arr_[i]->left_col_l_ = left_col_l_;
+       line_arr_[i]->right_col_l_ = right_col_l_;
+    }
 }
+
+void
+Line_of_score::set_breaking(Array<Col_hpositions> const &breaking)
+{
+    for (int j=0; j < breaking.size(); j++) {
+       const Array<PCol*> &curline(breaking[j].cols);
+       const Array<PCol*> &errors(breaking[j].error_col_l_arr_);
+       const Array<Real> &config(breaking[j].config);
        
+       for (int i=0; i < errors.size(); i++)
+           errors[i]->error_mark_b_ = true;
+
+       Line_of_score *line_p = (Line_of_score*)clone();
+       for (int i=0; i < curline.size(); i++){
+           curline[i]->hpos = config[i];
+           curline[i]->line_l_ = (Line_of_score*)line_p;
+       }
+       ((Array<PCol*> &)line_p->cols) = curline;
+       line_p->left_col_l_ =  curline[0];
+       line_p->right_col_l_= curline.top();
+       pscore_l_->typeset_broken_spanner(line_p);
+       broken_into_l_arr_.push(line_p);
+    }
+}
+
+void
+Line_of_score::break_into_pieces()
+{
+    
+}
+
+Link_array<Line_of_score>
+Line_of_score::get_lines()const
+{
+    Link_array<Line_of_score> ret;
+    assert(broken_into_l_arr_.size());
+    for (int i=0; i < broken_into_l_arr_.size(); i++) {
+       ret.push((Line_of_score*)broken_into_l_arr_[i]);
+    }
+    return ret;
+}