lilypond-0.1.33

diff --git a/init/feta16.ly b/init/feta16.ly
index b599375c0bcde6f36dfdef2bb7ece70e721dc0aa..b7a80d998684e0018351e17d154e01051e6d0057 100644 (file)
--- a/init/feta16.ly
+++ b/init/feta16.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:45 1997
+% on Mon Nov 24 00:16:56 1997
 % Do not edit
 % input from out/feta16.log
 % name=\symboltables {

diff --git a/init/feta20.ly b/init/feta20.ly
index 5ae1e0742d41e9d9162cc690a1fec9f94a428305..8cc5c5b7cd98e958969bb6080e2bd7e3de78952e 100644 (file)
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:54 1997
+% on Mon Nov 24 00:16:57 1997
 % Do not edit
 % input from out/feta20.log
 % name=\symboltables {

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 86713c4995271160a710c49e8017cd2c6644c3fe..8b49f135753ce9705024050fc7336ff5a8048d2e 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -59,7 +59,7 @@ begeleiding = \melodic{
 }
 
 \score{
-       \melodic \type Grandstaff =  <
+       \melodic \type Grandstaff <
                \melodie
                \begeleiding 
        >

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 6d5c243fd1cf6e4ddb3ce1e532d91698c6402f18..51d8114f05e0b67d8ba4dd286c1af01296eeea4a 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -10,10 +10,11 @@ composers =  "Traditional";
 enteredby =     "HWN & JCN";
 copyright =     "public domain";
 }
-%{
-Tested Features: lyrics
 
+%{
+Tested Features: lyrics, interleaving lyrics and staffs
 %}
+
 \version "0.1.7";
 
 melody = \melodic{
@@ -122,19 +123,17 @@ textiii = \lyric{
 
 \score{
        < 
-               \type Grandstaff <
-                       < \global 
+               \lyric \type Lyrics = top < 
+                       \global \tekst >
+
+               \type Staff=treb < \global 
                          \melody >
-                       < \global 
+               \lyric \type Lyrics  = "Middle" <  \global
+                       \texte >
+               \type Staff=bass        < \global 
                        \accompany >
-               >
-               
                % ugh
-               \lyric \type Lyrics < 
-                       \global \tekst >
-               \lyric \type Lyrics <  \global
-                       \texte >
-               \lyric \type Lyrics < \global
+               \lyric \type Lyrics  = bottomlyrics < \global
                        \texti \textii \textiii >
                
        >

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 7ff4721bbabec31a36d23a44b74fa376ad9cb249..94ab8c55118e947336d5e3b9188b5d2e0587e0f8 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -12,6 +12,7 @@
 void debug_init();
 void set_debug (bool);
 void do_scores();
+void clear_scores();
 void add_score (Score* s);
 void set_default_output (String s);
 String find_file (String);

diff --git a/lily/main.cc b/lily/main.cc
index 73e4dc087659ac2e8c095d9efe9f4be639f1a34b..b059da16078fccbf1d101ca4632614b930821d79 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -127,9 +127,15 @@ do_one_file (String init_str, String file_str)
     My_lily_parser parser (source_l_g);
     parser.set_version_check (version_ignore_b);
     parser.parse_file (init_str, file_str);
-    exit_status_i_ |= parser.error_level_i_;
+
+    if (parser.error_level_i_)
+      {
+       exit_status_i_  = 1;
+      }
+    else
+      do_scores();
+    clear_scores ();
   }
-  do_scores();
   source_l_g = 0;
 }
 

diff --git a/lily/scores.cc b/lily/scores.cc
index a13e1195bebfc22e9112de595965b5e26825a0e0..edb4bbec801b5668cfbfe79f6d9748cefbd4030b 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -37,9 +37,15 @@ do_scores()
        {
          is_p->process();
        }
-      delete is_p;
-      is_p =0;
+    }
+}
 
+void
+clear_scores ()
+{
+  for (int i=0; i < global_score_array.size(); i++)
+    {
+      delete global_score_array[i];
     }
   global_score_array.clear();
 }

diff --git a/tex/feta16.tex b/tex/feta16.tex
index a575ac9a45bd11e49ca24b9f04403199cc811316..05127640c1a5464df8a7be6cce4f496bc8815bff 100644 (file)
--- a/tex/feta16.tex
+++ b/tex/feta16.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:45 1997
+% on Mon Nov 24 00:16:56 1997
 % Do not edit
 % input from out/feta16.log
 % name

diff --git a/tex/feta20.tex b/tex/feta20.tex
index d5b64756dfffa070ea5edeba175104d2552ae9f5..f6da6f4cfa6f3b9210c92575de4200757d0d5889 100644 (file)
--- a/tex/feta20.tex
+++ b/tex/feta20.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:54 1997
+% on Mon Nov 24 00:16:57 1997
 % Do not edit
 % input from out/feta20.log
 % name