* lily/rest.cc (y_offset_callback): only use direction if

[lilypond.git] / lily / input-scheme.cc

diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index 5bfed5c60d7f8adc5637806b4d73720aa3860234..a13ca876e7998431653c8e4f6b16eac62292e8c6 100644 (file)
--- a/lily/input-scheme.cc
+++ b/lily/input-scheme.cc
@@ -3,10 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "string.hh"
+#include "std-string.hh"
 #include "input-smob.hh"
 
 /* We don't use IMPLEMENT_TYPE_P, since the smobification part is
@@ -28,7 +28,7 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM
 
   msg = scm_simple_format (SCM_BOOL_F, msg, rest);
 
-  String m = ly_scm2string (msg);
+  string m = ly_scm2string (msg);
   ip->message (m);
 
   return SCM_UNSPECIFIED;
@@ -40,9 +40,9 @@ LY_DEFINE (ly_input_file_line_column, "ly:input-file-line-char-column", 1, 0, 0,
   Input *ip = unsmob_input (sip);
   SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
 
-  int l, ch, col; 
+  int l, ch, col;
   ip->get_counts (&l, &ch, &col);
-  return scm_list_4 (scm_makfrom0str (ip->file_string ().to_str0 ()),
+  return scm_list_4 (scm_makfrom0str (ip->file_string ().c_str ()),
                     scm_from_int (l),
                     scm_from_int (ch),
                     scm_from_int (col));
@@ -53,7 +53,7 @@ LY_DEFINE (ly_input_both_locations, "ly:input-both-locations", 1, 0, 0, (SCM sip
 {
   Input *ip = unsmob_input (sip);
   SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  return scm_list_5 (scm_makfrom0str (ip->file_string ().to_str0 ()),
+  return scm_list_5 (scm_makfrom0str (ip->file_string ().c_str ()),
                     scm_from_int (ip->line_number ()),
                     scm_from_int (ip->column_number ()),
                     scm_from_int (ip->end_line_number ()),