]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/paper-outputter.cc
(ly_bookpaper_fonts): move from Paperdef
[lilypond.git] / lily / paper-outputter.cc
index 009eb381e147d2863f8075d1c20e04b3bec02d30..318784259e4e49695e0bdf63acf6bec74e749ae9 100644 (file)
 #include <math.h>
 #include <time.h>
 
+#include "book-paper-def.hh"
 #include "array.hh"
 #include "dimensions.hh"
 #include "font-metric.hh"
-#include "input-file-results.hh"
 #include "input-smob.hh"
 #include "lily-guile.hh"
 #include "lily-version.hh"
 #include "ly-module.hh"
 #include "main.hh"
+#include "page.hh"
 #include "paper-book.hh"
 #include "paper-def.hh"
 #include "paper-line.hh"
 #include "paper-outputter.hh"
+#include "file-name.hh"
 #include "scm-hash.hh"
 #include "stencil.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 
+// JUNKME
+extern SCM stencil2line (Stencil* stil, bool is_title = false);
 
 Paper_outputter::Paper_outputter (String filename)
 {
-  if (safe_global_b)
-    scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T);      
-  
+  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
+  output_module_ = scm_c_resolve_module (module_name.to_str0 ());
 }
 
 Paper_outputter::~Paper_outputter ()
@@ -110,23 +56,30 @@ Paper_outputter::output_scheme (SCM scm)
 }
 
 void
-Paper_outputter::output_metadata (Paper_def *paper, SCM scopes)
+Paper_outputter::output_metadata (Book_paper_def *paper, SCM scopes)
 {
   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);
+
+  File_name file_name (filename_);
+  file_name.ext_ = "";
+  String basename = file_name.to_string ();
   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_makfrom0str (basename.to_str0 ()), 
                             SCM_UNDEFINED));
 }
 
 void
-Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count,
+Paper_outputter::output_header (Book_paper_def * bookpaper,
+                               
+                               SCM scopes,
+                               int page_count,
                                bool is_classic)
 {
   String creator = gnu_lilypond_version_string ();
@@ -138,103 +91,80 @@ Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count,
   output_scheme (scm_list_n (ly_symbol2scm ("header"),
                             scm_makfrom0str (creator.to_str0 ()),
                             scm_makfrom0str (time_stamp.to_str0 ()),
-                            paper->self_scm (),
+                            bookpaper->self_scm (), // FIXME.
                             scm_int2num (page_count),
                             ly_bool2scm (is_classic),
                             SCM_UNDEFINED));
 
-  output_metadata (paper, scopes);
-  output_music_output_def (paper);
-
+  output_metadata (bookpaper, scopes);
+  output_scheme (scm_list_2 (ly_symbol2scm ("define-fonts"),
+                            bookpaper->self_scm ()));
   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))));
 }
 
 void
 Paper_outputter::output_line (SCM line, Offset *origin, bool is_last)
 {
-  Paper_line *pl = unsmob_paper_line (line);
-  Offset dim = pl->dim ();
+  Paper_line *p = unsmob_paper_line (line);
+  Offset dim = p->dim ();
   if (dim[Y_AXIS] > 50 CM)
     {
-      programming_error ("Improbable system height.");
+      programming_error (to_string ("Improbable line height: %f",
+                                   dim[Y_AXIS]));
       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))));
 
-  for (SCM s = pl->stencils (); is_pair (s); s = ly_cdr (s))
-    output_expr (unsmob_stencil (ly_car (s))->get_expr (), Offset (0, 0));
+  
+  output_stencil (p->to_stencil ());
 
+  (*origin)[Y_AXIS] += dim[Y_AXIS];
   output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"),
                             ly_bool2scm (is_last)));
+}
 
-  (*origin)[Y_AXIS] += dim[Y_AXIS];
+void
+Paper_outputter::output_page (Page *p, bool is_last)
+{
+  Stencil page_stencil =  p->to_stencil ();
+  output_scheme (scm_list_1 (ly_symbol2scm ("start-page")));
+  output_scheme (scm_list_3 (ly_symbol2scm ("start-system"),
+                            ly_quote_scm (ly_offset2scm (Offset (0, 0))),
+                            ly_quote_scm (ly_offset2scm (Offset (0, 0)))));
+
+  
+  output_stencil (page_stencil);
+
+  output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), SCM_BOOL_T));
+  output_scheme (scm_list_2 (ly_symbol2scm ("stop-page"),
+                            ly_bool2scm (is_last
+                                         && !unsmob_stencil (p->footer_))));
 }
 
 void
-Paper_outputter::output_music_output_def (Music_output_defodef)
+Paper_outputter::output_music_output_def (Music_output_def *odef)
 {
-  output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"),
-                            odef->self_scm (), SCM_UNDEFINED));
+  output_scheme (scm_list_2 (ly_symbol2scm ("output-paper-def"),
+                             odef->self_scm ()));
 }
 
-/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil  */
+
 void
-Paper_outputter::output_expr (SCM expr, Offset o)
+paper_outputter_dump (void * po, SCM x)
 {
-  while (1)
-    {
-      if (!is_pair (expr))
-       return;
-  
-      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;
-       }
-    }
+  Paper_outputter * me = (Paper_outputter*) po;
+  me->output_scheme (x);
+}
+
+
+void
+Paper_outputter::output_stencil (Stencil stil)
+{
+   interpret_stencil_expression (stil.expr (), paper_outputter_dump,
+                         (void*) this, Offset (0,0));
 }