* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 13635df3d1ddd178e5f499b6466802545549aa31..0e585afa5e644fe0be8f98d151c885e5d3dfdc13 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -3,13 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "input.hh"
 #include "input-smob.hh"
+
 #include "string.hh"
+
 #include "ly-smobs.icc"
 
 /* Dummy input location for use if real one is missing.  */
@@ -70,38 +71,6 @@ unsmob_input (SCM s)
     return 0;                                  
 }
 
-/* We don't use IMPLEMENT_TYPE_P, since the smobification part is
-   implemented separately from the class.  */
-LY_DEFINE (ly_input, "ly:input-location?", 1, 0, 0,
-          (SCM x),
-          "Return #t if @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}.\n")
-{
-  Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  SCM_ASSERT_TYPE (is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string");
-
-  String m = ly_scm2string (msg);
-  ip->message (m);
-
-  return SCM_UNDEFINED;
-}
-
-LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip),
-         "Return input location in @var{sip} as (filename line column).")
-{
-  Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  return scm_list_3 (scm_makfrom0str (ip->file_string ().to_str0 ()),
-                    scm_int2num (ip->line_number ()),
-                    scm_int2num (ip->column_number ()));
-}
 
 ADD_SCM_INIT_FUNC (input, start_input_smobs);