release: 1.3.28

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index ef983e80539069e8b1115411e0839cc8a4749fad..6bd6e33e0507530b68c9ffeed23e343ef72bb4ec 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "main.hh"
@@ -21,6 +21,7 @@
 #include "paper-outputter.hh"
 #include "file-results.hh"
 #include "misc.hh"
+#include "all-font-metrics.hh"
 
 Paper_score::Paper_score ()
 {
@@ -48,8 +49,11 @@ Paper_score::typeset_element (Score_element * elem_p)
 {
   elem_p->pscore_l_ = this;
 
-  SCM_CDR(element_smob_list_) = gh_cons (elem_p->self_scm_,
-                                        SCM_CDR (element_smob_list_));
+  gh_set_cdr_x(element_smob_list_,
+              gh_cons (elem_p->self_scm_, gh_cdr (element_smob_list_)));
+  elem_p->set_elt_property ("full-name",
+                           gh_str02scm((char*)elem_p->name()));
+  
   scm_unprotect_object (elem_p->self_scm_);
 }
 
@@ -71,10 +75,10 @@ Paper_score::print () const
   DEBUG_OUT << "Paper_score { ";
   DEBUG_OUT << "\n elements: ";
 
-  for (SCM p = SCM_CDR (element_smob_list_);
+  for (SCM p = gh_cdr (element_smob_list_);
        p != SCM_EOL;
-       p = SCM_CDR(p))
-    gh_display (SCM_CAR(p));
+       p = gh_cdr(p))
+    gh_display (gh_car (p));
   DEBUG_OUT << "}\n";
 #endif
 }
@@ -106,68 +110,81 @@ Paper_score::calc_breaking ()
 void
 Paper_score::process ()
 {
-  Dictionary<int> type_stats;
-  type_stats["Item"] =0;
-  type_stats["Spanner"] =0;
-  type_stats["Total"]=0;
-
   print ();
-  *mlog << _ ("Preprocessing elements...") << " " << flush;
+  progress_indication (_ ("Preprocessing elements...") + " ");
   line_l_->breakable_col_processing ();
+  fixup_refpoints ();
   line_l_->pre_processing ();
   
-  *mlog << '\n' << _ ("Calculating column positions...") << " " << flush;
+  progress_indication ("\n" + _ ("Calculating column positions...") + " " );
   line_l_->space_processing ();
 
   Array<Column_x_positions> breaking = calc_breaking ();
+  line_l_->break_into_pieces (breaking);
 
-
-  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++)
+  for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s))
     {
-      Line_of_score *line_l = line_l_->set_breaking (breaking, i);
-      lines.push (line_l);
-      if (line_l != line_l_)
-       typeset_element (line_l);
+      Score_element *sc = unsmob_element (gh_car (s));
+      sc->do_break_processing ();
     }
+  for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s))
+    {
+      Score_element *sc = unsmob_element (gh_car (s));
+      sc->handle_broken_dependencies ();
+    }
+  
+  outputter_l_ = new Paper_outputter ;
+  outputter_l_->output_header ();
 
+  outputter_l_->output_version();
+  
+  if (header_global_p)
+    outputter_l_->output_scope (header_global_p, "mudela");
+  if (header_l_)
+    outputter_l_->output_scope (header_l_, "mudela");
 
-  *mlog << "\n";
-  *mlog << _ ("Line ... ");
-  line_l_->break_processing ();
-  for (int i=0; i < lines.size (); i++)
-    {
-      *mlog << '[' << flush;
-      
-      Line_of_score *line_l = lines[i];
-
-      line_l->post_processing ();
-      *mlog << i << flush;
-      line_l->output_all (i + 1 == lines.size());
-      *mlog << ']' << flush;
-     }
+  outputter_l_->output_comment (_ ("Outputting Score, defined at: "));
+  outputter_l_->output_comment (origin_str_);
+
+  if (paper_l_->scope_p_)
+    outputter_l_->output_scope (paper_l_->scope_p_, "mudelapaper");
   
-  // huh?
-  delete outputter_l_;
-  delete paper_stream_p;
-  outputter_l_ = 0;
+  SCM scm = gh_list (ly_symbol2scm ("experimental-on"), SCM_UNDEFINED);
+  outputter_l_->output_scheme (scm);
+  scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
+  outputter_l_->output_scheme (scm);
 
 
   /*
-    todo: sort output
+    This is tricky: we have to put the font definitions before the
+    actual output, but we don't know all fonts in advanced: generating
+    the output might trigger loading of a new font.  So we store the
+    place to insert the font definitions, generate the output and then
+    insert the definitions
+    
    */
-  if (experimental_features_global_b)
-    {
-      for (Dictionary_iter<int> i(type_stats); i.ok(); i++)
-       {
-         *mlog << i.key () << ": " << i.val () << " objects\n";
-       }
-    }
-  *mlog << '\n' << flush;
-      
+  SCM before_output = outputter_l_->last_cons_;
+  
+
+  fixup_refpoints ();
+  line_l_->output_lines ();
+
+
+  SCM font_names = ly_quote_scm (all_fonts_global_p->font_descriptions ());
+  gh_set_cdr_x (before_output,
+               gh_cons  (gh_list (ly_symbol2scm ("define-fonts"),
+                                  font_names,
+                                  SCM_UNDEFINED),
+                         gh_cdr (before_output)));
+  
+  Paper_stream* psp = paper_l_->paper_stream_p ();
+  outputter_l_->dump_onto (psp);
+  // huh?
+  delete outputter_l_;
+  
+  outputter_l_ = 0;
+  delete psp;
+  
 }
 
 Link_array<Item>
@@ -196,3 +213,18 @@ Paper_score::broken_col_range (Item const*l, Item const*r) const
 
   return ret;
 }
+
+
+void
+Paper_score::fixup_refpoints ()
+{
+  for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s))
+    {
+      SCM e = gh_car (s);
+      if (SMOB_IS_TYPE_B(Score_element, e))
+       {
+         Score_element * se = unsmob_element (e);
+         se->fixup_refpoint ();
+       }
+    }
+}