* lily/paper-outputter.cc (output_version): change "Lily was here"

into  "Engraved by LilyPond"

* lily/my-lily-lexer.cc (My_lily_lexer): don't crash
on unquoted strings before \notenames.

* lily/my-lily-lexer.cc: add \accacciatura and \appoggiatura

diff --git a/ChangeLog b/ChangeLog
index bded514059ed3ba1deea1e590765940db4c67795..0affdee979d0271d2c74501969592e17a2da7b85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-28  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/paper-outputter.cc (output_version): change "Lily was here"
+       into  "Engraved by LilyPond"
+
        * lily/my-lily-lexer.cc (My_lily_lexer): don't crash
        on unquoted strings before \notenames.
 

diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index dd57c8377eabcbecd0b39a0dfc2bf07c70345646..a2204bce51f7196d9f023e433b5e5dd47dbf9547 100644 (file)
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -5,19 +5,12 @@ the spacing when unbroken."
 }
 
 \version "1.9.2"
-\include "deutsch.ly"
 
 rechts = \notes \relative c' {
   \clef treble
   \time 3/4
-  \context Voice {
-    c8 h2  <<g h des f>>8 ~ |
-    <<g h des f>>8
-  }
-}
-
-Rechts = \context Staff \notes {
-  rechts
+    c8 b2  <<g b des f>>8 ~ |
+    <<g b des f>>8
 }
 
 \score {

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c69f23c5fac0cb782f2a8f7261849747969cecc5..b3445a8a840df845466c0634c216bfc24061e8f8 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -242,21 +242,3 @@ My_lily_lexer::prepare_for_next_token ()
 {
   last_input_ = here_input();
 }
-
-#if 0
-SCM
-My_lily_lexer::scan_markup_word (String s)
-{
-  /*
-    TODO: better implementation:
-
-    - make a table of markup functions, for quicker lookup
-
-    - error handling.
-    
-   */
-  SCM s = scm_c_eval_str ((s + "-markup").to_str0());
-  yylval.scm = s;
-  return MARKUP_HEAD;
-}
-#endif

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index e3ae43ae4caece7244ded04811d716b81a7aae3d..6dc512510761995328c8fb05d37e5a5c20f92b51 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -130,7 +130,7 @@ Paper_outputter::output_scope (SCM mod, String prefix)
 void
 Paper_outputter::output_version ()
 {
-  String id_string = "Lily was here";
+  String id_string = "Engraved by LilyPond";
   id_string += String_convert::pad_to (String (", ") + version_string (), 40);
 
   output_String_def ("lilypondtagline", id_string);