+2005-05-01 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/tweak-registration.cc (insert_tweak_from_file): dubious
+ bugfix. Make sure that 0x0 isn't passed into scm_cons(). Fixes
+ crash with tweak editor.
+
2005-04-30 Han-Wen Nienhuys <hanwen@xs4all.nl>
* lily/part-combine-engraver.cc: add space to variable list.
;
markup_braced_list_body:
- /* empty */ { $$ = scm_list (SCM_EOL); }
+ /* empty */ { $$ = SCM_EOL; }
| markup_braced_list_body markup {
$$ = scm_cons ($2, $1);
}
markup:
markup_head_1_list simple_markup {
- $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2)));
+ SCM mapper = ly_lily_module_constant ("map-markup-command-list");
+ $$ = scm_car (scm_call_2 (mapper, $1, scm_list_1 ($2)));
}
| simple_markup {
$$ = $1;
&& scm_car (skey) == ly_symbol2scm ("key"));
Object_key const *key = undumper_->get_key (scm_to_int (scm_cadr (skey)));
- if (tweaks_.find (key) == tweaks_.end ())
- tweaks_[key] = SCM_EOL;
- tweaks_[key] = scm_cons (scm_cdr (tweak), tweaks_[key]);
+ SCM existing = SCM_EOL;
+ Tweak_map::const_iterator prev = tweaks_.find (key);
+ if (prev != tweaks_.end ())
+ existing = (*prev).second;
+
+ tweaks_[key] = scm_cons (scm_cdr (tweak), existing);
}
void
(if (defined? 'set-debug-cell-accesses!)
(set-debug-cell-accesses! #f))
-;;(set-debug-cell-accesses! 5000)
+;(set-debug-cell-accesses! 1000)
(use-modules (ice-9 regex)
(ice-9 safe)