Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / lily / include / input.hh

diff --git a/lily/include/input.hh b/lily/include/input.hh
index f7224ec7d342f8fcd000f9be53b875e98fe262d5..94e00527a22395a62d3fb3391f7982f29cf849f5 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,14 +3,13 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INPUT_HH
 #define INPUT_HH
 
-#include "flower-proto.hh"
-#include "std-string.hh"
+#include "lily-proto.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -52,4 +51,12 @@ public:
   Input ();
 };
 
+
+#include "smobs.hh"
+
+SCM make_input (Input spot);
+Input *unsmob_input (SCM);
+
+extern Input dummy_input_global;
+
 #endif // INPUT_HH