release: 1.2.7

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index c221cbb2dd9b394fd67dcf2eeb27b07ac075d718..e0565ab7b0d680951e494b8e7074d0f909b3e614 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -30,36 +30,37 @@ Paper_outputter::Paper_outputter (Paper_stream *s)
 {
   outstream_l_ = s;
   output_header ();
+
+  if (output_global_ch == String ("scm"))
+    *outstream_l_->os << ""
+      "(primitive-load-path 'lily.scm)\n"
+      "(eval (tex-scm 'all-definitions))\n"
+      ";(eval (ps-scm 'all-definitions))\n"
+      "(display (map (lambda (x) (string-append (eval x) \"\\n\")) '(\n"
+    ;
 }
 
 Paper_outputter::~Paper_outputter ()
 {
   SCM scm = gh_list (ly_symbol ("end-output"), SCM_UNDEFINED);
   output_scheme (scm);
+
+  if (String (output_global_ch) == "scm")
+    {
+      *outstream_l_->os << ")))";
+    }
 }
 
 void
 Paper_outputter::output_header ()
 {
-#if 0
-  int gobble = 10000;
-  {// alloc big chunk of memory.
-    SCM beg = SCM_EOL;
-    String bigstr = String_convert::char_str (' ', 50);
-    for (int i = gobble; i--; )
-      {
-       beg = gh_cons (gh_str02scm (bigstr.ch_C()), beg);
-      }
-  }
-#endif
-  
   if (safe_global_b)
     {
       ly_set_scm ("security-paranoia", SCM_BOOL_T);
-      //      gh_eval_str ("(set! security-paranoia #t)");
+      //      ly_ch_C_eval_scm ("(set! security-paranoia #t)");
     }
   String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))";
-  gh_eval_str (s.ch_C());
+  ly_ch_C_eval_scm (s.ch_C ());
   
   String creator;
   if (no_timestamps_global_b)
@@ -79,18 +80,18 @@ Paper_outputter::output_header ()
     }
 
   SCM args_scm = 
-    gh_list (gh_str02scm (creator.ch_l ()),
-            gh_str02scm (generate.ch_l ()), SCM_UNDEFINED);
+    gh_list (ly_ch_C_to_scm (creator.ch_l ()),
+            ly_ch_C_to_scm (generate.ch_l ()), SCM_UNDEFINED);
 
 #ifndef NPRINT
   DOUT << "output_header\n";
-  if (check_debug && !monitor->silent_b ("Guile"))
+  if (check_debug && !lily_monitor->silent_b ("Guile"))
     {
       gh_display (args_scm); gh_newline ();
     }
 #endif
 
-  SCM scm = gh_cons (ly_symbol ("header"), args_scm);
+  SCM scm = gh_cons (header_scm_sym, args_scm);
   output_scheme (scm);
 }
 
@@ -115,23 +116,37 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
     {
       Atom * i = ptr->car_;
 #endif
+#if 0
+    }
+#endif      
       Offset a_off = i->off_;
       a_off += o;
 
       if (!i->func_)
        continue; 
 
-      assert (a_off.length () < 100 CM);
+      if (a_off.length () > 100 CM)
+       {
+         warning (_f("Improbable offset for object type `%s\'", nm));
+         Axis a  =X_AXIS;
+         while (a < NO_AXES)
+           {
+             if (abs(a_off[a]) > 50 CM)
+               a_off[a] = 50 CM;
+             incr (a);
+           }
+       }
        
       if (i->font_)
        {
          output_scheme (gh_list (ly_symbol ("select-font"),
-                                 gh_str02scm (symbol_to_string (i->font_).ch_C()),
+                                 ly_ch_C_to_scm (symbol_to_string (i->font_).ch_C()),
+                                 SCM (i->magn_),
                                  SCM_UNDEFINED));
        }
 
       SCM box_scm
