From d2bc5715aa3c5554b14ceb7791e66e6eecd6f53f Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 19 Sep 2003 14:22:27 +0000
Subject: [PATCH] release commit

---
 ChangeLog                       |  2 ++
 Documentation/topdocs/NEWS.texi |  2 +-
 input/test/GNUmakefile          |  2 +-
 lily/string-number-engraver.cc  | 45 +++++++++++++++++++++++++++++++++
 ly/engraver-init.ly             |  2 +-
 make/ly-vars.make               |  3 ++-
 scm/define-grobs.scm            |  3 +--
 scripts/lilypond.py             |  4 +--
 8 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 lily/string-number-engraver.cc

diff --git a/ChangeLog b/ChangeLog
index c960de8317..8d994ffd7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-09-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* VERSION (PACKAGE_NAME): release 1.9.8
+
 	* scripts/lilypond.py (escape_path): escape spaces in directory names
 
 	* input/test/text-spanner.ly: fixes.
diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 032002b932..14d06a1c97 100644
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -5,7 +5,7 @@
 @node Top, , , 
 @top
 
-@chapter New features in 1.9 since 1.8
+@chapter New features in 2.0 since 1.8
 
 @itemize
 
diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile
index 91ee558854..b35e4d2592 100644
--- a/input/test/GNUmakefile
+++ b/input/test/GNUmakefile
@@ -10,7 +10,7 @@ LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-che
 ## examples = font20 ancient-font
 ## LOCALSTEPMAKE_TEMPLATES += ly mutopia 
 
-EXTRA_DIST_FILES= $(wildcard *.lyinc)
+EXTRA_DIST_FILES= 
 
 include $(depth)/make/stepmake.make 
 
diff --git a/lily/string-number-engraver.cc b/lily/string-number-engraver.cc
new file mode 100644
index 0000000000..350530053d
--- /dev/null
+++ b/lily/string-number-engraver.cc
@@ -0,0 +1,45 @@
+/*
+  Junk String numbers.
+  
+ */
+
+#include "engraver.hh"
+
+class String_number_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS(String_number_engraver);
+protected:
+  virtual bool try_music (Music* m);
+
+};
+
+
+bool
+String_number_engraver::try_music (Music * m)
+{
+  return true;
+}
+
+String_number_engraver::String_number_engraver ()
+{
+
+}
+
+/*
+  TODO: string numbers are printed right of the note circled. This
+  engraver should provide this functionality.
+  
+ */
+
+ENTER_DESCRIPTION(String_number_engraver,
+/* descr */       "Swallow string-number-events - the purpose of this engraver is to"
+" process tab for normal notation. To provent warnings for unprocessed "
+" string-number-event to obscure real error messages, this engraver "
+" swallows them all.",
+		  
+/* creats*/       "",
+/* accepts */     "string-number-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index f815eb6d96..6e3a51c62b 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -16,7 +16,7 @@ StaffContext=\translator {
 	\consists "Output_property_engraver"	
 	
 	\consists "Bar_engraver"
- % Bar_engraver must be first so default bars aren't overwritten
+% Bar_engraver must be first so default bars aren't overwritten
 % with empty ones.
 	\consists "Font_size_engraver"
 
diff --git a/make/ly-vars.make b/make/ly-vars.make
index 09272b6303..3a844e20bb 100644
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -10,8 +10,9 @@ OMF_FILES += $(foreach format, html pdf ps.gz, $(foreach f, $(TELY_FILES), $(out
 ITELY_FILES := $(wildcard *.itely)
 ITEXI_FILES := $(wildcard *.itexi)
 LY_FILES := $(wildcard *.ly)
+LYINC_FILES := $(wildcard *.lyinc)
 
 TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 
-EXTRA_DIST_FILES += $(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES)
+EXTRA_DIST_FILES += $(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(LYINC_FILES)
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b884bd8598..664a65003c 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -227,8 +227,7 @@
 	(font-family . music)	   
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
-	(space-alist . (
-			(ambitus . (extra-space . 2.0))
+	(space-alist . ((ambitus . (extra-space . 2.0))
 			(staff-bar . (minimum-space .  3.7))
 			(key-signature . (minimum-space . 4.0))
 			(time-signature . (minimum-space . 4.2))
diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index efea9e02d1..96ed054826 100644
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -811,10 +811,8 @@ if 1:
 
 	for i in files[:] + [output_name]:
 		b = os.path.basename (i)
-		print b
 		if string.find (b, ' ') >= 0:
-			ly.error (_ ("filename should not contain spaces: `%s'") %
-			       i)
+			ly.error (_ ("filename should not contain spaces: `%s'") % b)
 			ly.exit (1)
 			
 	if os.path.dirname (output_name) != '.':
-- 
2.39.5