release: 1.2.0

[lilypond.git] / lib / source-file.cc

diff --git a/lib/source-file.cc b/lib/source-file.cc
index 55e4ea63d22b19153962797fb8119fc8438247ff..e6ea86aeb854a35c38bb2079d4e8b618b9c405b2 100644 (file)
--- a/lib/source-file.cc
+++ b/lib/source-file.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
   & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
@@ -13,7 +13,6 @@
 
 #include "string.hh"
 #include "proto.hh"
-#include "plist.hh"
 #include "warn.hh"
 #include "thank-you-cygnus.hh"
 #include "source-file.hh"
@@ -118,7 +117,7 @@ Source_file::line_str (char const* pos_ch_C) const
 
   Slice line = line_slice (pos_ch_C);
   char const* data_ch_C = ch_C ();
-  return String ((Byte const*)data_ch_C + line.min (), line.length ());
+  return String ((Byte const*)data_ch_C + line[LEFT], line.length ());
 }
 
 int
@@ -128,7 +127,7 @@ Source_file::char_i (char const* pos_ch_C) const
     return 0;
 
   char const* data_ch_C = ch_C ();
-  return pos_ch_C - (line_slice (pos_ch_C).min () + data_ch_C);
+  return pos_ch_C - (line_slice (pos_ch_C)[SMALLER] + data_ch_C);
 }
 
 int