release: 1.3.2

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 97586318b4aecee06aea13e161892047c689dd40..9dd7d28729a0e156418e04608e0e9c5ee1e0fe69 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -80,8 +80,8 @@ Paper_outputter::output_header ()
     }
 
   SCM args_scm = 
-    gh_list (ly_ch_C_to_scm (creator.ch_l ()),
-            ly_ch_C_to_scm (generate.ch_l ()), SCM_UNDEFINED);
+    gh_list (ly_str02scm (creator.ch_l ()),
+            ly_str02scm (generate.ch_l ()), SCM_UNDEFINED);
 
 #ifndef NPRINT
   DEBUG_OUT << "output_header\n";
@@ -140,7 +140,7 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
       if (i->font_)
        {
          output_scheme (gh_list (ly_symbol ("select-font"),
-                                 ly_ch_C_to_scm (symbol_to_string (i->font_).ch_C()),
+                                 ly_str02scm (symbol_to_string (i->font_).ch_C()),
                                  SCM (i->magn_),
                                  SCM_UNDEFINED));
        }
@@ -241,7 +241,7 @@ Paper_outputter::output_font_def (int i, String str)
 {
   SCM scm = gh_list (ly_symbol ("font-def"),
                     gh_int2scm (i),
-                    ly_ch_C_to_scm (str.ch_l ()),
+                    ly_str02scm (str.ch_l ()),
                     SCM_UNDEFINED);
 
   output_scheme (scm);
@@ -252,8 +252,8 @@ Paper_outputter::output_Real_def (String k, Real v)
 {
   
   SCM scm = gh_list (ly_symbol ("lily-def"),
-                    ly_ch_C_to_scm (k.ch_l ()),
-                    ly_ch_C_to_scm (to_str(v).ch_l ()),
+                    ly_str02scm (k.ch_l ()),
+                    ly_str02scm (to_str(v).ch_l ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 
@@ -265,20 +265,20 @@ Paper_outputter::output_String_def (String k, String v)
 {
   
   SCM scm = gh_list (ly_symbol ("lily-def"),
-                    ly_ch_C_to_scm (k.ch_l ()),
-                    ly_ch_C_to_scm (v.ch_l ()),
+                    ly_str02scm (k.ch_l ()),
+                    ly_str02scm (v.ch_l ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 
-  gh_define (k.ch_l (), ly_ch_C_to_scm (v.ch_l ()));
+  gh_define (k.ch_l (), ly_str02scm (v.ch_l ()));
 }
 
 void
 Paper_outputter::output_int_def (String k, int v)
 {
   SCM scm = gh_list (ly_symbol ("lily-def"),
-                    ly_ch_C_to_scm (k.ch_l ()),
-                    ly_ch_C_to_scm (to_str (v).ch_l ()),
+                    ly_str02scm (k.ch_l ()),
+                    ly_str02scm (to_str (v).ch_l ()),
                     SCM_UNDEFINED);
   output_scheme (scm);