Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / source-file.hh

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index faf8e5c66ba2479837b31994804b8e9d28879373..dd88a2c65ae2255263dcf8c467bc7ec58120fed3 100644 (file)
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -3,17 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
-#include <iostream>
-
-#include "string.hh"
+#include "flower-proto.hh"
+#include "std-vector.hh"
+#include "lily-proto.hh"
 #include "protected-scm.hh"
-#include "parray.hh"
+
+#include <iostream>
+using namespace std;
 
 /**
    class for reading and mapping a file.
@@ -26,19 +28,19 @@
 class Source_file
 {
 public:
-  Source_file (String fn);
-  Source_file (String, String);
+  Source_file (string fn);
+  Source_file (string, string);
 
   virtual ~Source_file ();
 
-  char const *to_str0 () const;
-  virtual String error_string (char const *pos_str0) const;
-  std::istream *get_istream ();
+  char const *c_str () const;
+  virtual string quote_input (char const *pos_str0) const;
+  istream *get_istream ();
   bool contains (char const *pos_str0) const;
   int length () const;
   virtual int get_line (char const *pos_str0) const;
-  String name_string () const;
-  String file_line_column_string (char const *str0) const;
+  string name_string () const;
+  string file_line_column_string (char const *str0) const;
 
   // return start + n
   char const *seek_str0 (int n);
@@ -47,13 +49,12 @@ public:
   // return here + n bytes
   char const *forward_str0 (int n);
   char const *pos_str0 () { return pos_str0_; }
-  String get_string (int n);
+  string get_string (int n);
   void set_pos (char const *pos_str0);
 public:
   Slice line_slice (char const *pos_str0) const;
-  String line_string (char const *pos_str0) const;
-  int get_column (char const *pos_str0) const;
-  int get_char (char const *pos_str0) const;
+  string line_string (char const *pos_str0) const;
+  void get_counts (char const *pos_str0, int *, int *, int *) const;
 
   /*
     JUNKME.
@@ -62,13 +63,14 @@ public:
   */
   char const *pos_str0_;
 
-  SCM get_port () const { return str_port_; }
-  String name_;
+  SCM get_port () const;
+  string name_;
 
 private:
-  Link_array<char> newline_locations_;
-  std::istream *istream_;
+  vector<char*> newline_locations_;
+  istream *istream_;
   char *contents_str0_;
+  vector<char> chs_;
   int length_;
   void load_stdin ();
   void init_port ();
@@ -76,7 +78,7 @@ private:
   Protected_scm str_port_;
 };
 
-char *gulp_file (String fn, int *len);
+char *gulp_file (string fn, int *len);
 
 #endif /* SOURCE_FILE_HH */