X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=9e2b0978a6af3742b2754520dc6283401f30e793;hb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;hp=1e8d450c7b31b2969df751f4e66dbf555371b6c5;hpb=7fa94555679e3197028b1ab3fea02c374cd855da;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 1e8d450c7b..9e2b0978a6 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -7,6 +7,7 @@
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include <time.h>
 #include "paper-outputter.hh"
 #include "paper-stream.hh"
 #include "molecule.hh"
@@ -20,14 +21,58 @@
 Paper_outputter::Paper_outputter (Paper_stream *s)
 {
   outstream_l_ = s;
+  output_header ();
 }
 
 Paper_outputter::~Paper_outputter ()
 {
+  SCM scm =
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("end-output"), SCM_EOL)));
+
+  output_scheme (scm);
 }
 
 void
-Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm, String s)
+Paper_outputter::output_header ()
+{
+  String creator;
+  if (no_timestamps_global_b)
+    creator = "GNU LilyPond\n";
+  else
+    creator = get_version_str ();
+  String generate;
+  if (no_timestamps_global_b)
+    generate = ".";
+  else
+    {
+      generate = _ (", at ");
+      time_t t (time (0));
+      generate += ctime (&t);
+      //urg
+    }
+
+  SCM args_scm = 
+    gh_cons (gh_str02scm (creator.ch_l ()),
+    gh_cons (gh_str02scm (generate.ch_l ()), SCM_EOL));
+
+#ifndef NPRINT
+  DOUT << "output_header\n";
+  if (check_debug && !monitor->silent_b ("Guile"))
+    {
+      gh_display (args_scm); gh_newline ();
+    }
+#endif
+
+  SCM scm =
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("header"), args_scm)));
+
+  output_scheme (scm);
+}
+
+void
+Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
 {
   if (check_debug)
     *outstream_l_ << String ("\n%start: ") << nm << "\n";
@@ -37,15 +82,153 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm, St
       Offset a_off = i->offset ();
       a_off += o;
 
+      if (!i->lambda_)
+        {
+	  // urg
+	  i->lambda_ = 
+	    ly_append (ly_lambda_o (), 
+	    ly_list1 (ly_func_o ("empty")));
+	}
+
       switch_to_font (i->font_);
 
-      Array<String> a;
-      String r;
-  
-      a.push (global_lookup_l->print_dimen (a_off.y()));
-      a.push (global_lookup_l->print_dimen (a_off.x()));
-      a.push (i->str_);
-      r += global_lookup_l->substitute_args (s, a);
-      *outstream_l_ << r;
+#ifndef NPRINT
+      if (check_debug && !monitor->silent_b ("Guile"))
+	{
+	  gh_display (i->lambda_); gh_newline ();
+	}
+#endif
+
+      SCM args_scm = 
+	gh_cons (gh_double2scm (a_off.x ()), 
+	gh_cons (gh_double2scm (a_off.y ()), 
+	gh_cons (i->lambda_, SCM_EOL)));
+
+#ifndef NPRINT
+      if (check_debug && !monitor->silent_b ("Guile"))
+	{
+	  gh_display (args_scm); gh_newline ();
+	}
+#endif
+
+      SCM box_scm =
+	ly_append (ly_lambda_o (),
+	ly_list1 (ly_append (ly_func_o ("placebox"), args_scm)));
+
+      output_scheme (box_scm);
+    }
+}
+
+void
+Paper_outputter::output_comment (String str)
+{
+  // urg
+  *outstream_l_ << "% " << str << "\n";
+}
+
+
+void
+Paper_outputter::output_scheme (SCM scm)
+{
+  String o = String ("\'") + output_global_ch;
+#ifndef NPRINT
+  if (check_debug && !monitor->silent_b ("Guile"))
+    {
+      gh_display (scm); gh_newline ();
     }
+#endif
+  SCM str_scm = gh_call1 (ly_eval (scm), gh_eval_str (o.ch_l ()));
+  char* c = gh_scm2newstr (str_scm, NULL);
+#ifndef NPRINT
+  if (check_debug && !monitor->silent_b ("Guile"))
+    {
+      gh_display (str_scm); gh_newline ();
+    }
+#endif
+  *outstream_l_ << c;
+  free (c);
+}
+
+void
+Paper_outputter::output_string (String str)
+{
+  // urg
+  *outstream_l_ << str;
+}
+
+void
+Paper_outputter::switch_to_font (String fontname)
+{
+  if (fontname.length_i () && (fontname != current_font_))
+    {
+      current_font_ = fontname;
+      int i=0;
+      bool new_b = false;
+      for (; i< font_arr_.size (); i++)
+	if (font_arr_[i] == fontname)
+	  {
+	    new_b = true;
+	    break;
+	  }
+
+      if (new_b)
+	{
+	  font_arr_.push (fontname);
+	  output_font_def (i, fontname);
+	}
+      output_font_switch (i);
+    }
+  return;
+}
+
+void
+Paper_outputter::start_line ()
+{
+  SCM scm =
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("start-line"), SCM_EOL)));
+
+  output_scheme (scm);
+}
+
+/*
+   26 fonts ought to be enough for anyone.
+*/
+void
+Paper_outputter::output_font_def (int i, String str)
+{
+  //urg, broken with guile-1.3
+  //return;
+  SCM scm =
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("font-def"), 
+    gh_cons (gh_int2scm (i), gh_cons (gh_str02scm (str.ch_l ()), SCM_EOL)))));
+
+  output_scheme (scm);
+}
+
+void
+Paper_outputter::output_font_switch (int i)
+{
+  //urg, broken with guile-1.2, 1.3
+  //return;
+  SCM scm =
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("font-switch"), 
+    gh_cons (gh_int2scm (i), SCM_EOL))));
+
+  output_scheme (scm);
+}
+
+void
+Paper_outputter::stop_line ()
+{
+  SCM scm =
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("stop-line"), SCM_EOL)));
+
+  output_scheme (scm);
+
+  current_font_ = "";
+  font_arr_.clear ();
 }