patch::: 1.3.130.jcn6

diff --git a/VERSION b/VERSION
index bdebd239b69a84c4eb5c481d8d2cd8b3ae5f3829..6661c5724b2bdc5a529a81bf610504bcfd1c8433 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=130
-MY_PATCH_LEVEL=jcn5
+MY_PATCH_LEVEL=jcn6
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index 8fa8d4a2d4bb1253ebcef58ed32162d0737852c5..3c3bb28577e083789e57030644a4449157ffacc6 100644 (file)
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -1,7 +1,9 @@
 \header{
 texidoc="
 Beams should behave reasonably well, even under extreme circumstances.
-Stems may be short, but noteheads should never touch the beam.
+Stems may be short, but noteheads should never touch the beam.  Note that
+under normal circumstances, these beams would get knees; here
+Beam.auto-knee-gap was set to false.
 ";
 }
 \version "1.3.117";

diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly
index 0428ab192f28f032f49b9e7055b31c96d7bfd204..150ed569216e7fcb654e71f4fc7057148e363099 100644 (file)
--- a/input/star-spangled-banner.ly
+++ b/input/star-spangled-banner.ly
@@ -122,7 +122,7 @@ text =  \lyrics {
                        \clef treble;
                        \property Staff.automaticMelismata = ##t
                        \context Voice = one \transpose c'' {
-                               \voicOne
+                               \voiceOne
                                \staffBVoiceB
                                \bar "|.";
                        } 

diff --git a/lily/include/paper-stream.hh b/lily/include/paper-stream.hh
index 7970ba146d2bb4e7c1971b77427fd746f2a0b41d..86c0a22b6101fb7daa605982319c292076a1fe15 100644 (file)
--- a/lily/include/paper-stream.hh
+++ b/lily/include/paper-stream.hh
@@ -34,7 +34,8 @@ private:
 };
 
 class ostream;
-ostream *open_file_stream (String filename);
+#include <streambuf.h>
+ostream *open_file_stream (String filename, int mode=ios::out);
 void close_file_stream (ostream *os);
 
 

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index e45aa67b8857037faf6838b25c898223b8d39928..59b25ef27f47f08e55695bcd5f81d3dc1088d9bb 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,11 +1,13 @@
-//
-// midi-stream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+/*
+  midi-stream.cc -- implement Midi_stream
+
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include <fstream.h>
+#include "paper-stream.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
@@ -14,22 +16,15 @@
 #include "midi-stream.hh"
 #include "debug.hh"
 
-Midi_stream::Midi_stream (String filename_str)
+Midi_stream::Midi_stream (String filename)
 {
-  filename_str_ = filename_str;
-  os_p_ = 0;
-  open ();
+  filename_str_ = filename;
+  os_p_ = open_file_stream (filename, ios::out|ios::bin);
 }
 
 Midi_stream::~Midi_stream ()
 {
-  *os_p_ << flush;             // ugh. Share with tex_stream.
-  if (!*os_p_)
-    {
-      warning (_ ("Error syncing file (disk full?)"));
-      exit_status_global = 1;
-    }
-  delete os_p_;
+  close_file_stream (os_p_);
 }
 
 Midi_stream&
@@ -69,10 +64,3 @@ Midi_stream::operator << (int i)
   return *this;
 }
 
-void
-Midi_stream::open ()
-{
-  os_p_ = new ofstream (filename_str_.ch_C (),ios::out|ios::bin);
-  if (!*os_p_)
-    error (_f ("can't open file: `%s'", filename_str_));
-}

diff --git a/lily/paper-stream.cc b/lily/paper-stream.cc
index 23e72a6363e136d44e29188ad07d9bf7d798cf98..ed6cfc74cd2227d27049762bf4f8c0be63f5bc2a 100644 (file)
--- a/lily/paper-stream.cc
+++ b/lily/paper-stream.cc
@@ -23,7 +23,7 @@
 const int MAXLINELEN = 200;
 
 ostream *
-open_file_stream (String filename)
+open_file_stream (String filename, int mode)
 {
   ostream *os;
   if ((filename == "-"))
@@ -34,7 +34,7 @@ open_file_stream (String filename)
       if (!p.dir.empty_b ())
        if (mkdir (p.dir.ch_C (), 0777) == -1 && errno != EEXIST)
          error (_f ("can't create directory: `%s'", p.dir));
-      os = new ofstream (filename.ch_C ());
+      os = new ofstream (filename.ch_C (), mode);
     }
   if (!*os)
     error (_f ("can't open file: `%s'", filename));
