create-new property.
* lily/context-specced-music-iterator.cc (construct_children):
inspect 'create-new property iso. magical $uniqueContextId context
id.
* lily/parser.yy (optional_id): allow \new "Bar" = "foo" too.
* lily/context-key-manager.cc (Module): new file. Encapsulate
object key generation.
* lily/include/context-key-manager.hh (Module): new file.
+2006-02-12 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * scm/define-music-properties.scm (all-music-properties):
+ create-new property.
+
+ * lily/context-specced-music-iterator.cc (construct_children):
+ inspect 'create-new property iso. magical $uniqueContextId context
+ id.
+
+ * lily/parser.yy (optional_id): allow \new "Bar" = "foo" too.
+
+ * lily/context-key-manager.cc (Module): new file. Encapsulate
+ object key generation.
+
+ * lily/include/context-key-manager.hh (Module): new file.
+
2006-02-11 Han-Wen Nienhuys <hanwen@xs4all.nl>
* scm/define-grobs.scm (all-grob-descriptions): center instrument
-
-\context PianoStaff <<
- \context Staff = "treble" {
- \set PianoStaff.instrument = "Piano"
- \set Staff.instrument = "Right" { c''4 }}
- \context Staff = "bass" {
- \set Staff.instrument = "Left"
- \clef bass c4
+\new StaffGroup <<
+ \context PianoStaff <<
+ \context Staff = "treble" {
+ \set PianoStaff.instrument = "Piano"
+ \set Staff.instrument = "Right" { c''4 }}
+ \context Staff = "bass" {
+ \set Staff.instrument = "Left"
+ \clef bass c4
+ }
+ >>
+
+ \lyrics {
+ \set vocalName = "bert"
+ blah
}
+ \new Staff { c''4 }
>>
-
-
-
-
Engraver *trans)
{
+ (void)note;
/*
We construct the accidentals at the originating Voice
level, so that we get the property settings for
Grob *note_head,
Engraver *trans)
{
-
+ (void) note;
Grob *a
= make_grob_from_properties (trans,
ly_symbol2scm ("AccidentalSuggestion"),
--- /dev/null
+/*
+ context-key-manager.cc -- implement Context_key_manager
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+*/
+
+#include "context-key-manager.hh"
+#include "object-key.hh"
+#include "lilypond-key.hh"
+#include "main.hh"
+
+Context_key_manager::Context_key_manager (Object_key const *key)
+{
+ key_ = key;
+}
+
+void
+Context_key_manager::unprotect () const
+{
+ if (key_)
+ ((Object_key *)key_)->unprotect ();
+}
+
+
+Object_key const *
+Context_key_manager::get_context_key (Moment now, string type, string id)
+{
+ if (!use_object_keys)
+ return 0;
+
+ string now_key = type + "@" + id;
+
+ int disambiguation_count = 0;
+ if (context_counts_.find (now_key) != context_counts_.end ())
+ disambiguation_count = context_counts_[now_key];
+
+ context_counts_[now_key] = disambiguation_count + 1;
+
+ return new Lilypond_context_key (key (),
+ now,
+ type, id,
+ disambiguation_count);
+}
+
+
+Object_key const *
+Context_key_manager::get_grob_key (Moment m, string name)
+{
+ if (!use_object_keys)
+ return 0;
+
+ return create_grob_key (m, name);
+}
+
+/*
+ We want to have a key for some objects anyway, so we can invent a
+ unique identifier for each (book,score) tuple.
+*/
+Object_key const *
+Context_key_manager::create_grob_key (Moment now, string name)
+{
+ int disambiguation_count = 0;
+ if (grob_counts_.find (name) != grob_counts_.end ())
+ disambiguation_count = grob_counts_[name];
+ grob_counts_[name] = disambiguation_count + 1;
+
+ Object_key *k = new Lilypond_grob_key (key (),
+ now,
+ name,
+ disambiguation_count);
+
+ return k;
+}
+
+void
+Context_key_manager::gc_mark () const
+{
+ if (key_)
+ scm_gc_mark (key_->self_scm ());
+
+}
+
+void
+Context_key_manager::clear ()
+{
+ if (!use_object_keys)
+ return;
+
+ grob_counts_.clear ();
+ context_counts_.clear ();
+}
+
+Context_key_manager::Context_key_manager (Context_key_manager const &src)
+{
+ (void)src;
+ assert (false);
+}
Context *a = 0;
- if (c_id == "$uniqueContextId")
- a = get_outlet ()->create_unique_context (ct, ops);
+ if (to_boolean (get_music()->get_property ("create-new")))
+ a = get_outlet ()->create_unique_context (ct, c_id, ops);
else
a = get_outlet ()->find_create_context (ct, c_id, ops);
#include "context-def.hh"
#include "international.hh"
-#include "lilypond-key.hh"
#include "ly-smobs.icc"
#include "main.hh"
#include "output-def.hh"
}
}
-Context::Context (Context const &)
+Context::Context (Context const &src)
+ : key_manager_ (src.key_manager_)
{
assert (false);
}
Context::Context (Object_key const *key)
+ : key_manager_ (key)
{
- key_ = key;
daddy_context_ = 0;
init_ = false;
aliases_ = SCM_EOL;
UGH UGH
const correctness.
*/
- if (key_)
- ((Object_key *)key)->unprotect ();
+ key_manager_.unprotect();
}
/* TODO: this shares code with find_create_context (). */
Context *
-Context::create_unique_context (SCM n, SCM operations)
+Context::create_unique_context (SCM name, string id, SCM operations)
{
/*
Don't create multiple score contexts.
*/
if (dynamic_cast<Global_context *> (this)
&& dynamic_cast<Global_context *> (this)->get_score_context ())
- return get_score_context ()->create_unique_context (n, operations);
+ return get_score_context ()->create_unique_context (name, id, operations);
/*
TODO: use accepts_list_.
*/
vector<Context_def*> path
- = unsmob_context_def (definition_)->path_to_acceptable_context (n, get_output_def ());
+ = unsmob_context_def (definition_)->path_to_acceptable_context (name, get_output_def ());
if (path.size ())
{
// start at 1. The first one (index 0) will be us.
for (vsize i = 0; i < path.size (); i++)
{
- SCM ops = (i == path.size () -1) ? operations : SCM_EOL;
-
+ SCM ops = SCM_EOL;
+ string id_str = "\\new";
+ if (i == path.size () - 1)
+ {
+ ops = operations;
+ id_str = id;
+ }
current = current->create_context (path[i],
- "\\new",
+ id_str,
ops);
}
*/
Context *ret = 0;
if (daddy_context_ && !dynamic_cast<Global_context *> (daddy_context_))
- ret = daddy_context_->create_unique_context (n, operations);
+ ret = daddy_context_->create_unique_context (name, id, operations);
else
{
warning (_f ("can't find or create new `%s'",
- ly_symbol2string (n).c_str ()));
+ ly_symbol2string (name).c_str ()));
ret = 0;
}
return ret;
SCM ops)
{
string type = ly_symbol2string (cdef->get_context_name ());
- Object_key const *key = get_context_key (type, id);
+ Object_key const *key = key_manager_.get_context_key (now_mom(), type, id);
Context *new_context
= cdef->instantiate (ops, key);
return new_context;
}
-Object_key const *
-Context::get_context_key (string type, string id)
-{
- if (!use_object_keys)
- return 0;
-
- string now_key = type + "@" + id;
-
- int disambiguation_count = 0;
- if (context_counts_.find (now_key) != context_counts_.end ())
- disambiguation_count = context_counts_[now_key];
-
- context_counts_[now_key] = disambiguation_count + 1;
-
- return new Lilypond_context_key (key (),
- now_mom (),
- type, id,
- disambiguation_count);
-}
-
-Object_key const *
-Context::get_grob_key (string name)
-{
- if (!use_object_keys)
- return 0;
-
- return create_grob_key (name);
-}
-
-/*
- We want to have a key for some objects anyway, so we can invent a
- unique identifier for each (book,score) tuple.
-*/
-Object_key const *
-Context::create_grob_key (string name)
-{
- int disambiguation_count = 0;
- if (grob_counts_.find (name) != grob_counts_.end ())
- disambiguation_count = grob_counts_[name];
- grob_counts_[name] = disambiguation_count + 1;
-
- Object_key *k = new Lilypond_grob_key (key (),
- now_mom (),
- name,
- disambiguation_count);
-
- return k;
-}
-
/*
Default child context as a SCM string, or something else if there is
none.
return 1;
}
+Object_key const *
+Context::get_grob_key (string name)
+{
+ return key_manager_.get_grob_key (now_mom (), name);
+}
+
+Object_key const *
+Context::get_context_key (string name, string id)
+{
+ return key_manager_.get_context_key (now_mom (), name, id);
+}
+
SCM
Context::mark_smob (SCM sm)
{
Context *me = (Context *) SCM_CELL_WORD_1 (sm);
- if (me->key_)
- scm_gc_mark (me->key_->self_scm ());
+ me->key_manager_.gc_mark();
scm_gc_mark (me->context_list_);
scm_gc_mark (me->aliases_);
if (!use_object_keys)
return;
- grob_counts_.clear ();
- context_counts_.clear ();
+ key_manager_.clear ();
for (SCM s = context_list_; scm_is_pair (s); s = scm_cdr (s))
unsmob_context (scm_car (s))->clear_key_disambiguations ();
}
--- /dev/null
+/*
+ context-key-manager.hh -- declare Context_key_manager
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+*/
+
+#ifndef CONTEXT_KEY_MANAGER_HH
+#define CONTEXT_KEY_MANAGER_HH
+
+#include "lily-proto.hh"
+
+#include <map>
+using namespace std;
+
+class Context_key_manager
+{
+ Object_key const *key_;
+ map<string, int> grob_counts_;
+ map<string, int> context_counts_;
+
+
+protected:
+ friend class Context;
+
+ Context_key_manager (Object_key const *);
+ Context_key_manager (Context_key_manager const &src);
+
+
+ void unprotect () const;
+ void gc_mark () const;
+ void clear ();
+ Object_key const *key () const { return key_; }
+ Object_key const *create_grob_key (Moment, string);
+ Object_key const *get_grob_key (Moment, string);
+ Object_key const *get_context_key (Moment, string, string);
+};
+
+#endif /* CONTEXT_KEY_MANAGER_HH */
+
+
#ifndef CONTEXT_HH
#define CONTEXT_HH
-#include <map>
-using namespace std;
#include "moment.hh"
#include "lily-proto.hh"
#include "virtual-methods.hh"
+#include "context-key-manager.hh"
class Context
{
int iterator_count_;
bool init_;
- map<string, int> grob_counts_;
- map<string, int> context_counts_;
-
protected:
- Object_key const *key_;
Context *daddy_context_;
SCM definition_;
-
+ Context_key_manager key_manager_;
+
SCM properties_scm_;
SCM context_list_;
SCM accepts_list_;
friend class Context_def;
void clear_key_disambiguations ();
+
public:
- Object_key const *key () const { return key_; }
- Object_key const *create_grob_key (string);
- Object_key const *get_grob_key (string);
- Object_key const *get_context_key (string, string);
+ Object_key const *get_grob_key (string name);
+ Object_key const *get_context_key (string name, string id);
Context *create_context (Context_def *, string, SCM);
string id_string () const { return id_string_; }
Context *find_create_context (SCM context_name,
string id, SCM ops);
- Context *create_unique_context (SCM context_name,
+ Context *create_unique_context (SCM context_name, string context_id,
SCM ops);
vector<Context*> path_to_acceptable_context (SCM alias,
Output_def *) const;
#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
Music *property_op_to_music (SCM op);
-Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops);
+Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new);
SCM get_next_unique_context_id ();
SCM get_next_unique_lyrics_context_id ();
%type <scm> object_id_setting
%type <scm> octave_check
%type <scm> optional_context_mod
+%type <scm> optional_id
%type <scm> optional_notemode_duration
%type <scm> pitch
%type <scm> pitch_also_in_chords
}
;
+optional_id:
+ /**/ { $$ = SCM_EOL; }
+ | '=' simple_string {
+ $$ = $2;
+ }
+ ;
+
+
Prefix_composite_music:
Generic_prefix_music_scm {
$$ = run_music_function (THIS, $1);
}
- | CONTEXT simple_string '=' simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, $4, $6, $5);
-
- }
- | CONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
+ | CONTEXT simple_string optional_id optional_context_mod Music {
+ $$ = context_spec_music ($2, $3, $5, $4, false);
}
- | NEWCONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, get_next_unique_context_id (), $4,
- $3);
+ | NEWCONTEXT simple_string optional_id optional_context_mod Music {
+ $$ = context_spec_music ($2, $3, $5, $4, true);
}
| TIMES fraction Music
THIS->lexer_->pop_state ();
}
| mode_changing_head_with_context optional_context_mod Grouped_music_list {
- $$ = context_spec_music ($1, get_next_unique_context_id (),
- $3, $2);
+ $$ = context_spec_music ($1, SCM_UNDEFINED, $3, $2, true);
if ($1 == ly_symbol2scm ("ChordNames"))
{
Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
name = get_next_unique_lyrics_context_id ();
voice = context_spec_music (scm_makfrom0str ("Voice"),
name,
- voice, SCM_EOL);
+ voice, SCM_EOL, false);
}
SCM context = scm_makfrom0str ("Lyrics");
Music *music = unsmob_music (scm_car (s));
Music *com = make_lyric_combine_music (name, music);
Music *csm = context_spec_music (context,
- get_next_unique_context_id (), com, SCM_EOL);
+ SCM_UNDEFINED, com, SCM_EOL, true);
lst = scm_cons (csm->self_scm (), lst);
}
all->set_property ("elements", scm_cons (voice->self_scm (),
ly_symbol2scm ("push"),
scm_cadr ($2),
$5, $3));
- $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
}
| OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar {
$$ = property_op_to_music (scm_list_5 (
ly_symbol2scm ("push"),
scm_cadr ($2),
$6, $4, $3));
- $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
}
| REVERT context_prop_spec embedded_scm {
$$ = property_op_to_music (scm_list_3 (
scm_cadr ($2),
$3));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
}
| SET context_prop_spec '=' scalar {
$$ = property_op_to_music (scm_list_3 (
ly_symbol2scm ("assign"),
scm_cadr ($2),
$4));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
}
| UNSET context_prop_spec {
$$ = property_op_to_music (scm_list_2 (
ly_symbol2scm ("unset"),
scm_cadr ($2)));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
}
| ONCE music_property_def {
SCM e = $2->get_property ("element");
sounds_as_c.smobbed_copy());
$$->set_spot (@$);
$$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED,
- $$, SCM_EOL);
+ $$, SCM_EOL, false);
}
| PARTIAL duration_length {
Moment m = - unsmob_duration ($2)->get_length ();
Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
p->set_spot (@$);
p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
- p, SCM_EOL);
+ p, SCM_EOL, false);
p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED,
- p, SCM_EOL);
+ p, SCM_EOL, false);
$$ = p;
}
}
Music*
-context_spec_music (SCM type, SCM id, Music *m, SCM ops)
+context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new)
{
Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
csm->set_property ("context-type",
scm_is_symbol (type) ? type : scm_string_to_symbol (type));
csm->set_property ("property-operations", ops);
+ if (create_new)
+ csm->set_property ("create-new", SCM_BOOL_T);
if (scm_is_string (id))
csm->set_property ("context-id", id);
SCM scm_stencil = Text_interface::is_markup (t)
? Text_interface::interpret_markup (me->layout ()->self_scm (), chain, t)
: SCM_EOL;
+
if (Stencil *p = unsmob_stencil (scm_stencil))
- return *p;
+ {
+ SCM align_y = me_grob->get_property ("self-alignment-Y");
+ if (scm_is_number (align_y))
+ p->align_to (Y_AXIS, robust_scm2double (align_y, 0.0));
+ return *p;
+ }
return Stencil();
}
"collapse-height "
"style "
"text "
- "long-text "
+ "long-text "
+ "self-alignment-Y "
"thickness "
);
\override VerticalAxisGroup #'remove-first = ##t
\override VerticalAxisGroup #'remove-empty = ##t
\override SeparationItem #'padding = #0.2
- \override InstrumentName #'Y-offset = #0.0
+ \override InstrumentName #'self-alignment-Y = ##f
+
+ %% sync with define-grobs.scm ;
+ \override InstrumentName #'font-size = #1.0
%% make sure that barlines aren't collapsed, when
%% Bar_engraver is there.
(stencil . ,ly:system-start-delimiter::print)
(X-offset . ,ly:side-position-interface::x-aligned-side)
(direction . ,LEFT)
- (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
(self-alignment-Y . ,CENTER)
(meta . ((class . Spanner)
(interfaces . (system-start-text-interface
(compress-procedure ,procedure? "compress this music expression. Argument 1: the music, arg 2: factor")
(context-id ,string? "name of context")
(context-type ,symbol? "type of context")
+ (create-new ,boolean? "Create a fresh context.")
(descend-only ,boolean? "If set, this @code{\\context} will only
descend in the context tree.")
(denominator ,integer? "denominator in a time signature")
projects / lilypond.git / commitdiff