2003 -> 2004

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

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 0ea9b3664c434f87809e9b9a1c70e4835b6d7ec2..658b3067f852dbb3f8558eaf430d20bcf89430ee 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -23,8 +23,8 @@ SCM mark_smob (SCM)
 static int
 print_smob (SCM s, SCM port, scm_print_state *)
 {
-  String str = "#<location " +  unsmob_input (s)->location_str () + ">";
-  scm_puts (str.ch_C (), port);
+  String str = "#<location " +  unsmob_input (s)->location_string () + ">";
+  scm_puts (str.to_str0 (), port);
   return 1;
 }
 
@@ -39,21 +39,22 @@ free_smob (SCM s)
   We don't use IMPLEMENT_TYPE_P, since the smobification part is
   implemented separately from the class.
  */
-LY_DEFINE(ly_input_p, "ly-input-location?", 1, 0, 0,
+LY_DEFINE(ly_input, "ly:input-location?", 1, 0, 0,
          (SCM x),
          "Return whether @var{x} is an input location")
 {
   return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
 }
 
-LY_DEFINE(ly_input_message,  "ly-input-message", 2, 0, 0, (SCM sip, SCM msg),
-         "Print @var{msg} as a GNU compliant error message, pointing to the
-location in @var{sip}.")
+LY_DEFINE(ly_input_message,  "ly:input-message", 2, 0, 0, (SCM sip, SCM msg),
+         "Print @var{msg} as a GNU compliant error message, pointing to the\n"
+         "location in @var{sip}.\n"
+         )
 {
   Input *ip  = unsmob_input(sip);
   
   SCM_ASSERT_TYPE(ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  SCM_ASSERT_TYPE(gh_string_p(msg), msg, SCM_ARG2, __FUNCTION__, "string");
+  SCM_ASSERT_TYPE(gh_string_p (msg), msg, SCM_ARG2, __FUNCTION__, "string");
 
   String m = ly_scm2string (msg);
 
@@ -70,8 +71,6 @@ start_input_smobs ()
   scm_set_smob_free (input_tag, free_smob);
   scm_set_smob_print (input_tag, print_smob);
   scm_set_smob_equalp (input_tag, 0);
-
-  
 }
 
 SCM