@@ -51,6 +51,7 @@ close_file_stream (ostream *os)
       exit_status_global = 1;
     }
   delete os;
+  os = 0;
 }  
 
 Paper_stream::Paper_stream (String filename)

diff --git a/lily/performance.cc b/lily/performance.cc
index be4b2c73c632b6a35b6a92abe5788e5e697876e2..13d72bedb798944da1d5b24fca2b11b6bed778cd 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -156,6 +156,11 @@ Performance::process()
       p.base += "-" + to_str (def);
       out = p.str ();
     }
+
+  /* Maybe a bit crude, but we had this before */
+  Path p = split_path (out);
+  p.ext = "midi";
+  out = p.str ();
   
   Midi_stream midi_stream (out);
   progress_indication ( _f ("MIDI output to %s...", out));

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 6103ad5a8f28cab2d3c92979c6b07a781728e76e..b68d7f6132f9a2c0d242afd7f461099fe4b7ff5e 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -20,7 +20,7 @@ LY2DVI = $(script-dir)/ly2dvi.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/
 PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
-PS_TO_PNGS = $(buildscript-dir)/ps-to-pgns.sh
+PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh
 
 else
 
@@ -32,7 +32,7 @@ CONVERT_LY = $(shell $(SHELL) -c 'type -p convert-ly')
 LILYPOND_BOOK = $(shell $(SHELL) -c 'type -p lilypond-book')
 LILYPOND_BOOK_INCLUDES = -I. -I.. -I$(outdir)
 PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pgns')
+PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
 
 endif
 

diff --git a/make/ly.make b/make/ly.make
index 2d6631d223af24fb01125c563de6566098a8cdc6..b7d4b7e581eb0b9def67b266cbbf3d868c600a51 100644 (file)
--- a/make/ly.make
+++ b/make/ly.make
@@ -56,3 +56,12 @@ $(outdir)/%-book.ps: $(outdir)/%.ps
 #
 %: $(outdir)/%.ps
        @echo Making $@ from $<
+
+#
+# Also clean hand-compiled stuff in cwd
+#
+localclean: local-auto-gen-clean
+
+local-auto-gen-clean:
+       rm -f `grep -l 'Generated automacially by'  *`
+       rm -f *.dvi *.png

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 994418db1008c2cc6cee01ac2ea4f3913c897fbc..26982c301a794a2b7a273a8c44a958c5de487c10 100644 (file)
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -16,15 +16,6 @@ convert-ly: local-convert-ly
 local-convert-ly:
        $(PYTHON) $(CONVERT_LY) -e *ly
 
-#
-# Also clean hand-compiled stuff in cwd
-#
-localclean: local-auto-gen-clean
-
-local-auto-gen-clean:
-       rm -f `grep -l 'Generated automacially by'  *`
-       rm -f *.dvi *.png
-
 tar:
        mkdir -p $(outdir)/$(tarball)
        cp -p *.ly $(outdir)/$(tarball)

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index c83b2d2f4fb9aebc5bae9a5470e55f301fdb6661..615dfcc7f19c6bdba6d04a35e4e6ec2b7a46f54d 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -166,6 +166,7 @@ FIXME: in Tie this is a pair of grob pointers, pointing to the two heads of the
 (grob-property-description 'ideal-distances list? "(OBJ . (DIST . STRENGTH)) pairs.")
 (grob-property-description 'interfaces list? "list of symbols indicating the interfaces supported by this object. Is initialized from the @code{meta} field.")
 (grob-property-description 'inversion list? " musical-pitch, optional.")
+(grob-property-description 'invisible-staff boolean? "is staff invisible?")
 (grob-property-description 'items-worth-living list? "list of interesting items. If empty in a particular system, clear that system.")
 (grob-property-description 'kern number? "amount of extra white space to add.
 

diff --git a/scm/interface-description.scm b/scm/interface-description.scm
index 4742c4b3254ba091c39d503d3affe7e1037c9ce7..bed220bdb5c6b99e841803c86ceaa05c8a40b4f5 100644 (file)
--- a/scm/interface-description.scm
+++ b/scm/interface-description.scm
@@ -679,7 +679,8 @@ If you want to space your music wider, use something like:
 position 0."
    '(
     staff-space 
-    line-count 
+    line-count
+    invisible-staff
     )))
 
 (define stem-tremolo-interface