X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=ce4bc59a0bd19346156606c54d60e1ca8629a63d;hb=722c6964353630deed172f199b674280ebc24061;hp=65c4e384d73c6842c401def99bf9aac270262325;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 65c4e384d7..ce4bc59a0b 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -22,7 +22,9 @@
 #include "scm-hash.hh"
 #include "lily-version.hh"
 #include "paper-def.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
+#include "ly-modules.hh"
+
 
 
 /*
@@ -35,11 +37,14 @@ Paper_outputter::Paper_outputter (String name)
       gh_define ("security-paranoia", SCM_BOOL_T);      
     }
   
-  file_ = scm_open_file (ly_str02scm (name.ch_C()),
-			    ly_str02scm ("w"));
-  
+  file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()),
+			    scm_makfrom0str ("w"));
+
+  /*
+    ugh.
+   */
   SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"),
-			ly_str02scm (output_format_global.ch_C()),
+			scm_makfrom0str (output_format_global.to_str0 ()),
 			SCM_UNDEFINED);
 
   output_func_  = scm_primitive_eval (exp);
@@ -47,26 +52,29 @@ Paper_outputter::Paper_outputter (String name)
 
 Paper_outputter::~Paper_outputter ()
 {
-  
+  scm_close_port (file_);
+  file_ = SCM_EOL;
 }
 
 
 void
 Paper_outputter::output_header ()
 {
-  String       generate = _ (", at ");
   time_t t (time (0));
-  generate += ctime (&t);
-  generate = generate.left_str (generate.length_i () - 1);
+  String generate = ctime (&t);
+  generate = generate.left_string (generate.length () - 1) + " " + *tzname;
   
-  /*
-    Make fixed length time stamps
-   */
-  generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0)  ;
-  String creator = "lelie";
+  /* Fixed length time stamp */
+  generate = generate + to_string (' ', (50 - generate.length ()) >? 0);
   
-  SCM args_scm = scm_list_n (ly_str02scm (creator.ch_C ()),
-			     ly_str02scm (generate.ch_C ()), SCM_UNDEFINED);
+  /* Fixed length creator string */
+  String creator = gnu_lilypond_version_string ();
+  creator += " (http://lilypond.org)";
+  creator = creator + to_string (' ', (50 - creator.length ()) >? 0);
+  
+  SCM args_scm = scm_list_n (scm_makfrom0str (creator.to_str0 ()),
+			     scm_makfrom0str (generate.to_str0 ()),
+			     SCM_UNDEFINED);
 
 
   SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm);
@@ -80,7 +88,7 @@ void
 Paper_outputter::output_comment (String str)
 {
   output_scheme (scm_list_n (ly_symbol2scm ("comment"),
-			  ly_str02scm ((char*)str.ch_C ()),
+			  scm_makfrom0str ((char*)str.to_str0 ()),
 			  SCM_UNDEFINED)
 		 );
 }
@@ -92,9 +100,12 @@ Paper_outputter::output_scheme (SCM scm)
 }
 
 void
-Paper_outputter::output_scope (Scheme_hash_table *scope, String prefix)
+Paper_outputter::output_scope (SCM mod, String prefix)
 {
-  SCM al = scope->to_alist ();
+  if (!SCM_MODULEP (mod))
+    return ;
+  
+  SCM al = ly_module_to_alist (mod);
   for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
     {
       SCM k = ly_caar (s);
@@ -119,11 +130,11 @@ Paper_outputter::output_scope (Scheme_hash_table *scope, String prefix)
 void
 Paper_outputter::output_version ()
 {
-  String id_str = "Lily was here";
-  id_str += String_convert::pad_to (String (", ") + version_str (), 40);
+  String id_string = "Lily was here";
+  id_string += String_convert::pad_to (String (", ") + version_string (), 40);
 
-  output_String_def ("lilypondtagline", id_str);
-  output_String_def ("LilyPondVersion", version_str ());
+  output_String_def ("lilypondtagline", id_string);
+  output_String_def ("LilyPondVersion", version_string ());
   output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT));  
 }
 
@@ -133,8 +144,8 @@ Paper_outputter::output_Real_def (String k, Real v)
 {
   
   SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
-			ly_str02scm (k.ch_l ()),
-			ly_str02scm (to_str (v).ch_l ()),
+			scm_makfrom0str (k.get_str0 ()),
+			scm_makfrom0str (to_string (v).get_str0 ()),
 			SCM_UNDEFINED);
   output_scheme (scm);
 }
@@ -144,8 +155,8 @@ Paper_outputter::output_String_def (String k, String v)
 {
   
   SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
-		     ly_str02scm (k.ch_l ()),
-		     ly_str02scm (v.ch_l ()),
+		     scm_makfrom0str (k.get_str0 ()),
+		     scm_makfrom0str (v.get_str0 ()),
 		     SCM_UNDEFINED);
   output_scheme (scm);
 }
@@ -154,8 +165,8 @@ void
 Paper_outputter::output_int_def (String k, int v)
 {
   SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
-		     ly_str02scm (k.ch_l ()),
-		     ly_str02scm (to_str (v).ch_l ()),
+		     scm_makfrom0str (k.get_str0 ()),
+		     scm_makfrom0str (to_string (v).get_str0 ()),
 		     SCM_UNDEFINED);
   output_scheme (scm);
 }
@@ -164,21 +175,22 @@ void
 Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value)
 {
   output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"),
-			     ly_str02scm (filename.ch_C()),
+			     scm_makfrom0str (filename.to_str0 ()),
 			     ly_quote_scm (key), value,
 			     SCM_UNDEFINED));
 }
 
 void
-Paper_outputter::write_header_fields_to_file (Scheme_hash_table * header)
+Paper_outputter::write_header_fields_to_file (SCM mod)
 {
-  if (dump_header_fieldnames_global.size ())
+  if (ly_module_p (mod)&&
+      dump_header_fieldnames_global.size ())
     {
-      SCM fields = header->to_alist ();
+      SCM fields = ly_module_to_alist (mod);
       for (int i = 0; i < dump_header_fieldnames_global.size (); i++)
 	{
 	  String key = dump_header_fieldnames_global[i];
-	  SCM val = gh_assoc (ly_symbol2scm (key.ch_C ()), fields);
+	  SCM val = gh_assoc (ly_symbol2scm (key.to_str0 ()), fields);
 	  String s;
 	  /* Only write header field to file if it exists */
 	  if (gh_pair_p (val))