From: Jan Nieuwenhuizen Date: Sat, 24 Feb 2001 18:26:38 +0000 (+0100) Subject: patch::: 1.3.130.jcn6 X-Git-Tag: release/1.3.131~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d79efa6efaa15be34beda70e5b24731a1d372f0e;p=lilypond.git patch::: 1.3.130.jcn6 --- diff --git a/VERSION b/VERSION index bdebd239b6..6661c5724b 100644 --- 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 8fa8d4a2d4..3c3bb28577 100644 --- 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 0428ab192f..150ed56921 100644 --- 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 7970ba146d..86c0a22b61 100644 --- 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 +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 e45aa67b88..59b25ef27f 100644 --- 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 +/* + midi-stream.cc -- implement Midi_stream + + source file of the GNU LilyPond music typesetter + + (c) 1997--2000 Jan Nieuwenhuizen +*/ #include +#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 23e72a6363..ed6cfc74cd 100644 --- 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 be4b2c73c6..13d72bedb7 100644 --- 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 6103ad5a8f..b68d7f6132 100644 --- 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 2d6631d223..b7d4b7e581 100644 --- 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 994418db10..26982c301a 100644 --- 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 c83b2d2f4f..615dfcc7f1 100644 --- 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 4742c4b325..bed220bdb5 100644 --- 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