Revert page-count to the old behaviour.

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

diff --git a/lily/include/sources.hh b/lily/include/sources.hh
index 13776f31becac34e91276040646d895c1a970a50..ac8c896799e6526ede9ffe181ee9009943d365c4 100644 (file)
--- a/lily/include/sources.hh
+++ b/lily/include/sources.hh
@@ -1,13 +1,26 @@
 /*
-  sources.hh -- part of LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SOURCES_HH
 #define SOURCES_HH
 
-#include "flower-proto.hh"
+#include "lily-proto.hh"
 #include "std-vector.hh"
 
 class Sources
@@ -19,8 +32,7 @@ public:
   Sources ();
   ~Sources ();
 
-  Source_file *get_file (string *file_name);
-  Source_file *get_sourcefile (char const *);
+  Source_file *get_file (string file_name, string const& currentpath);
   void add (Source_file *sourcefile);
   void set_path (File_path *);