CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/20 23:20:19
Modified files:
. : ChangeLog VERSION
lily : drum-note-performer.cc dynamic-performer.cc
font-size-engraver.cc key-performer.cc
lyric-performer.cc note-performer.cc
paper-book.cc performance-scheme.cc
piano-pedal-performer.cc staff-performer.cc
tempo-performer.cc time-signature-performer.cc
ly : performer-init.ly
scm : framework-ps.scm lily-library.scm midi.scm
Log message:
* lily/drum-note-performer.cc (class Drum_note_performer): use
process_music everywhere.
* ly/performer-init.ly: add default children everywhere.
* lily/paper-book.cc (output): call paper-book-write-midis
directly: always write MIDI, even if no \layout {} block.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4046&tr2=1.4047&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.652&tr2=1.653&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/drum-note-performer.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-performer.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-size-engraver.cc.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/key-performer.cc.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lyric-performer.cc.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-performer.cc.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.114&tr2=1.115&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/performance-scheme.cc.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/piano-pedal-performer.cc.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/staff-performer.cc.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tempo-performer.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/time-signature-performer.cc.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/performer-init.ly.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.132&tr2=1.133&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily-library.scm.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/midi.scm.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4046 lilypond/ChangeLog:1.4047
--- lilypond/ChangeLog:1.4046 Fri Aug 19 20:34:05 2005
+++ lilypond/ChangeLog Sat Aug 20 23:20:18 2005
@@ -1,3 +1,13 @@
+2005-08-21 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/drum-note-performer.cc (class Drum_note_performer): use
+ process_music everywhere.
+
+ * ly/performer-init.ly: add default children everywhere.
+
+ * lily/paper-book.cc (output): call paper-book-write-midis
+ directly: always write MIDI, even if no \layout {} block.
+
2005-08-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* VERSION (PACKAGE_NAME): release 2.7.6
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.652 lilypond/VERSION:1.653
--- lilypond/VERSION:1.652 Mon Aug 15 21:56:19 2005
+++ lilypond/VERSION Sat Aug 20 23:20:18 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=7
-PATCH_LEVEL=6
+PATCH_LEVEL=7
MY_PATCH_LEVEL=
Index: lilypond/lily/drum-note-performer.cc
diff -u lilypond/lily/drum-note-performer.cc:1.23
lilypond/lily/drum-note-performer.cc:1.24
--- lilypond/lily/drum-note-performer.cc:1.23 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/drum-note-performer.cc Sat Aug 20 23:20:18 2005
@@ -22,7 +22,7 @@
protected:
virtual bool try_music (Music *ev);
void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ void process_music ();
private:
Link_array<Music> note_evs_;
@@ -34,10 +34,9 @@
}
void
-Drum_note_performer::create_audio_elements ()
+Drum_note_performer::process_music ()
{
- SCM tab = 0;
- if (!tab) tab = get_property ("drumPitchTable");
+ SCM tab = get_property ("drumPitchTable");
while (note_evs_.size ())
{
Index: lilypond/lily/dynamic-performer.cc
diff -u lilypond/lily/dynamic-performer.cc:1.48
lilypond/lily/dynamic-performer.cc:1.49
--- lilypond/lily/dynamic-performer.cc:1.48 Fri Aug 12 00:04:47 2005
+++ lilypond/lily/dynamic-performer.cc Sat Aug 20 23:20:18 2005
@@ -26,7 +26,7 @@
protected:
virtual bool try_music (Music *event);
void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ void process_music ();
private:
Music *script_event_;
@@ -40,7 +40,7 @@
}
void
-Dynamic_performer::create_audio_elements ()
+Dynamic_performer::process_music ()
{
if (script_event_)
{
Index: lilypond/lily/font-size-engraver.cc
diff -u lilypond/lily/font-size-engraver.cc:1.50
lilypond/lily/font-size-engraver.cc:1.51
--- lilypond/lily/font-size-engraver.cc:1.50 Fri Aug 12 00:04:47 2005
+++ lilypond/lily/font-size-engraver.cc Sat Aug 20 23:20:18 2005
@@ -15,7 +15,7 @@
TRANSLATOR_DECLARATIONS (Font_size_engraver);
protected:
DECLARE_ACKNOWLEDGER (font);
- virtual void process_music ();
+ void process_music ();
Real size;
private:
};
Index: lilypond/lily/key-performer.cc
diff -u lilypond/lily/key-performer.cc:1.69 lilypond/lily/key-performer.cc:1.70
--- lilypond/lily/key-performer.cc:1.69 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/key-performer.cc Sat Aug 20 23:20:18 2005
@@ -19,7 +19,7 @@
protected:
virtual bool try_music (Music *ev);
- virtual void create_audio_elements ();
+ void process_music ();
void stop_translation_timestep ();
private:
@@ -38,7 +38,7 @@
}
void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
{
if (key_ev_)
{
Index: lilypond/lily/lyric-performer.cc
diff -u lilypond/lily/lyric-performer.cc:1.50
lilypond/lily/lyric-performer.cc:1.51
--- lilypond/lily/lyric-performer.cc:1.50 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/lyric-performer.cc Sat Aug 20 23:20:18 2005
@@ -18,7 +18,7 @@
virtual bool try_music (Music *event);
void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ void process_music ();
private:
Link_array<Music> events_;
@@ -31,7 +31,7 @@
}
void
-Lyric_performer::create_audio_elements ()
+Lyric_performer::process_music ()
{
// FIXME: won't work with fancy lyrics
if (events_.size ()
Index: lilypond/lily/note-performer.cc
diff -u lilypond/lily/note-performer.cc:1.66
lilypond/lily/note-performer.cc:1.67
--- lilypond/lily/note-performer.cc:1.66 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/note-performer.cc Sat Aug 20 23:20:18 2005
@@ -25,7 +25,7 @@
virtual bool try_music (Music *ev);
void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ void process_music ();
private:
Link_array<Music> note_evs_;
@@ -33,7 +33,7 @@
};
void
-Note_performer::create_audio_elements ()
+Note_performer::process_music ()
{
if (note_evs_.size ())
{
@@ -89,7 +89,8 @@
#include "translator.icc"
ADD_TRANSLATOR (Note_performer, "", "",
- "note-event busy-playing-event",
+ "note-event "
+ "busy-playing-event",
"", "");
Note_performer::Note_performer ()
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.114 lilypond/lily/paper-book.cc:1.115
--- lilypond/lily/paper-book.cc:1.114 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/paper-book.cc Sat Aug 20 23:20:18 2005
@@ -90,6 +90,13 @@
void
Paper_book::output (SCM output_channel)
{
+ if (scm_is_pair (performances_))
+ {
+ SCM proc = ly_lily_module_constant ("paper-book-write-midis");
+
+ scm_call_2 (proc, self_scm (), output_channel);
+ }
+
if (scores_ == SCM_EOL)
return;
Index: lilypond/lily/performance-scheme.cc
diff -u lilypond/lily/performance-scheme.cc:1.3
lilypond/lily/performance-scheme.cc:1.4
--- lilypond/lily/performance-scheme.cc:1.3 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/performance-scheme.cc Sat Aug 20 23:20:18 2005
@@ -11,7 +11,6 @@
LY_DEFINE (ly_performance_write, "ly:performance-write",
2, 0, 0, (SCM performance, SCM filename),
"Write @var{performance} to @var{filename}")
-
{
Performance *perf = dynamic_cast<Performance *> (unsmob_music_output
(performance));
Index: lilypond/lily/piano-pedal-performer.cc
diff -u lilypond/lily/piano-pedal-performer.cc:1.44
lilypond/lily/piano-pedal-performer.cc:1.45
--- lilypond/lily/piano-pedal-performer.cc:1.44 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/piano-pedal-performer.cc Sat Aug 20 23:20:18 2005
@@ -29,7 +29,7 @@
protected:
virtual void initialize ();
virtual bool try_music (Music *);
- virtual void create_audio_elements ();
+ void process_music ();
void stop_translation_timestep ();
void start_translation_timestep ();
@@ -69,7 +69,7 @@
}
void
-Piano_pedal_performer::create_audio_elements ()
+Piano_pedal_performer::process_music ()
{
for (Pedal_info *p = info_alist_; p && p->name_; p++)
Index: lilypond/lily/staff-performer.cc
diff -u lilypond/lily/staff-performer.cc:1.73
lilypond/lily/staff-performer.cc:1.74
--- lilypond/lily/staff-performer.cc:1.73 Thu Aug 18 15:34:31 2005
+++ lilypond/lily/staff-performer.cc Sat Aug 20 23:20:18 2005
@@ -29,7 +29,7 @@
virtual void acknowledge_audio_element (Audio_element *p);
virtual void finalize ();
virtual void initialize ();
- virtual void create_audio_elements ();
+ void process_music ();
void stop_translation_timestep ();
private:
@@ -73,7 +73,7 @@
}
void
-Staff_performer::create_audio_elements ()
+Staff_performer::process_music ()
{
String str = new_instrument_string ();
if (str.length ())
Index: lilypond/lily/tempo-performer.cc
diff -u lilypond/lily/tempo-performer.cc:1.40
lilypond/lily/tempo-performer.cc:1.41
--- lilypond/lily/tempo-performer.cc:1.40 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/tempo-performer.cc Sat Aug 20 23:20:18 2005
@@ -22,7 +22,7 @@
virtual bool try_music (Music *event);
void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ void process_music ();
private:
Music *tempo_event_;
@@ -40,7 +40,7 @@
}
void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
{
if (tempo_event_)
{
Index: lilypond/lily/time-signature-performer.cc
diff -u lilypond/lily/time-signature-performer.cc:1.46
lilypond/lily/time-signature-performer.cc:1.47
--- lilypond/lily/time-signature-performer.cc:1.46 Sun Jul 24 18:58:42 2005
+++ lilypond/lily/time-signature-performer.cc Sat Aug 20 23:20:18 2005
@@ -19,7 +19,7 @@
protected:
void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ void process_music ();
virtual void derived_mark () const;
SCM prev_fraction_;
private:
@@ -44,7 +44,7 @@
}
void
-Time_signature_performer::create_audio_elements ()
+Time_signature_performer::process_music ()
{
SCM fr = get_property ("timeSignatureFraction");
if (scm_is_pair (fr) && !ly_is_equal (fr, prev_fraction_))
Index: lilypond/ly/performer-init.ly
diff -u lilypond/ly/performer-init.ly:1.52 lilypond/ly/performer-init.ly:1.53
--- lilypond/ly/performer-init.ly:1.52 Thu Aug 18 12:54:26 2005
+++ lilypond/ly/performer-init.ly Sat Aug 20 23:20:18 2005
@@ -1,12 +1,13 @@
\version "2.7.6"
- %
- % setup for Request->Element conversion.
Guru-only
- %
+%%
+%% setup for Request->Element conversion.
+%%
\context {
\type "Performer_group"
\name Staff
\accepts Voice
+ \defaultchild Voice
\consists "Staff_performer"
\consists "Key_performer"
@@ -18,11 +19,13 @@
\accepts Score
\description "Hard coded entry point for LilyPond. Cannot be tuned."
}
+
\context {
\Staff
\name DrumStaff
midiInstrument = #"drums"
\accepts DrumVoice
+ \defaultchild DrumVoice
}
\context {
@@ -63,6 +66,7 @@
\name GrandStaff
\accepts RhythmicStaff
\accepts Staff
+ \defaultchild Staff
}
\context {
@@ -70,6 +74,7 @@
\name "PianoStaff"
\accepts Staff
\accepts DrumStaff
+ \defaultchild Staff
}
\context {
@@ -87,6 +92,7 @@
\type "Performer_group"
\name "TabStaff"
\accepts "TabVoice"
+ \defaultchild "TabVoice"
}
\context {
@@ -112,6 +118,8 @@
\consists "Timing_translator"
\consists "Swallow_performer"
+
+ \defaultchild "Staff"
dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
instrumentEqualizer = #default-instrument-equalizer
@@ -133,9 +141,12 @@
\name ChoirStaff
\accepts Staff
\accepts DrumStaff
+ \defaultchild Staff
+
}
+
\context {
\type "Performer_group"
\consists "Staff_performer"
@@ -155,6 +166,8 @@
\name StaffGroup
\accepts Staff
\accepts DrumStaff
+
+ \defaultchild Staff
}
\context { \Staff \name RhythmicStaff }
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.132 lilypond/scm/framework-ps.scm:1.133
--- lilypond/scm/framework-ps.scm:1.132 Tue Aug 16 15:47:43 2005
+++ lilypond/scm/framework-ps.scm Sat Aug 20 23:20:19 2005
@@ -425,8 +425,6 @@
(page-count (length pages))
(port (ly:outputter-port outputter)))
- (paper-book-write-midis book basename)
-
(output-scopes scopes fields basename)
(display (page-header paper page-count #t) port)
(write-preamble paper #t port)
Index: lilypond/scm/lily-library.scm
diff -u lilypond/scm/lily-library.scm:1.46 lilypond/scm/lily-library.scm:1.47
--- lilypond/scm/lily-library.scm:1.46 Tue Aug 2 07:46:58 2005
+++ lilypond/scm/lily-library.scm Sat Aug 20 23:20:19 2005
@@ -92,7 +92,6 @@
(set! base (format #f "~a-~a" base count)))
(ly:parser-define! parser 'output-count (1+ count))
-
(ly:book-process book paper layout base)
))
Index: lilypond/scm/midi.scm
diff -u lilypond/scm/midi.scm:1.29 lilypond/scm/midi.scm:1.30
--- lilypond/scm/midi.scm:1.29 Mon Jul 11 13:30:57 2005
+++ lilypond/scm/midi.scm Sat Aug 20 23:20:19 2005
@@ -286,9 +286,10 @@
(define-public (paper-book-write-midis paper-book basename)
(let
loop
- ((perfs (ly:paper-book-performances paper-book))
- (count 0))
-
+ ((perfs (ly:paper-book-performances paper-book))
+ (count 0))
+
+
(if (pair? perfs)
(begin
(ly:performance-write
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
