]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/paper-outputter.cc
* lily/paper-score.cc (process): Do not show progress newline.
[lilypond.git] / lily / paper-outputter.cc
index 8540ae1efbd1cf83514eb6acb61f4855db91d83b..809b8dbd78946c1e8790fcee4c6b616e38dc5165 100644 (file)
 
 #include "array.hh"
 #include "dimensions.hh"
+#include "file-name.hh"
 #include "font-metric.hh"
 #include "input-smob.hh"
 #include "lily-guile.hh"
 #include "lily-version.hh"
 #include "ly-module.hh"
 #include "main.hh"
+#include "output-def.hh"
 #include "paper-book.hh"
-#include "paper-def.hh"
-#include "paper-line.hh"
 #include "paper-outputter.hh"
+#include "paper-system.hh"
 #include "scm-hash.hh"
 #include "stencil.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 
+#include "ly-smobs.icc"
 
-Paper_outputter::Paper_outputter (String filename)
+
+Paper_outputter::Paper_outputter (String filename, String format)
 {
-  if (safe_global_b)
-    scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T);      
+  file_ = SCM_EOL;
+  output_module_ = SCM_EOL;
+  smobify_self ();
   
+  filename_ = filename;
   file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()),
                         scm_makfrom0str ("w"));
 
-  String module_name = "scm output-" + output_format_global;
-  if (safe_global_b)
-    {
-      /* In safe mode, start from a GUILE safe-module and import
-        all symbols from the output module.  */
-      scm_c_use_module ("ice-9 safe");
-      SCM msm = scm_primitive_eval (ly_symbol2scm ("make-safe-module"));
-      output_module_ = scm_call_0 (msm);
-      ly_import_module (output_module_,
-                       scm_c_resolve_module (module_name.to_str0 ()));
-    }
-  else
-    output_module_ = scm_c_resolve_module (module_name.to_str0 ());
-  
-  /* FIXME: output-lib should be module, that can be imported.  */
-#define IMPORT_LESS 1 // only import the list of IMPORTS
-#if IMPORT_LESS
-  scm_c_use_module ("lily");
-  scm_c_use_module ("ice-9 regex");
-  scm_c_use_module ("srfi srfi-1");
-  scm_c_use_module ("srfi srfi-13");
-#endif
-  char const *imports[] = {
-    "lilypond-version",          /* from lily */
-    "ly:output-def-scope",
-    "ly:gulp-file",
-    "ly:number->string",
-    "ly:ragged-page-breaks",
-    "ly:optimal-page-breaks",
-    
-    "ly:number-pair->string",    /* output-lib.scm */
-    "ly:numbers->string",
-    "ly:inexact->string",
-    
-    "assoc-get",
-#if IMPORT_LESS        
-    "remove",                    /* from srfi srfi-1 */
-    "string-index",              /* from srfi srfi-13 */
-    "string-join",
-    "regexp-substitute/global",  /* from (ice9 regex) */
-#endif 
-    0,
-  };
-      
-  for (int i = 0; imports[i]; i++)
-    {
-      SCM s = ly_symbol2scm (imports[i]);
-      scm_module_define (output_module_, s, scm_primitive_eval (s));
-    }
-#ifndef IMPORT_LESS  // rather crude, esp for safe-mode let's not
-  SCM m = scm_set_current_module (output_module_);
-  /* not present in current module*/
-  scm_c_use_module ("ice-9 regex");
-  scm_c_use_module ("srfi srfi-13");
-  /* Need only a few of these, see above
-     scm_c_use_module ("lily"); */
-  scm_set_current_module (m);
-#endif
+  String module_name = "scm output-" + format;
+  output_module_ = scm_c_resolve_module (module_name.to_str0 ());
 }
 
 Paper_outputter::~Paper_outputter ()
 {
-  scm_close_port (file_);
-  file_ = SCM_EOL;
 }
 
-void
-Paper_outputter::output_scheme (SCM scm)
+
+IMPLEMENT_SMOBS (Paper_outputter);
+IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter);
+
+SCM
+Paper_outputter::mark_smob (SCM x)
 {
-  scm_display (scm_eval (scm, output_module_), file_);
+  Paper_outputter *p = (Paper_outputter*) SCM_CELL_WORD_1(x);
+  scm_gc_mark (p->output_module_);
+  return p->file_;
 }
 
-void
-Paper_outputter::output_metadata (Paper_def *paper, SCM scopes)
+int
+Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*)
 {
-  SCM fields = SCM_EOL;
-  for (int i = dump_header_fieldnames_global.size (); i--; )
-    fields
-      = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
-                fields);
-  output_scheme (scm_list_n (ly_symbol2scm ("output-scopes"),
-                            paper->self_scm (),
-                            ly_quote_scm (scopes),
-                            ly_quote_scm (fields),
-                            scm_makfrom0str (basename_.to_str0 ()), 
-                            SCM_UNDEFINED));
+  (void) x;
+  scm_puts ("#<Paper_outputter>", p);
+  return 1;
 }
 
