patch::: 1.0.15.jcn3: guilig atoom

[lilypond.git] / lily / ps-outputter.cc

diff --git a/lily/ps-outputter.cc b/lily/ps-outputter.cc
index d0ad70ef39045c954d357af0b5a73dc3328238b2..06597cda87e7adcdf7304b3251834d7ef988e885 100644 (file)
--- a/lily/ps-outputter.cc
+++ b/lily/ps-outputter.cc
@@ -14,6 +14,8 @@
 #include "array.hh"
 #include "string-convert.hh"
 #include "debug.hh"
+#include "lookup.hh"
+#include "main.hh"
 
 Ps_outputter::Ps_outputter (Paper_stream *s)
   :Paper_outputter (s)
@@ -62,7 +64,39 @@ Ps_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
   if (check_debug)
     *outstream_l_ << String ("\n%start: ") << nm << "\n";
 
+#if 0
   Paper_outputter::output_molecule (m, o, nm, "% % {%}placebox \n");
+#else
+  String s = "% % {%}placebox \n";
+
+  if (check_debug)
+    *outstream_l_ << String ("\n%start: ") << nm << "\n";
+
+  for (PCursor <Atom*> i (m->atoms_); i.ok (); i++)
+    {
+      Offset a_off = i->offset ();
+      a_off += o;
+
+      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()));
+      if (i->lambda_)
+        {
+         gh_call1 (i->lambda_, gh_eval_str ("'ps"));
+         // char* c = gh_scm2newstr (gh_call1 (i->lambda_, gh_eval_str ("'ps")), NULL);
+         // a.push (String (c));
+         // free (c);
+       }
+      else
+       a.push (i->str_);
+      r += global_lookup_l->substitute_args (s, a);
+      *outstream_l_ << r;
+    }
+#endif
 }
 
 void