X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsource-file.cc;h=d847605425b0d9be7a9ec79bf66f0d2b462a8004;hb=9b95b5452f689f330178ff142fc3847193ef19a5;hp=041c046d2bfc2fa4761df56005f2e76692f962f7;hpb=3f8a827aad721ed546b823e3f9f2605f61b90e20;p=lilypond.git

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 041c046d2b..d847605425 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -277,30 +277,27 @@ Source_file::get_counts (char const *pos_str0,
   char const *line_start = (char const *)data + line[LEFT];
 
   ssize left = (char const *) pos_str0 - line_start;
+  *byte_offset = left;
+
   string line_begin (line_start, left);
   char const *line_chars = line_begin.c_str ();
 
-  while (left > 0)
+  for (; left > 0; --left, ++line_chars)
     {
-      size_t thislen = utf8_char_len (*line_chars);
-
-      if (thislen == 1 && line_chars[0] == '\t')
+      // Skip UTF-8 continuation bytes.  This is simplistic but
+      // robust, and we warn against non-UTF-8 input in the lexer
+      // already.  In the case of non-UTF-8 or of this function being
+      // called in mid-character, the results are somewhat arbitrary,
+      // but there is no really sane definition anyway.
+      if ((*line_chars & 0xc0) == 0x80)
+        continue;
+
+      if (*line_chars == '\t')
         (*column) = (*column / 8 + 1) * 8;
       else
         (*column)++;
 
       (*line_char)++;
-
-      /*
-        To have decent output in UTF-8 aware terminals,
-        we must keep track of the number of bytes from
-        the left edge of the terminal.
-      */
-      *byte_offset += thislen;
-
-      /* Advance past this character. */
-      line_chars += thislen;
-      left -= thislen;
     }
 }
 
@@ -317,7 +314,7 @@ Source_file::get_line (char const *pos_str0) const
     return 0;
 
   if (!newline_locations_.size ())
-    return 1;
+    return 1 + line_offset_;
 
   /* this will find the '\n' character at the end of our line */
   vsize lo = lower_bound (newline_locations_,
@@ -331,10 +328,15 @@ Source_file::get_line (char const *pos_str0) const
 void
 Source_file::set_line (char const *pos_str0, int line)
 {
-  int current_line = get_line (pos_str0);
-  line_offset_ += line - current_line;
+  if (pos_str0)
+    {
+      int current_line = get_line (pos_str0);
+      line_offset_ += line - current_line;
 
-  assert (line == get_line (pos_str0));
+      assert (line == get_line (pos_str0));
+    }
+  else
+    line_offset_ = line;
 }
 
 int