2005-11-02 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * GNUmakefile.in: bugfix: encapsulate mkdir && cd in parens.
+
+ * lily/staff-performer.cc (process_music): add audio
+ elements. This makes MIDI instrument changes work once again.
+
* lily/main.cc (LY_DEFINE): add gmane address.
* lily/beam.cc: remove calc_positions()
ln -sf ../../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
ln -s $(top-src-dir)/elisp/*.el .
$(foreach i,$(CATALOGS), \
- mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \
+ (mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \
cd $(tree-share)/locale/$i/LC_MESSAGES && \
- ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
+ ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&) true
# touch $@
touch $(tree-share-prefix)/lilypond-force
SUBDIRS = test regression tutorial no-notation mutopia
-examples = typography-demo les-nereides puer-fragment wilhelmus sakura-sakura proportional
+examples = typography-demo les-nereides wilhelmus sakura-sakura proportional
#xiao-haizi-guai-guai
LOCALSTEPMAKE_TEMPLATES=ly mutopia
Grob *common = common_refpoint_of_array (support, me->get_parent (a), a);
Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me);
- bool include_staff = false;
-
- if (staff_symbol
- && a == Y_AXIS)
- {
- if (scm_is_number (me->get_property ("staff-padding")))
- include_staff = true;
- }
+ bool include_staff =
+ staff_symbol
+ && a == Y_AXIS
+ && scm_is_number (me->get_property ("staff-padding"))
+ && !to_boolean (me->get_property ("quantize-position"));
Interval dim;
Interval staff_extents;
Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
if (staff && a == Y_AXIS)
{
- if (scm_is_number (me->get_property ("staff-padding")))
- {
- Real padding
- = Staff_symbol_referencer::staff_space (me)
- * scm_to_double (me->get_property ("staff-padding"));
-
- Grob *common = me->common_refpoint (staff, Y_AXIS);
-
- Interval staff_size = staff->extent (common, Y_AXIS);
- Real diff = dir*staff_size[dir] + padding - dir * (o + iv[-dir]);
- o += dir * max (diff, 0.0);
- }
-
if (to_boolean (me->get_property ("quantize-position")))
{
Grob *common = me->common_refpoint (staff, Y_AXIS);
o += dir * 0.5 * ss;
}
}
+ else if (scm_is_number (me->get_property ("staff-padding")))
+ {
+ Real padding
+ = Staff_symbol_referencer::staff_space (me)
+ * scm_to_double (me->get_property ("staff-padding"));
+
+ Grob *common = me->common_refpoint (staff, Y_AXIS);
+
+ Interval staff_size = staff->extent (common, Y_AXIS);
+ Real diff = dir*staff_size[dir] + padding - dir * (o + iv[-dir]);
+ o += dir * max (diff, 0.0);
+ }
}
return scm_from_double (o);
}
instrument_ = new Audio_instrument (str);
announce_element (Audio_element_info (instrument_, 0));
+ audio_staff_->add_audio_item (instrument_);
+ audio_staff_->add_audio_item (instrument_name_);
+
/*
Have to be here before notes arrive into the staff.
*/
(direction . 1)))
("accent" .
((avoid-slur . around)
- (staff-padding . #f) (quantize-position . #t)
+ (quantize-position . #t)
(script-stencil . (feta . ("sforzato" . "sforzato")))
(side-relative-direction . -1)))
("espressivo" .
((avoid-slur . around)
- (staff-padding . #f) (quantize-position . #t)
+ (quantize-position . #t)
(script-stencil . (feta . ("espr" . "espr")))
(side-relative-direction . -1)))
("marcato" .
((script-stencil . (feta . ("dmarcato" . "umarcato")))
- (staff-padding . #f) (quantize-position . #t)
+ (quantize-position . #t)
(side-relative-direction . -1)))
("staccatissimo" .
((avoid-slur . inside)
("staccato" .
((script-stencil . (feta . ("staccato" . "staccato")))
(side-relative-direction . -1)
- (follow-into-staff . #t)
+
+ (quantize-position . #t)
(avoid-slur . inside)
(script-priority . -100)))
("tenuto" .
((script-stencil . (feta . ("tenuto" . "tenuto")))
- (staff-padding . #f) (quantize-position . #t)
+ (quantize-position . #t)
(avoid-slur . inside)
(side-relative-direction . -1)))
("comma" .
((script-stencil . (feta . ("lcomma" . "rcomma")))
- (staff-padding . #f) (quantize-position . #t)
+ (quantize-position . #t)
(direction . 1)))
("varcomma" .
((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
- (staff-padding . #f) (quantize-position . #t)
+ (quantize-position . #t)
(direction . 1)))
("upbow" .
((script-stencil . (feta . ("upbow" . "upbow")))