CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/18 11:40:23
Modified files:
. : ChangeLog
lily : context-def.cc engraver-group-engraver.cc
engraver.cc key-engraver.cc
performer-group-performer.cc performer.cc
recording-group-engraver.cc score-engraver.cc
score-performer.cc translator-group-ctors.cc
lily/include : engraver-group-engraver.hh engraver.hh
lily-proto.hh performer-group-performer.hh
performer.hh recording-group-engraver.hh
score-engraver.hh score-performer.hh
python : convertrules.py
scm : define-grob-properties.scm
Removed files:
lily/include : line-group-group-engraver.hh
Log message:
* scm/define-grob-properties.scm (all-user-grob-properties): add
@code{} tags to property description.
* lily/include/line-group-group-engraver.hh (Module): remove file.
* python/convertrules.py (conv): add rule for
Engraver_group_engraver -> Engraver_group.
* lily/include/performer-group-performer.hh: analogous.
* lily/include/engraver-group-engraver.hh: rename to Engraver_group.
* lily/context-def.cc (instantiate): check for
Engraver_group_engraver and Performer_group_performer not
Engraver/Performer. Fixes crashes when doing \with { \consist .. }
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4030&tr2=1.4031&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context-def.cc.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/engraver-group-engraver.cc.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/engraver.cc.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/key-engraver.cc.diff?tr1=1.124&tr2=1.125&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/performer-group-performer.cc.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/performer.cc.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/recording-group-engraver.cc.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/score-engraver.cc.diff?tr1=1.153&tr2=1.154&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/score-performer.cc.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/translator-group-ctors.cc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/engraver-group-engraver.hh.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/engraver.hh.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-proto.hh.diff?tr1=1.130&tr2=1.131&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/performer-group-performer.hh.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/performer.hh.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/recording-group-engraver.hh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/score-engraver.hh.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/score-performer.hh.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/convertrules.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.114&tr2=1.115&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4030 lilypond/ChangeLog:1.4031
--- lilypond/ChangeLog:1.4030 Thu Aug 18 10:58:04 2005
+++ lilypond/ChangeLog Thu Aug 18 11:40:21 2005
@@ -1,5 +1,17 @@
2005-08-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/define-grob-properties.scm (all-user-grob-properties): add
+ @code{} tags to property description.
+
+ * lily/include/line-group-group-engraver.hh (Module): remove file.
+
+ * python/convertrules.py (conv): add rule for
+ Engraver_group_engraver -> Engraver_group.
+
+ * lily/include/performer-group-performer.hh: analogous.
+
+ * lily/include/engraver-group-engraver.hh: rename to Engraver_group.
+
* lily/context-def.cc (instantiate): check for
Engraver_group_engraver and Performer_group_performer not
Engraver/Performer. Fixes crashes when doing \with { \consist .. }
Index: lilypond/lily/context-def.cc
diff -u lilypond/lily/context-def.cc:1.47 lilypond/lily/context-def.cc:1.48
--- lilypond/lily/context-def.cc:1.47 Thu Aug 18 10:58:04 2005
+++ lilypond/lily/context-def.cc Thu Aug 18 11:40:22 2005
@@ -18,6 +18,9 @@
#include "translator-group.hh"
#include "warn.hh"
+#include "engraver-group-engraver.hh"
+#include "performer-group-performer.hh"
+
Context_def::Context_def ()
{
context_aliases_ = SCM_EOL;
@@ -336,9 +339,9 @@
g->simple_trans_list_ = trans_list;
context->implementation_ = g;
- if (dynamic_cast<Engraver_group_engraver *> (g))
+ if (dynamic_cast<Engraver_group *> (g))
g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
- else if (dynamic_cast<Performer_group_performer *> (g))
+ else if (dynamic_cast<Performer_group *> (g))
g->simple_trans_list_ = filter_engravers (g->simple_trans_list_);
g->context_ = context;
Index: lilypond/lily/engraver-group-engraver.cc
diff -u lilypond/lily/engraver-group-engraver.cc:1.65
lilypond/lily/engraver-group-engraver.cc:1.66
--- lilypond/lily/engraver-group-engraver.cc:1.65 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/engraver-group-engraver.cc Thu Aug 18 11:40:22 2005
@@ -1,5 +1,5 @@
/*
- engraver-group-engraver.cc -- implement Engraver_group_engraver
+ engraver-group-engraver.cc -- implement Engraver_group
source file of the GNU LilyPond music typesetter
@@ -15,20 +15,20 @@
#include "translator-dispatch-list.hh"
void
-Engraver_group_engraver::announce_grob (Grob_info info)
+Engraver_group::announce_grob (Grob_info info)
{
announce_infos_.push (info);
- Engraver_group_engraver *dad_eng
+ Engraver_group *dad_eng
= context_->get_parent_context ()
- ? dynamic_cast<Engraver_group_engraver *> (context_->get_parent_context
()->implementation ())
+ ? dynamic_cast<Engraver_group *> (context_->get_parent_context
()->implementation ())
: 0;
if (dad_eng)
dad_eng->announce_grob (info);
}
void
-Engraver_group_engraver::acknowledge_grobs ()
+Engraver_group::acknowledge_grobs ()
{
if (!announce_infos_.size ())
return;
@@ -74,15 +74,15 @@
the group count?
*/
int
-Engraver_group_engraver::pending_grob_count () const
+Engraver_group::pending_grob_count () const
{
int count = announce_infos_.size ();
for (SCM s = context_->children_contexts ();
scm_is_pair (s); s = scm_cdr (s))
{
Context *c = unsmob_context (scm_car (s));
- Engraver_group_engraver *group
- = dynamic_cast<Engraver_group_engraver *> (c->implementation ());
+ Engraver_group *group
+ = dynamic_cast<Engraver_group *> (c->implementation ());
if (group)
count += group->pending_grob_count ();
@@ -91,7 +91,7 @@
}
void
-Engraver_group_engraver::do_announces ()
+Engraver_group::do_announces ()
{
do
{
@@ -99,8 +99,8 @@
scm_is_pair (s); s = scm_cdr (s))
{
Context *c = unsmob_context (scm_car (s));
- Engraver_group_engraver *group
- = dynamic_cast<Engraver_group_engraver *> (c->implementation ());
+ Engraver_group *group
+ = dynamic_cast<Engraver_group *> (c->implementation ());
if (group)
group->do_announces ();
}
@@ -118,7 +118,7 @@
while (pending_grob_count () > 0);
}
-Engraver_group_engraver::Engraver_group_engraver ()
+Engraver_group::Engraver_group ()
{
acknowledge_hash_table_ = SCM_EOL;
acknowledge_hash_table_ = scm_c_make_hash_table (61);
@@ -126,7 +126,7 @@
#include "translator.icc"
-ADD_TRANSLATOR_GROUP (Engraver_group_engraver,
+ADD_TRANSLATOR_GROUP (Engraver_group,
/* doc */ "A group of engravers taken together",
/* create */ "",
/* accept */ "",
@@ -134,7 +134,7 @@
/* write */ "");
void
-Engraver_group_engraver::derived_mark () const
+Engraver_group::derived_mark () const
{
scm_gc_mark (acknowledge_hash_table_);
}
Index: lilypond/lily/engraver.cc
diff -u lilypond/lily/engraver.cc:1.74 lilypond/lily/engraver.cc:1.75
--- lilypond/lily/engraver.cc:1.74 Fri Aug 12 00:04:47 2005
+++ lilypond/lily/engraver.cc Thu Aug 18 11:40:22 2005
@@ -17,10 +17,10 @@
#include "score-context.hh"
#include "lilypond-key.hh"
-Engraver_group_engraver *
+Engraver_group *
Engraver::get_daddy_engraver () const
{
- return dynamic_cast<Engraver_group_engraver *> (get_daddy_translator ());
+ return dynamic_cast<Engraver_group *> (get_daddy_translator ());
}
void
@@ -41,7 +41,7 @@
Grob_info i (this, e);
- Engraver_group_engraver *g = get_daddy_engraver ();
+ Engraver_group *g = get_daddy_engraver ();
if (g)
g->announce_grob (i);
}
Index: lilypond/lily/include/engraver-group-engraver.hh
diff -u lilypond/lily/include/engraver-group-engraver.hh:1.27
lilypond/lily/include/engraver-group-engraver.hh:1.28
--- lilypond/lily/include/engraver-group-engraver.hh:1.27 Fri Aug 12
00:04:45 2005
+++ lilypond/lily/include/engraver-group-engraver.hh Thu Aug 18 11:40:22 2005
@@ -1,6 +1,5 @@
-
/*
- engraver-group-engraver.hh -- declare Engraver_group_engraver
+ engraver-group-engraver.hh -- declare Engraver_group
source file of the GNU LilyPond music typesetter
@@ -13,14 +12,14 @@
#include "engraver.hh"
#include "translator-group.hh"
-class Engraver_group_engraver : public virtual Translator_group
+class Engraver_group : public virtual Translator_group
{
protected:
Array<Grob_info> announce_infos_;
SCM acknowledge_hash_table_;
public:
- VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group_engraver);
- Engraver_group_engraver ();
+ VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group);
+ Engraver_group ();
virtual void derived_mark () const;
void do_announces ();
virtual void announce_grob (Grob_info);
Index: lilypond/lily/include/engraver.hh
diff -u lilypond/lily/include/engraver.hh:1.56
lilypond/lily/include/engraver.hh:1.57
--- lilypond/lily/include/engraver.hh:1.56 Thu Aug 11 11:43:36 2005
+++ lilypond/lily/include/engraver.hh Thu Aug 18 11:40:22 2005
@@ -20,7 +20,7 @@
class Engraver : public Translator
{
- friend class Engraver_group_engraver;
+ friend class Engraver_group;
protected:
/*
take note of item/spanner
@@ -30,7 +30,7 @@
*/
virtual void acknowledge_grob (Grob_info) {}
virtual void announce_grob (Grob_info);
- Engraver_group_engraver *get_daddy_engraver () const;
+ Engraver_group *get_daddy_engraver () const;
public:
/**
Index: lilypond/lily/include/lily-proto.hh
diff -u lilypond/lily/include/lily-proto.hh:1.130
lilypond/lily/include/lily-proto.hh:1.131
--- lilypond/lily/include/lily-proto.hh:1.130 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/include/lily-proto.hh Thu Aug 18 11:40:22 2005
@@ -46,7 +46,7 @@
class Context_specced_music;
class Engraver;
class Engraver;
-class Engraver_group_engraver;
+class Engraver_group;
class Event;
class Event_chord;
class Event_chord_iterator;
@@ -124,7 +124,7 @@
class Paper_system;
class Performance;
class Performer;
-class Performer_group_performer;
+class Performer_group;
class Piano_bar_engraver;
class Pitch;
class Pitch_squash_engraver;
Index: lilypond/lily/include/performer-group-performer.hh
diff -u lilypond/lily/include/performer-group-performer.hh:1.37
lilypond/lily/include/performer-group-performer.hh:1.38
--- lilypond/lily/include/performer-group-performer.hh:1.37 Fri Aug 12
00:04:45 2005
+++ lilypond/lily/include/performer-group-performer.hh Thu Aug 18 11:40:23 2005
@@ -1,5 +1,5 @@
/*
- performer-group-performer.hh -- declare Performer_group_performer
+ performer-group-performer.hh -- declare Performer_group
(c) 1996--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Jan Nieuwenhuizen <[EMAIL PROTECTED]>
@@ -13,10 +13,10 @@
typedef void (Performer:: *Performer_method) (void);
-class Performer_group_performer : public virtual Translator_group
+class Performer_group : public virtual Translator_group
{
public:
- VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Performer_group_performer);
+ VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Performer_group);
void do_announces ();
virtual void announce_element (Audio_element_info);
Index: lilypond/lily/include/performer.hh
diff -u lilypond/lily/include/performer.hh:1.38
lilypond/lily/include/performer.hh:1.39
--- lilypond/lily/include/performer.hh:1.38 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/include/performer.hh Thu Aug 18 11:40:23 2005
@@ -18,8 +18,8 @@
{
public:
VIRTUAL_COPY_CONSTRUCTOR (Translator, Performer);
- friend class Performer_group_performer;
- Performer_group_performer *get_daddy_performer () const;
+ friend class Performer_group;
+ Performer_group *get_daddy_performer () const;
protected:
virtual void announce_element (Audio_element_info);
Index: lilypond/lily/include/recording-group-engraver.hh
diff -u lilypond/lily/include/recording-group-engraver.hh:1.2
lilypond/lily/include/recording-group-engraver.hh:1.3
--- lilypond/lily/include/recording-group-engraver.hh:1.2 Fri Aug 12
00:04:45 2005
+++ lilypond/lily/include/recording-group-engraver.hh Thu Aug 18 11:40:23 2005
@@ -1,5 +1,5 @@
/*
- recording-group-engraver.hh -- declare
+ recording-group-engraver.hh -- declare Recording_group_engraver
source file of the GNU LilyPond music typesetter
@@ -11,7 +11,7 @@
#include "engraver-group-engraver.hh"
-class Recording_group_engraver : public Engraver_group_engraver
+class Recording_group_engraver : public Engraver_group
{
public:
VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Recording_group_engraver);
Index: lilypond/lily/include/score-engraver.hh
diff -u lilypond/lily/include/score-engraver.hh:1.35
lilypond/lily/include/score-engraver.hh:1.36
--- lilypond/lily/include/score-engraver.hh:1.35 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/include/score-engraver.hh Thu Aug 18 11:40:23 2005
@@ -13,7 +13,7 @@
#include "score-translator.hh"
class Score_engraver : public virtual Score_translator,
- public virtual Engraver_group_engraver
+ public virtual Engraver_group
{
System *system_;
Index: lilypond/lily/include/score-performer.hh
diff -u lilypond/lily/include/score-performer.hh:1.33
lilypond/lily/include/score-performer.hh:1.34
--- lilypond/lily/include/score-performer.hh:1.33 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/include/score-performer.hh Thu Aug 18 11:40:23 2005
@@ -14,7 +14,8 @@
/**
Top level performer. Completely takes care of MIDI output
*/
-class Score_performer : public Score_translator, public virtual
Performer_group_performer
+class Score_performer : public Score_translator,
+ public virtual Performer_group
{
public:
VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Score_performer);
Index: lilypond/lily/key-engraver.cc
diff -u lilypond/lily/key-engraver.cc:1.124 lilypond/lily/key-engraver.cc:1.125
--- lilypond/lily/key-engraver.cc:1.124 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/key-engraver.cc Thu Aug 18 11:40:22 2005
@@ -76,10 +76,6 @@
|| key == SCM_EOL)
&& !scm_is_eq (last, key))
{
- cancellation_ = make_item ("KeyCancellation",
- key_event_
- ? key_event_->self_scm () : SCM_EOL);
-
SCM restore = SCM_EOL;
SCM *tail = &restore;
for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
@@ -92,9 +88,16 @@
}
}
- cancellation_->set_property ("alteration-alist", restore);
- cancellation_->set_property ("c0-position",
- get_property ("middleCPosition"));
+ if (scm_is_pair (restore))
+ {
+ cancellation_ = make_item ("KeyCancellation",
+ key_event_
+ ? key_event_->self_scm () : SCM_EOL);
+
+ cancellation_->set_property ("alteration-alist", restore);
+ cancellation_->set_property ("c0-position",
+ get_property ("middleCPosition"));
+ }
}
item_->set_property ("alteration-alist", key);
}
Index: lilypond/lily/performer-group-performer.cc
diff -u lilypond/lily/performer-group-performer.cc:1.62
lilypond/lily/performer-group-performer.cc:1.63
--- lilypond/lily/performer-group-performer.cc:1.62 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/performer-group-performer.cc Thu Aug 18 11:40:22 2005
@@ -1,5 +1,5 @@
/*
- performer-group-performer.cc -- implement Performer_group_performer
+ performer-group-performer.cc -- implement Performer_group
source file of the GNU LilyPond music typesetter
@@ -13,7 +13,7 @@
#include "audio-element.hh"
#include "warn.hh"
-ADD_TRANSLATOR_GROUP (Performer_group_performer,
+ADD_TRANSLATOR_GROUP (Performer_group,
/* doc */ "",
/* create */ "",
/* accept */ "",
@@ -21,18 +21,18 @@
/* write */ "");
void
-Performer_group_performer::announce_element (Audio_element_info info)
+Performer_group::announce_element (Audio_element_info info)
{
announce_infos_.push (info);
Translator_group *t
= context ()->get_parent_context ()->implementation ();
- if (Performer_group_performer *eg = dynamic_cast<Performer_group_performer
*> (t))
+ if (Performer_group *eg = dynamic_cast<Performer_group *> (t))
eg->announce_element (info);
}
void
-Performer_group_performer::acknowledge_audio_elements ()
+Performer_group::acknowledge_audio_elements ()
{
for (int j = 0; j < announce_infos_.size (); j++)
{
@@ -60,7 +60,7 @@
}
void
-Performer_group_performer::do_announces ()
+Performer_group::do_announces ()
{
while (1)
{
@@ -76,23 +76,23 @@
}
void
-Performer_group_performer::play_element (Audio_element *e)
+Performer_group::play_element (Audio_element *e)
{
Context *c = context_->get_parent_context ();
if (c)
{
- Performer_group_performer *pgp = dynamic_cast<Performer_group_performer
*> (c->implementation ());
+ Performer_group *pgp = dynamic_cast<Performer_group *>
(c->implementation ());
pgp->play_element (e);
}
}
int
-Performer_group_performer::get_tempo () const
+Performer_group::get_tempo () const
{
Context *c = context_->get_parent_context ();
if (c)
{
- Performer_group_performer *pgp = dynamic_cast<Performer_group_performer
*> (c->implementation ());
+ Performer_group *pgp = dynamic_cast<Performer_group *>
(c->implementation ());
return pgp->get_tempo ();
}
return 60;
Index: lilypond/lily/performer.cc
diff -u lilypond/lily/performer.cc:1.38 lilypond/lily/performer.cc:1.39
--- lilypond/lily/performer.cc:1.38 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/performer.cc Thu Aug 18 11:40:22 2005
@@ -23,11 +23,11 @@
return get_daddy_performer ()->get_tempo ();
}
-Performer_group_performer *
+Performer_group *
Performer::get_daddy_performer () const
{
return
- dynamic_cast<Performer_group_performer *> (get_daddy_translator ());
+ dynamic_cast<Performer_group *> (get_daddy_translator ());
}
void
Index: lilypond/lily/recording-group-engraver.cc
diff -u lilypond/lily/recording-group-engraver.cc:1.30
lilypond/lily/recording-group-engraver.cc:1.31
--- lilypond/lily/recording-group-engraver.cc:1.30 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/recording-group-engraver.cc Thu Aug 18 11:40:22 2005
@@ -12,7 +12,7 @@
void
Recording_group_engraver::derived_mark () const
{
- Engraver_group_engraver::derived_mark ();
+ Engraver_group::derived_mark ();
scm_gc_mark (now_events_);
scm_gc_mark (accumulator_);
}
@@ -72,7 +72,7 @@
}
ADD_TRANSLATOR_GROUP (Recording_group_engraver,
- "Engraver_group_engraver that records all music events "
+ "Engraver_group that records all music events "
"for this context. Calls the procedure "
"in @code{recordEventSequence} when finished.",
"",
Index: lilypond/lily/score-engraver.cc
diff -u lilypond/lily/score-engraver.cc:1.153
lilypond/lily/score-engraver.cc:1.154
--- lilypond/lily/score-engraver.cc:1.153 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/score-engraver.cc Thu Aug 18 11:40:22 2005
@@ -36,7 +36,7 @@
if (pscore_)
scm_gc_mark (pscore_->self_scm ());
Score_translator::derived_mark ();
- Engraver_group_engraver::derived_mark ();
+ Engraver_group::derived_mark ();
}
void
@@ -85,7 +85,7 @@
system_ = pscore_->root_system ();
context ()->set_property ("rootSystem", system_->self_scm ());
- Engraver_group_engraver::initialize ();
+ Engraver_group::initialize ();
}
void
@@ -102,7 +102,7 @@
if (!to_boolean (context ()->get_property ("skipTypesetting")))
{
precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
- Engraver_group_engraver::do_announces ();
+ Engraver_group::do_announces ();
}
precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP,
UP);
@@ -154,7 +154,7 @@
bool
Score_engraver::try_music (Music *m)
{
- if (Engraver_group_engraver::try_music (m))
+ if (Engraver_group::try_music (m))
return true;
return false;
Index: lilypond/lily/score-performer.cc
diff -u lilypond/lily/score-performer.cc:1.68
lilypond/lily/score-performer.cc:1.69
--- lilypond/lily/score-performer.cc:1.68 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/score-performer.cc Thu Aug 18 11:40:22 2005
@@ -94,7 +94,7 @@
scm_gc_mark (performance_->self_scm ());
Score_translator::derived_mark ();
- Performer_group_performer::derived_mark ();
+ Performer_group::derived_mark ();
}
void
Index: lilypond/lily/translator-group-ctors.cc
diff -u lilypond/lily/translator-group-ctors.cc:1.2
lilypond/lily/translator-group-ctors.cc:1.3
--- lilypond/lily/translator-group-ctors.cc:1.2 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/translator-group-ctors.cc Thu Aug 18 11:40:22 2005
@@ -18,10 +18,10 @@
Translator_group *
get_translator_group (SCM sym)
{
- if (sym == ly_symbol2scm ("Engraver_group_engraver"))
- return new Engraver_group_engraver ();
- else if (sym == ly_symbol2scm ("Performer_group_performer"))
- return new Performer_group_performer ();
+ if (sym == ly_symbol2scm ("Engraver_group"))
+ return new Engraver_group ();
+ else if (sym == ly_symbol2scm ("Performer_group"))
+ return new Performer_group ();
else if (sym == ly_symbol2scm ("Score_engraver"))
return new Score_engraver ();
else if (sym == ly_symbol2scm ("Score_performer"))
Index: lilypond/python/convertrules.py
diff -u lilypond/python/convertrules.py:1.9 lilypond/python/convertrules.py:1.10
--- lilypond/python/convertrules.py:1.9 Fri Aug 5 11:28:29 2005
+++ lilypond/python/convertrules.py Thu Aug 18 11:40:23 2005
@@ -2542,6 +2542,16 @@
'''keyAccidentalOrder->keyAlterationOrder'''))
+
+def conv (str):
+ str = re.sub('Performer_group_performer', 'Performer_group', str)
+ str = re.sub('Engraver_group_engraver', 'Engraver_group', str)
+ return str
+
+conversions.append (((2, 7, 6), conv,
+ '''Performer_group_performer -> Performer_group,
Engraver_group_engraver -> Engraver_group'''))
+
+
################################################################
def str_to_tuple (s):
Index: lilypond/scm/define-grob-properties.scm
diff -u lilypond/scm/define-grob-properties.scm:1.114
lilypond/scm/define-grob-properties.scm:1.115
--- lilypond/scm/define-grob-properties.scm:1.114 Thu Aug 18 09:55:08 2005
+++ lilypond/scm/define-grob-properties.scm Thu Aug 18 11:40:23 2005
@@ -277,7 +277,7 @@
of note-column for horizontal shifting. This is used by
@internalsref{note-collision-interface}.")
(avoid-slur ,symbol? "Method of handling slur collisions.
-Choices are @{around}, @{inside}, @{outside}. If unset, script
+Choices are @code{around}, @code{inside}, @code{outside}. If unset, script
and slur ignore eachother.")
(inspect-quants ,number-pair? "If debugging is set,
set beam quant to this position, and print the respective scores.")
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