-       = gh_list (ly_symbol ("placebox"),
+       = gh_list (placebox_scm_sym,
                   gh_double2scm (a_off.x ()),
                   gh_double2scm (a_off.y ()),
                   SCM(i->func_),
@@ -160,24 +175,8 @@ Paper_outputter::output_scheme (SCM scm)
 {
   if (String (output_global_ch) == "scm")
     {
-      static SCM port = 0;
-
-      // urg
-      if (!port)
-        {
-         int fd = 1;
-         ofstream * of = dynamic_cast<ofstream*> (outstream_l_->os);
-         if (of)
-           fd = of->rdbuf()->fd();
-         FILE *file = fdopen (fd, "a");
-         port = scm_standard_stream_to_port (file, "a", "");
-         scm_display (gh_str02scm ("(load 'lily.scm)\n"), port);
-       }
-
-      scm_display (gh_str02scm ("("), port);
-      scm_write (scm, port);
-      scm_display (gh_str02scm (")\n"),port);
-      scm_fflush (port);
+      SCM result =  scm_eval (scm_listify (ly_symbol ("scm->string"), ly_quote_scm (scm), SCM_UNDEFINED));
+    *outstream_l_->os << ly_scm2string (result)        << endl;
     }
   else
     {
@@ -223,13 +222,17 @@ Paper_outputter::output_version ()
     id_str += ".";
   else
     id_str += String (", ") + version_str ();
-  output_String_def ( "LilyIdString", id_str);
+
+  output_String_def ( "mudelatagline", id_str);
+  output_String_def ( "LilyPondVersion", version_str ());
 }
 
 void
-Paper_outputter::start_line ()
+Paper_outputter::start_line (Real height)
 {
-  SCM scm = gh_list (ly_symbol ("start-line"), SCM_UNDEFINED);
+  SCM scm = gh_list (ly_symbol ("start-line"),
+                    gh_double2scm (height),
+                    SCM_UNDEFINED);
   output_scheme (scm);
 }
 
@@ -238,7 +241,7 @@ Paper_outputter::output_font_def (int i, String str)
 {
   SCM scm = gh_list (ly_symbol ("font-def"),
                     gh_int2scm (i),
-                    gh_str02scm (str.ch_l ()),
+                    ly_ch_C_to_scm (str.ch_l ()),
                     SCM_UNDEFINED);
 
   output_scheme (scm);
@@ -249,8 +252,8 @@ Paper_outputter::output_Real_def (String k, Real v)
 {
   
   SCM scm = gh_list (ly_symbol ("lily-def"),
-                    gh_str02scm (k.ch_l ()),
-                    gh_str02scm (to_str(v).ch_l ()),
+                    ly_ch_C_to_scm (k.ch_l ()),
+                    ly_ch_C_to_scm (to_str(v).ch_l ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 
@@ -262,20 +265,20 @@ Paper_outputter::output_String_def (String k, String v)
 {
   
   SCM scm = gh_list (ly_symbol ("lily-def"),
-                    gh_str02scm (k.ch_l ()),
-                    gh_str02scm (v.ch_l ()),
+                    ly_ch_C_to_scm (k.ch_l ()),
+                    ly_ch_C_to_scm (v.ch_l ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 
-  gh_define (k.ch_l (), gh_str02scm (v.ch_l ()));
+  gh_define (k.ch_l (), ly_ch_C_to_scm (v.ch_l ()));
 }
 
 void
 Paper_outputter::output_int_def (String k, int v)
 {
   SCM scm = gh_list (ly_symbol ("lily-def"),
-                    gh_str02scm (k.ch_l ()),
-                    gh_str02scm (to_str (v).ch_l ()),
+                    ly_ch_C_to_scm (k.ch_l ()),
+                    ly_ch_C_to_scm (to_str (v).ch_l ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 
@@ -290,3 +293,10 @@ Paper_outputter::stop_line ()
   SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED);
   output_scheme (scm);
 }
+
+void
+Paper_outputter::stop_last_line ()
+{
+  SCM scm = gh_list (ly_symbol ("stop-last-line"), SCM_UNDEFINED);
+  output_scheme (scm);
+}