-void
-Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count,
-                               bool is_classic)
+SCM
+Paper_outputter::dump_string (SCM scm)
 {
-  String creator = gnu_lilypond_version_string ();
-  creator += " (http://lilypond.org)";
-  time_t t (time (0));
-  String time_stamp = ctime (&t);
-  time_stamp = time_stamp.left_string (time_stamp.length () - 1)
-    + " " + *tzname;
-  output_scheme (scm_list_n (ly_symbol2scm ("header"),
-                            scm_makfrom0str (creator.to_str0 ()),
-                            scm_makfrom0str (time_stamp.to_str0 ()),
-                            paper->self_scm (),
-                            scm_int2num (page_count),
-                            ly_bool2scm (is_classic),
-                            SCM_UNDEFINED));
-
-  output_metadata (paper, scopes);
-  output_music_output_def (paper);
-
-  output_scheme (scm_list_1 (ly_symbol2scm ("header-end")));
-
-  /* TODO: maybe have Scheme extract the fonts directly from \paper ?
-          
-     Alternatively, we could simply load the fonts on demand in the
-     output, and do away with this define-fonts step.  */
-  SCM fonts = paper->font_descriptions ();
-  output_scheme (scm_list_3 (ly_symbol2scm ("define-fonts"),
-                            paper->self_scm (),
-                            //FIXME:
-                            ly_quote_scm (ly_list_qsort_uniq_x (fonts))));
+  return scm_display (scm, file_);
 }
 
-void
-Paper_outputter::output_line (SCM line, Offset *origin, bool is_last)
+SCM
+Paper_outputter::scheme_to_string (SCM scm)
 {
-  Paper_line *pl = unsmob_paper_line (line);
-  Offset dim = pl->dim ();
-  if (dim[Y_AXIS] > 50 CM)
-    {
-      programming_error ("Improbable system height.");
-      dim[Y_AXIS] = 50 CM;
-    }
-
-  output_scheme (scm_list_3 (ly_symbol2scm ("start-system"),
-                            ly_quote_scm (ly_offset2scm (*origin)),
-                            ly_quote_scm (ly_offset2scm (dim))));
+  return scm_eval (scm, output_module_);
+}
 
-  for (SCM s = pl->stencils (); is_pair (s); s = ly_cdr (s))
-    output_expr (unsmob_stencil (ly_car (s))->get_expr (), Offset (0, 0));
+void
+Paper_outputter::output_scheme (SCM scm)
+{
+  dump_string (scheme_to_string (scm));
+}
 
-  output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"),
-                            ly_bool2scm (is_last)));
+LY_DEFINE (ly_paper_outputter_dump, "ly:paper-outputter-dump",
+          2, 0, 0, (SCM outputter, SCM arg),
+          "Dump ARG on OUTPUTTER\n.")
+{
+  Paper_outputter *po = unsmob_outputter (outputter);
+  SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
+  po->output_scheme (arg);
+  return SCM_UNSPECIFIED;
+}
 
-  (*origin)[Y_AXIS] += dim[Y_AXIS];
+void
+Paper_outputter::output_stencil (Stencil stil)
+{
+  ly_interpret_stencil (stil.expr (),
+                       ly_scheme_function ("ly:paper-outputter-dump"),
+                       smobify_self (),
+                       ly_offset2scm (Offset (0, 0)));
 }
 
+Paper_outputter *
+get_paper_outputter (String outname, String f) 
+{
+  progress_indication (_f ("paper output to `%s'...",
+                          outname == "-" ? String ("<stdout>") : outname));
+  return new Paper_outputter (outname, f);
+}
 
-void
-Paper_outputter::output_music_output_def (Music_output_def* odef)
+/* FIXME: why is output_* wrapper called dump?  */
+LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil",
+          2, 0, 0, (SCM outputter, SCM stencil),
+          "Dump stencil @var{expr} onto @var{outputter}.")
 {
-  output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"),
-                            odef->self_scm (), SCM_UNDEFINED));
+  Paper_outputter *po = unsmob_outputter (outputter);
+  Stencil *st = unsmob_stencil (stencil);
+  SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
+  SCM_ASSERT_TYPE (st, stencil, SCM_ARG1, __FUNCTION__, "Paper_outputter");
+  po->output_stencil (*st);
+  return SCM_UNSPECIFIED;
 }
 
-/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil  */
-void
-Paper_outputter::output_expr (SCM expr, Offset o)
+LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string",
+          2, 0, 0, (SCM outputter, SCM str),
+          "Dump @var{str} onto @var{outputter}.")
 {
-  while (1)
-    {
-      if (!is_pair (expr))
-       return;
+  Paper_outputter *po = unsmob_outputter (outputter);
+  SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
+  SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter");
   
-      SCM head =ly_car (expr);
-      if (unsmob_input (head))
-       {
-         Input * ip = unsmob_input (head);
-      
-         output_scheme (scm_list_n (ly_symbol2scm ("define-origin"),
-                                    scm_makfrom0str (ip->file_string ().to_str0 ()),
-                                    scm_int2num (ip->line_number ()),
-                                    scm_int2num (ip->column_number ()),
-                                    SCM_UNDEFINED));
-         expr = ly_cadr (expr);
-       }
-      else  if (head ==  ly_symbol2scm ("no-origin"))
-       {
-         output_scheme (scm_list_n (head, SCM_UNDEFINED));
-         expr = ly_cadr (expr);
-       }
-      else if (head == ly_symbol2scm ("translate-stencil"))
-       {
-         o += ly_scm2offset (ly_cadr (expr));
-         expr = ly_caddr (expr);
-       }
-      else if (head == ly_symbol2scm ("combine-stencil"))
-       {
-         output_expr (ly_cadr (expr), o);
-         expr = ly_caddr (expr);
-       }
-      else
-       {
-         output_scheme (scm_list_n (ly_symbol2scm ("placebox"),
-                                    scm_make_real (o[X_AXIS]),
-                                    scm_make_real (o[Y_AXIS]),
-                                    expr,
-                                    SCM_UNDEFINED));
-         return;
-       }
-    }
+  return po->dump_string (str);
 }
-