release: 1.1.18

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index c94fe3e8d9389112f87654ca5b0e68d4d218fb0c..e347d9d96490d9609fed45d8052a4442364de9bb 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -8,12 +8,10 @@
 
 #include <math.h>
 #include "string.hh"
-#include "assoc.hh"
 #include "misc.hh"
 #include "paper-def.hh"
 #include "debug.hh"
 #include "lookup.hh"
-#include "assoc-iter.hh"
 #include "score-engraver.hh"
 #include "p-score.hh"
 #include "identifier.hh"
@@ -26,25 +24,25 @@
 
 Paper_def::Paper_def ()
 {
-  lookup_p_assoc_p_ = new Assoc<int, Lookup*>;
+  lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
 }
 
 
 Paper_def::~Paper_def ()
 {
-  for (Assoc_iter<int, Lookup*> ai(*lookup_p_assoc_p_); ai.ok (); ai++)
+  for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
     {
       delete ai.val ();
     }
   
-  delete lookup_p_assoc_p_;
+  delete lookup_p_tab_p_;
 }
 
 Paper_def::Paper_def (Paper_def const&s)
   : Music_output_def (s)
 {
-  lookup_p_assoc_p_ = new Assoc<int, Lookup*>;
-  for (Assoc_iter<int, Lookup*> ai(*s.lookup_p_assoc_p_); ai.ok (); ai++)
+  lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
+  for (Hash_table_iter<int, Lookup*> ai(*s.lookup_p_tab_p_); ai.ok (); ai++)
     {
       Lookup * l = new Lookup (*ai.val ());
       l->paper_l_ = this;
@@ -102,7 +100,7 @@ Paper_def::duration_to_dist (Moment d,Real k) const
 
 
 /**
-  Get the measure wide constant for arithmetic.
+  Get the measure wide constant for arithmetic spacing.
 
   @see
   John S. Gourlay. ``Spacing a Line of Music,'' Technical Report
@@ -122,22 +120,15 @@ Paper_def::arithmetic_spacing (Moment d ,Real k) const
   return (log_2 (d) + k)* get_var ("arithmetic_multiplier");
 }
 
-Real
-Paper_def::geometric_spacing (Moment d) const
-{
-  Real dur_f = (d) ?pow (get_var ("geometric"), log_2 (d)) : 0;
-  return get_var ("basicspace") + get_var ("unitspace")  * dur_f;
-}
-
 void
 Paper_def::set_lookup (int i, Lookup*l)
 {
-  if (lookup_p_assoc_p_->elem_b (i))
+  if (lookup_p_tab_p_->elem_b (i))
     {
-      delete lookup_p_assoc_p_->elem (i);
+      delete lookup_p_tab_p_->elem (i);
     }
   l ->paper_l_ = this;
-  (*lookup_p_assoc_p_)[i] = l;
+  (*lookup_p_tab_p_)[i] = l;
 }
 
 Real
@@ -192,7 +183,7 @@ Paper_def::print () const
   Music_output_def::print ();
   DOUT << "Paper {";
 
-  for (Assoc_iter<int, Lookup*> ai(*lookup_p_assoc_p_); ai.ok (); ai++)
+  for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
     {
       DOUT << "Lookup: " << ai.key () ;
       ai.val ()->print ();
@@ -205,10 +196,10 @@ Paper_def::print () const
 Lookup const *
 Paper_def::lookup_l (int i) const
 {
-  return (*lookup_p_assoc_p_)[i];
+  return (*lookup_p_tab_p_)[i];
 }
 
-IMPLEMENT_IS_TYPE_B1 (Paper_def, Music_output_def);
+
 
 int Paper_def::default_count_i_ = 0;
 
@@ -218,77 +209,40 @@ Paper_def::get_next_default_count () const
   return default_count_i_ ++;
 }
 
-//urg
-extern char const* lily_version_number_sz ();
-
 void
-output_def (Paper_outputter* p, String key, String val)
+Paper_def::reset_default_count()
 {
-  SCM args_scm =
-    gh_cons (gh_str02scm (key.ch_l ()), gh_cons (gh_str02scm (val.ch_l ()), SCM_EOL));
-  SCM scm =
-    ly_append (ly_lambda_o (),
-    ly_list1 (ly_append (ly_func_o ("lily-def"), args_scm)));
-  p->output_scheme (scm);
+  default_count_i_ = 0;
 }
 
-void
-output_header (Paper_outputter* p, Scope *head)
-{
-  if (!head)
-    return;
-
-  String id_str = "Lily was here";
-  if (no_timestamps_global_b)
-    id_str += ".";
-  else
-    id_str += String (", ") + lily_version_number_sz ();
-  output_def (p, "lily_id_string", id_str);
-  
-  for (Dictionary_iter<Identifier*> i (*head); i.ok (); i++)
-    {
-      if (!i.val ()->access_content_String (false))
-       continue;
-      
-      String val = *i.val()->access_content_String (false);
-      output_def (p, i.key (), val);
-    }
-}
-
-void
-Paper_def::output_settings (Paper_outputter* p) const
-{
-  for (Dictionary_iter<Identifier*> i (*scope_p_); i.ok (); i++)
-    output_def (p, String ("mudelapaper") + i.key (), i.val ()->str ());
-  p->output_string (*scope_p_->elem (String (output_global_ch) + "setting")->access_content_String (false));
-}
+extern char const* lily_version_number_sz ();
 
 Paper_outputter*
 Paper_def::paper_outputter_p (Paper_stream* os_p, Header* header_l, String origin_str) const
 {
   Paper_outputter* p = new Paper_outputter (os_p);
 
-  output_header (p, header_global_p);
-#if 0
   // for now; breaks -fscm output
   p->output_comment (_ ("outputting Score, defined at: "));
   p->output_comment (origin_str);
-#endif
-
-  output_header (p, header_l);
-
-  output_settings (p);
 
-  SCM scm =
-    ly_append (ly_lambda_o (),
-    ly_list1 (ly_append (ly_func_o ("experimental-on"), SCM_EOL)));
+  p->output_version();
+  if (header_global_p)
+    p->output_scope (header_global_p, "mudela");
+  if (header_l)
+    p->output_scope (header_l, "mudela");
+  if (scope_p_)
+    p->output_scope (scope_p_, "mudelapaper");
+  
+  if (output_global_ch == String("tex"))
+    {
+      *p->outstream_l_ << *scope_p_->elem ("texsetting")->access_content_String (false);
+    }
+  
 
+  SCM scm = gh_list (ly_symbol ("experimental-on"), SCM_UNDEFINED);
   p->output_scheme (scm);
-
-  scm =
-    ly_append (ly_lambda_o (),
-    ly_list1 (ly_append (ly_func_o ("header-end"), SCM_EOL)));
-
+  scm = gh_list (ly_symbol ("header-end"), SCM_UNDEFINED);
   p->output_scheme (scm);
 
   return p;
@@ -302,7 +256,8 @@ Paper_def::paper_stream_p () const
   if (outname != "-")
     outname += String (".") + output_global_ch;
   *mlog << _f ("Paper output to %s...", 
-              outname == "-" ? String ("<stdout>") : outname ) << endl;
+              outname == "-" ? String ("<stdout>") : outname) << endl;
+
   target_str_global_array.push (outname);
   return new Paper_stream (outname);
 }