lilypond-0.0.46.jcn1

diff --git a/lily/include/input-score.hh b/lily/include/input-score.hh
index 36baf691c989ccb4f76956886418e88e28e46abd..a55b7a43782183985b8832b24fbf741ea083115e 100644 (file)
--- a/lily/include/input-score.hh
+++ b/lily/include/input-score.hh
@@ -14,12 +14,11 @@
 #include "proto.hh"
 #include "plist.hh"
 #include "string.hh"
-
+#include "input.hh"
 
 /// the total music def of one movement
-struct Input_score {
-    /// defined where?    
-    char const * defined_ch_C_;
+class Input_score : public Input {
+public:
     int errorlevel_i_;
     
     /// paper_, staffs_ and commands_ form the problem definition.
@@ -35,7 +34,7 @@ struct Input_score {
     void add(Input_staff*);
     ~Input_score();
     /// construction
-    void set(Paper_def*);
+    void set(Paper_def* paper_p);
     void set(Midi_def* midi_p);
     void print() const;
     Score*parse();

diff --git a/lily/include/input.hh b/lily/include/input.hh
new file mode 100644 (file)
index 0000000..8677daa
--- /dev/null
+++ b/lily/include/input.hh
@@ -0,0 +1,32 @@
+/*
+  input.hh -- declare Input
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef INPUT_HH
+#define INPUT_HH
+
+/**
+  Base class for anything that records its poisition in the parse file.
+ */
+class Input {
+    char const *defined_ch_C_ ;
+    Sources * sources_l_;
+public:
+    
+    void warning(String)const; // should use member func?
+    void error(String)const;
+    void message(String)const;
+    void set_spot(Input const &);
+    void set_sources(Sources *);
+    
+    String location_str()const;
+    Input(Sources *,char const*);
+    Input();
+};
+
+#endif // INPUT_HH