From 5d7b37deeeaec4145926fc6b7007f656ae3a7acb Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:03:52 +0000
Subject: [PATCH] lilypond-0.1.33

---
 init/feta16.ly       |  2 +-
 init/feta20.ly       |  2 +-
 input/kortjakje.ly   |  2 +-
 input/twinkle.ly     | 23 +++++++++++------------
 lily/include/main.hh |  1 +
 lily/main.cc         | 10 ++++++++--
 lily/scores.cc       | 10 ++++++++--
 tex/feta16.tex       |  2 +-
 tex/feta20.tex       |  2 +-
 9 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/init/feta16.ly b/init/feta16.ly
index b599375c0b..b7a80d9986 100644
--- 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 5ae1e0742d..8cc5c5b7cd 100644
--- 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 86713c4995..8b49f13575 100644
--- 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 6d5c243fd1..51d8114f05 100644
--- 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 7ff4721bba..94ab8c5511 100644
--- 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 73e4dc0876..b059da1607 100644
--- 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 a13e1195be..edb4bbec80 100644
--- 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 a575ac9a45..05127640c1 100644
--- 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 d5b64756df..f6da6f4cfa 100644
--- 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
-- 
2.39.5