release commit

diff --git a/ChangeLog b/ChangeLog
index c960de83175bad1d3142ba312fcae770ad0be838..8d994ffd7ba9e317e5b48a6024236e438c4a991b 100644 (file)
--- 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 032002b932584b9e286ac74e40fead9ca34bc934..14d06a1c972f195a49b72a69e78822451c3c8dfb 100644 (file)
--- 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 91ee5588544c85583978e1f7681975beb912ea0e..b35e4d2592696f6b6df9575cdcabcd8e3ce5d2fa 100644 (file)
--- 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 (file)
index 0000000..3505300
--- /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 f815eb6d96fda7a1c1776846259c4ea361d16fd2..6e3a51c62be935ecae6a621671a65ac45b0377b6 100644 (file)
--- 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 09272b63033ae12012f6130fc96a7332bd22b60f..3a844e20bb4400984105a283792099f9ec3100c2 100644 (file)
--- 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 b884bd8598085a8db775c0503993872a8c219bd3..664a65003caa4b0d879efa4ffaa97b1f02e2592a 100644 (file)
--- 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 efea9e02d11d70eb555cb400e86e97f03de60edd..96ed054826729e2c4c45569cd500580cde6d6e9c 100644 (file)
--- 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) != '.':