* input/regression/rehearsal-mark.ly: new file.

* lily/my-lily-parser.cc (here_input): revert reporting of errors:
report error at the current token again.

diff --git a/ChangeLog b/ChangeLog
index 8d8e8d581ce5d7cb65719fc9824b4174aede4471..8c804d993661bb2529680bbcf9861a70e76808ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-01  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * input/regression/rehearsal-mark.ly: new file.
+
+       * lily/my-lily-parser.cc (here_input): revert reporting of errors:
+       report error at the current token again.
+
 2003-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/mknetrel: Exit if doc build fails.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index e3c9a4a03b7bcb21868d71bfcbb2bfef5bf86a80..4300eeb7ccd9de154b30a2ffde88280da1b5b926 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1975,10 +1975,10 @@ finger changes, use markup texts:
 @c
 @lilypond[verbatim, singleline, fragment]
       c'4-1 c'4-2 c'4-3 c'4-4
-      c^#'(finger "2-3")
+      c^\markup { \fontsize #-3 \number "2-3" }
 @end lilypond
 
-
+@cindex finger change
 @cindex scripts
 @cindex superscript
 @cindex subscript

diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index cf0021f992ea2f172438ee3a1502e7491e5bedeb..a0e9a09c9c661b5fd36f242e7e5bd08d79aa0e12 100644 (file)
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -26,7 +26,7 @@ two measures all have the same distance from each other:
     es8 d es f g8 \breathe f |
 % Revert to old layout:
     \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::brew_molecule
-    es8 d \breathe es f g f |
+    [es8 d] \breathe [es f g f] |
     es2 r4 \bar "||"
   }
 }

diff --git a/input/regression/rehearsal-mark.ly b/input/regression/rehearsal-mark.ly
new file mode 100644 (file)
index 0000000..2262005
--- /dev/null
+++ b/input/regression/rehearsal-mark.ly
@@ -0,0 +1,28 @@
+
+\header { texidoc= " Rehearsal marks are printed over barlines. They
+can be incremented automatically or manually.  "}
+
+
+\version "1.7.12"
+
+
+global =  \notes {
+  s1 | \mark "A"
+  s1 | \mark \default 
+  s1 | \mark \default 
+  s1 | \mark "12"
+  s1 | \mark \default 
+  s1 | \mark "A2"
+  s1 | \mark \markup { mark \column << up \bold down >> }
+  s1
+}
+
+one =  \notes \relative c {
+  c''1 c c c c c c 
+}
+
+
+\score{
+\context Staff < \global \one >
+}
+%% new-chords-done %%

diff --git a/input/test/mark.ly b/input/test/mark.ly
index dab2e6a574f6f1a07b1b05db031e9f55459845d8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/input/test/mark.ly
+++ b/input/test/mark.ly
@@ -1,23 +0,0 @@
-\version "1.7.6"
-
-
-global =  \notes {
-  s1 | \mark "A"
-  s1 | \mark \default 
-  s1 | \mark \default 
-  s1 | \mark "12"
-  s1 | \mark \default 
-  s1 | \mark "A2"
-  s1 | \mark #'(music "scripts-segno")  
-  s1
-}
-
-one =  \notes \relative c {
-  c''1 c c c c c c 
-}
-
-
-\score{
-\context Staff < \global \one >
-}
-%% new-chords-done %%

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index b2529c270e73eab1b25865f99f2a6085b6ce325f..b912dc4b512d281a6dd95ac35ec116fee1ab3831 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -95,7 +95,21 @@ My_lily_parser::here_input () const
     Parsing looks ahead , so we really want the previous location of the
     lexer, not lexer_->here_input().
    */
-  return lexer_->last_input_;
+  /*
+    Actually, that gets very icky when there are white space, because
+    the line-numbers are all wrong.  Let's try the character before
+    the current token. That gets the right result for
+    note/duration stuff, but doesn't mess up for errors in the 1st token of the line. 
+    
+   */
+  Input hi (lexer_->here_input ());
+
+  char const * bla = hi.defined_str0_;
+  if (hi.line_number () > 1
+      || hi.column_number () > 1)
+    bla --;
+  
+  return Input (hi.source_file_, bla);
 }
 
 #include "paper-def.hh"