(set_spacing_rods): new

[lilypond.git] / lily / binary-source-file.cc

diff --git a/lily/binary-source-file.cc b/lily/binary-source-file.cc
index 9f69b5ec986b86dfa880684c77e121b77f87a137..cdd9bd621d90d25f7925c16cd6a29ad5ae17ce5c 100644 (file)
--- a/lily/binary-source-file.cc
+++ b/lily/binary-source-file.cc
@@ -3,21 +3,16 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen
+  (c) 1997--2005 Jan Nieuwenhuizen
 */
 
+#include <climits>             // INT_MAX
 
-#include <limits.h>            // INT_MAX
-#include <assert.h>
-
-#include "flower-proto.hh"
-#include "string.hh"
-#include "source-file.hh"
 #include "binary-source-file.hh"
 #include "string-convert.hh"
 
-Binary_source_file::Binary_source_file (String& filename_string)
-  : Source_file (filename_string)
+Binary_source_file::Binary_source_file (String& file_name_string)
+  : Source_file (file_name_string)
 {
 }
 
@@ -29,7 +24,7 @@ String
 Binary_source_file::error_string (char const* pos_str0) const
 {
   assert (this);
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return "";
 
   char const* begin_str0 = pos_str0 - 8 >? to_str0 ();
@@ -54,7 +49,7 @@ Binary_source_file::error_string (char const* pos_str0) const
 int
 Binary_source_file::get_line (char const* pos_str0) const
 {
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return 0;
 
   return pos_str0 - to_str0 ();