From: Han-Wen Nienhuys Date: Wed, 2 Nov 2005 22:30:43 +0000 (+0000) Subject: * GNUmakefile.in: bugfix: encapsulate mkdir && cd in parens. X-Git-Tag: release/2.7.15~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=59700179aab82bb3d87b526e5fdc43fad3029725;p=lilypond.git * 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. --- diff --git a/ChangeLog b/ChangeLog index 3c5e3926e7..df964a27c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-11-02 Han-Wen Nienhuys + * 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() diff --git a/GNUmakefile.in b/GNUmakefile.in index c81a76af8f..afa22bd739 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -154,9 +154,9 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile 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 diff --git a/input/GNUmakefile b/input/GNUmakefile index 3de1c77c97..0bdb55a478 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -2,7 +2,7 @@ depth = .. 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 diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 4543331568..b5844859f1 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -57,14 +57,11 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten 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; @@ -173,19 +170,6 @@ Side_position_interface::aligned_side (Grob*me, Axis a) 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); @@ -205,6 +189,18 @@ Side_position_interface::aligned_side (Grob*me, Axis a) 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); } diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index c560e5b135..3e04c006bf 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -85,6 +85,9 @@ Staff_performer::process_music () 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. */ diff --git a/scm/script.scm b/scm/script.scm index c6af502c76..2ca17b7998 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -11,17 +11,17 @@ (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) @@ -80,21 +80,22 @@ ("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")))