X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsource-file.cc;h=90bc5fcabde4a01ecfd8d0e6a55e09d8aa1621f5;hb=4cdb295f6624000f0c5a2b7aaa5570a081661d94;hp=4415e8dad70978c15fef06b31c2f6cd6791f7a2b;hpb=8f5cd22af76fcb5c77853a5ede8b94ebef97caef;p=lilypond.git

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 4415e8dad7..90bc5fcabd 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
@@ -138,9 +138,9 @@ Source_file::Source_file (string filename_string)
 void
 Source_file::init_port ()
 {
-  SCM str = scm_makfrom0str (c_str ());
+  SCM str = scm_from_locale_string (c_str ());
   str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, __FUNCTION__);
-  scm_set_port_filename_x (str_port_, scm_makfrom0str (name_.c_str ()));
+  scm_set_port_filename_x (str_port_, ly_string2scm (name_));
 }
 
 
@@ -188,7 +188,7 @@ Source_file::quote_input (char const *pos_str0) const
   string context = line.substr (0, ch)
     + to_string ('\n')
     + to_string (' ', col)
-    + line.substr (ch, line.length()-ch);
+    + line.substr (ch, line.length ()-ch);
   return context;
 }
 
@@ -365,9 +365,9 @@ Source_file::get_port () const
 
 #include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS(Source_file);
-IMPLEMENT_DEFAULT_EQUAL_P(Source_file);
-IMPLEMENT_TYPE_P(Source_file, "ly:source-file?");
+IMPLEMENT_SMOBS (Source_file);
+IMPLEMENT_DEFAULT_EQUAL_P (Source_file);
+IMPLEMENT_TYPE_P (Source_file, "ly:source-file?");
 
 SCM
 Source_file::mark_smob (SCM smob)