A couple of minor patches I am bundling together because they are too
trivial to include one at a time:
First, getting rid of a few unused functions and variables:
Index: lily/audio-column.cc
===================================================================
RCS file: /cvsroot/lilypond/lilypond/lily/audio-column.cc,v
retrieving revision 1.20
diff -u -p -r1.20 audio-column.cc
--- lily/audio-column.cc 26 Feb 2004 13:12:31 -0000 1.20
+++ lily/audio-column.cc 1 May 2004 20:36:22 -0000
@@ -13,7 +13,6 @@
Audio_column::Audio_column (Moment at_mom)
{
at_mom_ = at_mom;
- performance_ = 0;
}
void
Index: lily/include/audio-column.hh
===================================================================
RCS file: /cvsroot/lilypond/lilypond/lily/include/audio-column.hh,v
retrieving revision 1.18
diff -u -p -r1.18 audio-column.hh
--- lily/include/audio-column.hh 5 Feb 2004 14:55:36 -0000 1.18
+++ lily/include/audio-column.hh 1 May 2004 20:36:25 -0000
@@ -23,10 +23,8 @@ public:
void add_audio_item (Audio_item* i);
Moment at_mom () const;
- void print () const;
Link_array<Audio_item> audio_items_;
- Performance * performance_;
private:
Audio_column (Audio_column const&);
Index: lily/include/translator.hh
===================================================================
RCS file: /cvsroot/lilypond/lilypond/lily/include/translator.hh,v
retrieving revision 1.73
diff -u -p -r1.73 translator.hh
--- lily/include/translator.hh 12 Apr 2004 14:48:41 -0000 1.73
+++ lily/include/translator.hh 1 May 2004 20:39:59 -0000
@@ -41,7 +41,6 @@ public:
Translator (Translator const &);
- void removal_processing ();
SCM internal_get_property (SCM symbol) const;
virtual Music_output_def *get_output_def () const;
This next patch should make the -m option work again.
Index: lily/score.cc
===================================================================
RCS file: /cvsroot/lilypond/lilypond/lily/score.cc,v
retrieving revision 1.109
diff -u -p -r1.109 score.cc
--- lily/score.cc 28 Apr 2004 22:03:54 -0000 1.109
+++ lily/score.cc 1 May 2004 20:41:40 -0000
@@ -189,18 +189,21 @@ Score::book_rendering (String outname, M
for (int i = 0; !i || i < outdef_count; i++)
{
Music_output_def *def = outdef_count ? defs_[i] : default_def;
- SCM context = ly_run_translator (music_, def->self_scm ());
- if (Global_context *g = dynamic_cast<Global_context*>
- (unsmob_context (context)))
+ if (!(no_paper_global_b && dynamic_cast<Paper_def*> (def)))
{
- SCM s = ly_format_output (context, out);
- if (s != SCM_UNDEFINED)
+ SCM context = ly_run_translator (music_, def->self_scm ());
+ if (Global_context *g = dynamic_cast<Global_context*>
+ (unsmob_context (context)))
{
- systems = s;
- /* Ugh. */
- Music_output *output = g->get_output ();
- if (Paper_score *ps = dynamic_cast<Paper_score*> (output))
- *paper = ps->paper_;
+ SCM s = ly_format_output (context, out);
+ if (s != SCM_UNDEFINED)
+ {
+ systems = s;
+ /* Ugh. */
+ Music_output *output = g->get_output ();
+ if (Paper_score *ps = dynamic_cast<Paper_score*> (output))
+ *paper = ps->paper_;
+ }
}
}
}
--
Michael Welsh Duggan
([EMAIL PROTECTED])
_______________________________________________
lilypond-devel mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/lilypond-devel
