release: 1.1.28

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

diff --git a/lily/p-score.cc b/lily/p-score.cc
index 901cfa48d2d7e22f4afeef88119192fdfa5d60c3..f7b4238de813b3a9a109178e72d999c89b499e40 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -17,22 +17,23 @@
 #include "p-col.hh"
 #include "p-score.hh"
 #include "p-col.hh"
-#include "header.hh"
+#include "scope.hh"
 #include "word-wrap.hh"
 #include "gourlay-breaking.hh"
 #include "paper-stream.hh"
-#include "ps-stream.hh"
-#include "tex-stream.hh"
 #include "paper-outputter.hh"
-#include "ps-outputter.hh"
-#include "tex-outputter.hh"
 #include "file-results.hh"
 #include "misc.hh"
 
+#if 1                  // has w32 advanced?
+                       // nope (cygwin-b20)
+
 // sucking Cygnus egcs - w32
 #include "list.tcc"
 #include "cursor.tcc"
 
+#endif
+
 Paper_score::Paper_score ()
 {
   outputter_l_ =0;
@@ -44,34 +45,6 @@ Paper_score::Paper_score ()
 
 Paper_score::~Paper_score ()
 {
-#if 0
-  for (int i=0; i< line_l_arr_.size (); i++)
-    line_l_arr_[i]->unlink_all ();
-
-  for (PCursor<Score_element*> i(elem_p_list_.top()); i.ok(); i++)
-    {
-
-      if (i->linked_b())
-       i->unlink ();
-      assert (! i->linked_b ());
-    }
-#endif
-}
-
-String
-Paper_score::base_output_str () const
-{
-  assert (paper_l_);
-  String str = paper_l_->get_default_output ();
-
-  if (str.empty_b ())
-    {
-      str = default_outname_base_global;
-      int def = paper_l_->get_next_default_count ();
-      if (def)
-       str += "-" + to_str (def);
-    }
-  return str;
 }
 
 void
@@ -147,38 +120,6 @@ Paper_score::find_col (Paper_column const *c) const
 }
 
 
-#if 0
-void
-Paper_score::set_breaking (Array<Column_x_positions> const &breaking)
-{
-  for (iter (span_p_list_.top (),i); i.ok  ();)
-    {
-      Spanner *span_p = i.remove_p ();
-      if (span_p->broken_b ()
-         || !((Score_element*)span_p)->line_l ())
-       {
-         span_p->unlink ();
-         delete span_p;
-       }
-      else 
-       {
-         typeset_broken_spanner (span_p);
-       }
-    }
-  for (iter (elem_p_list_.top (),i); i.ok  () ;)
-    {
-      Item *i_l =i->access_Item ();
-      if (i_l && !i_l->line_l ())
-       {
-         i_l->unlink ();
-         Score_element * item_p= i.remove_p ();
-         delete item_p;
-       }
-      else
-       i++;
-    }
-}
-#endif
 
 
 Array<Column_x_positions>
@@ -210,6 +151,8 @@ Paper_score::calc_breaking ()
   return sol;
 }
 
+
+
 void
 Paper_score::process ()
 {
@@ -224,8 +167,8 @@ Paper_score::process ()
 
   Array<Column_x_positions> breaking = calc_breaking ();
 
-  Paper_stream* pstream_p = paper_stream_p ();
-  outputter_l_ = paper_outputter_p (pstream_p);
+  Paper_stream* paper_stream_p = paper_l_->paper_stream_p ();
+  outputter_l_ = paper_l_->paper_outputter_p (paper_stream_p, header_l_, origin_str_);
 
   Link_array<Line_of_score> lines;
   for (int i=0; i < breaking.size (); i++)
@@ -249,13 +192,14 @@ Paper_score::process ()
       line_l->output_all ();
        *mlog << ']' << flush;
       remove_line (line_l);
-       
     }
-
+  
   // huh?
   delete outputter_l_;
-  delete pstream_p;
+  delete paper_stream_p;
   outputter_l_ = 0;
+
+  *mlog << '\n' << flush;
 }
 
 void
@@ -336,12 +280,17 @@ Paper_score::broken_col_range (Item const*l_item_l, Item const*r_item_l) const
   Item const*l=l_item_l;
   Item const*r=r_item_l;
 
-  while (! l->is_type_b(Paper_column::static_name ()))
-    l = l->axis_group_l_a_[X_AXIS]->access_Score_element ()->access_Item ();
-
-  while (! r->is_type_b(Paper_column::static_name ()))
-    r = r->axis_group_l_a_[X_AXIS]->access_Score_element ()->access_Item ();
-
+  // huh? see Item::left_right_compare ()
+  /*
+  while (! (dynamic_cast<Paper_column const *> (l)))
+    l = dynamic_cast<Item*> (l->axis_group_l_a_[X_AXIS]);
+
+  while (! (dynamic_cast<Paper_column const *> (r)))
+    r = dynamic_cast<Item*>(r->axis_group_l_a_[X_AXIS]);
+  */
+  l = l->column_l ();
+  r = r->column_l ();
+  
   PCursor<Paper_column*> start (l ? find_col ((Paper_column*)l)+1 : col_p_list_.top ());
   PCursor<Paper_column*> stop (r ? find_col ((Paper_column*)r) : col_p_list_.bottom ());