``slikken kreng''

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 9c28f6dcc8dac8db4bf628ff6839dce95e1d36ae..9cbce394f695ed3f71770972ededd727d778678a 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -8,21 +8,18 @@
 */
 
 #include <time.h>
-
 #include <math.h>
 
-
 #include "dimensions.hh"
 #include "virtual-methods.hh"
 #include "paper-outputter.hh"
 #include "molecule.hh"
 #include "array.hh"
 #include "string-convert.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-metric.hh"
 #include "main.hh"
-#include "scope.hh"
-
+#include "scm-hash.hh"
 #include "lily-version.hh"
 #include "paper-def.hh"
 #include "file-results.hh"
@@ -38,11 +35,11 @@ Paper_outputter::Paper_outputter (String name)
       gh_define ("security-paranoia", SCM_BOOL_T);      
     }
   
-  file_ = scm_open_file (ly_str02scm (name.ch_C()),
+  file_ = scm_open_file (ly_str02scm (name.to_str0 ()),
                            ly_str02scm ("w"));
   
   SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"),
-                       ly_str02scm (output_format_global.ch_C()),
+                       ly_str02scm (output_format_global.to_str0 ()),
                        SCM_UNDEFINED);
 
   output_func_  = scm_primitive_eval (exp);
@@ -60,16 +57,16 @@ Paper_outputter::output_header ()
   String       generate = _ (", at ");
   time_t t (time (0));
   generate += ctime (&t);
-  generate = generate.left_str (generate.length_i () - 1);
+  generate = generate.left_string (generate.length () - 1);
   
   /*
     Make fixed length time stamps
    */
-  generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0)  ;
+  generate = generate + to_string (' ' * (120 - generate.length ())>? 0)  ;
   String creator = "lelie";
   
-  SCM args_scm = scm_list_n (ly_str02scm (creator.ch_C ()),
-                            ly_str02scm (generate.ch_C ()), SCM_UNDEFINED);
+  SCM args_scm = scm_list_n (ly_str02scm (creator.to_str0 ()),
+                            ly_str02scm (generate.to_str0 ()), SCM_UNDEFINED);
 
 
   SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm);
@@ -83,7 +80,7 @@ void
 Paper_outputter::output_comment (String str)
 {
   output_scheme (scm_list_n (ly_symbol2scm ("comment"),
-                         ly_str02scm ((char*)str.ch_C ()),
+                         ly_str02scm ((char*)str.to_str0 ()),
                          SCM_UNDEFINED)
                 );
 }
@@ -95,7 +92,7 @@ Paper_outputter::output_scheme (SCM scm)
 }
 
 void
-Paper_outputter::output_scope (Scope *scope, String prefix)
+Paper_outputter::output_scope (Scheme_hash_table *scope, String prefix)
 {
   SCM al = scope->to_alist ();
   for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
@@ -114,7 +111,7 @@ Paper_outputter::output_scope (Scope *scope, String prefix)
        }
       else if (gh_number_p (v))
        {
-         output_Real_def (prefix + s, gh_scm2double (v));        
+         output_Real_def (prefix + s, gh_scm2double (v));
        }
     }
 }
@@ -122,24 +119,23 @@ Paper_outputter::output_scope (Scope *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));  
 }
 
 
-
-
 void
 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_UNDEFINED);
+                       ly_str02scm (k.get_str0 ()),
+                       ly_str02scm (to_string (v).get_str0 ()),
+                       SCM_UNDEFINED);
   output_scheme (scm);
 }
 
@@ -148,8 +144,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 ()),
+                    ly_str02scm (k.get_str0 ()),
+                    ly_str02scm (v.get_str0 ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 }
@@ -158,8 +154,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 ()),
+                    ly_str02scm (k.get_str0 ()),
+                    ly_str02scm (to_string (v).get_str0 ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 }
@@ -168,13 +164,13 @@ 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()),
+                            ly_str02scm (filename.to_str0 ()),
                             ly_quote_scm (key), value,
                             SCM_UNDEFINED));
 }
 
 void
-Paper_outputter::write_header_fields_to_file (Scope * header)
+Paper_outputter::write_header_fields_to_file (Scheme_hash_table * header)
 {
   if (dump_header_fieldnames_global.size ())
     {
@@ -182,7 +178,7 @@ Paper_outputter::write_header_fields_to_file (Scope * header)
       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))