Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index ead1b749e25dcc2df4eafcd3397d96d6cb630cc6..e3bc5d275d8f90907351184820cf01091c4cf971 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,19 +1,21 @@
-/*   
-  input-smob.cc --  implement Input smob
-  
+/*
+  input-smob.cc -- implement Input smob
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "input.hh"
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "input-smob.hh"
-#include "string.hh"
+
+#include "std-string.hh"
+
 #include "ly-smobs.icc"
 
-static long input_tag;
+/* Dummy input location for use if real one is missing.  */
+Input dummy_input_global;
 
+static long input_tag;
 
 static
 SCM mark_smob (SCM)
@@ -24,53 +26,48 @@ 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.c_str (), port);
   return 1;
 }
 
-static
-scm_sizet free_smob (SCM s)
+static size_t
+free_smob (SCM s)
 {
   delete unsmob_input (s);
   return 0;
 }
 
-static
-void start_input_smobs()
+static void
+start_input_smobs ()
 {
-  input_tag
-    = scm_make_smob_type_mfpe ("input", 0,
-                              mark_smob, free_smob,
-                              print_smob, 0);
+  input_tag = scm_make_smob_type ("input", 0);
+  scm_set_smob_mark (input_tag, mark_smob);
+  scm_set_smob_free (input_tag, free_smob);
+  scm_set_smob_print (input_tag, print_smob);
+  scm_set_smob_equalp (input_tag, 0);
 }
 
 SCM
 make_input (Input ip)
 {
-  Input * nip =  new Input (ip);
+  Input *nip = new Input (ip);
   SCM z;
-  
-  SCM_NEWCELL(z);
-  SCM_SETCAR (z, (SCM)input_tag);
-  SCM_SETCDR (z, (SCM)nip);
-                               // fixme: done_malloc
+
+  SCM_NEWSMOB (z, input_tag, nip);
   return z;
 }
 
-Input *                                                
+Input *
 unsmob_input (SCM s)
 {
   if (SCM_IMP (s))
     return 0;
-  if ((long)SCM_CAR(s) == input_tag) // ugh.
-    return (Input*) SCM_CDR(s);
-  else                                         
-    return 0;                                  
+  if (SCM_CAR (s) == (SCM)input_tag) // ugh.
+    return (Input *) SCM_CDR (s);
+  else
+    return 0;
 }
 
+ADD_SCM_INIT_FUNC (input, start_input_smobs);
 
-ADD_SCM_INIT_FUNC(input, start_input_smobs);
-
-
-Input dummy_input_global;