release: 1.1.0

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 8593add91051b63d930fb3428bbcfa50f54b0495..5ce8b04cd9da58278e23d4ddeca6d13df577af04 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -13,8 +13,6 @@
 #include "paper-def.hh"
 #include "debug.hh"
 #include "lookup.hh"
-#include "ps-lookup.hh"
-#include "tex-lookup.hh"
 #include "assoc-iter.hh"
 #include "score-engraver.hh"
 #include "p-score.hh"
@@ -22,6 +20,9 @@
 #include "main.hh"
 #include "scope.hh"
 #include "dictionary-iter.hh"
+#include "file-results.hh" // urg? header_global_p
+#include "paper-outputter.hh"
+#include "paper-stream.hh"
 
 Paper_def::Paper_def ()
 {
@@ -45,7 +46,7 @@ Paper_def::Paper_def (Paper_def const&s)
   lookup_p_assoc_p_ = new Assoc<int, Lookup*>;
   for (Assoc_iter<int, Lookup*> ai(*s.lookup_p_assoc_p_); ai.ok (); ai++)
     {
-      Lookup * l = global_lookup_l->lookup_p (*ai.val ());
+      Lookup * l = new Lookup (*ai.val ());
       l->paper_l_ = this;
       set_lookup (ai.key(), l);
     }
@@ -209,35 +210,113 @@ Paper_def::lookup_l (int i) const
 
 IMPLEMENT_IS_TYPE_B1 (Paper_def, Music_output_def);
 
-String
-Paper_def::ps_output_settings_str () const
+int Paper_def::default_count_i_ = 0;
+
+int
+Paper_def::get_next_default_count () const
 {
-  String s ("\n ");
-  for (Dictionary_iter<Identifier*> i (*scope_p_); i.ok (); i++)
-    s += String ("/mudelapaper") + i.key () 
-      + "{" + i.val ()->str () + "} bind def\n";
-  s +=  *scope_p_->elem ("pssetting")->access_String ();
-  return s;
+  return default_count_i_ ++;
 }
 
-String
-Paper_def::tex_output_settings_str () const
+//urg
+extern char const* lily_version_number_sz ();
+
+void
+output_def (Paper_outputter* p, String key, String val)
+{
+  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);
+}
+
+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_String_identifier ())
+       continue;
+      
+      String val = *i.val()->access_String_identifier ()->data_p_;
+      output_def (p, i.key (), val);
+    }
+}
+
+void
+Paper_def::output_settings (Paper_outputter* p) const
 {
-  String s ("\n ");
   for (Dictionary_iter<Identifier*> i (*scope_p_); i.ok (); i++)
-    s += String ("\\def\\mudelapaper") + i.key () 
-      + "{" + i.val ()->str () + "}\n";
-  s +=  *scope_p_->elem ("texsetting")->access_String ();
-  return s;
+    output_def (p, String ("mudelapaper") + i.key (), i.val ()->str ());
+  p->output_string (*scope_p_->elem (String (output_global_ch) + "setting")->access_String ());
 }
 
-int Paper_def::default_count_i_ = 0;
+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);
 
-int
-Paper_def::get_next_default_count () const
+  output_header (p, header_global_p);
+  p->output_comment (_ ("outputting Score, defined at: "));
+  p->output_comment (origin_str);
+
+  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_scheme (scm);
+
+  scm =
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("header-end"), SCM_EOL)));
+
+  p->output_scheme (scm);
+
+  return p;
+}
+
+Paper_stream*
+Paper_def::paper_stream_p () const
 {
-  return default_count_i_ ++;
+  String outname = base_output_str ();
+
+  if (outname != "-")
+    outname += String (".") + output_global_ch;
+  *mlog << _f ("Paper output to %s...", 
+              outname == "-" ? String ("<stdout>") : outname ) << endl;
+  target_str_global_array.push (outname);
+  return new Paper_stream (outname);
 }
 
 
+String
+Paper_def::base_output_str () const
+{
+  String str = get_default_output ();
+
+  if (str.empty_b ())
+    {
+      str = default_outname_base_global;
+      int def = get_next_default_count ();
+      if (def)
+       str += "-" + to_str (def);
+    }
+  return str;
+}