From 73c014ca80b74bfed28e383649f0e15042fcd648 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:46:16 +0000 Subject: [PATCH] lilypond-1.1.23 --- aclocal.m4 | 4 +-- input/bugs/beam-translator.ly | 25 +++++++++++++++++++ input/test/slur-interstaff.ly | 6 +++-- lily/bow.cc | 1 + lily/clef-engraver.cc | 3 ++- lily/heads-engraver.cc | 3 ++- lily/include/note-head.hh | 8 +++--- lily/note-head.cc | 1 + .../J.S.Bach/Petites-Preludes/preludes-1.ly | 3 ++- stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 4 +-- 11 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 input/bugs/beam-translator.ly diff --git a/aclocal.m4 b/aclocal.m4 index c6bcc95f08..0e035cad95 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -267,7 +267,7 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_SUBST(CONFIGSUFFIX) AC_CANONICAL_HOST - AC_CHECK_PROGS(MAKE, make gmake, error) + AC_CHECK_PROGS(MAKE, gmake make, error) AC_CHECK_PROGS(FIND, find, error) dnl system supplied INSTALL is unsafe; use our own install. @@ -287,7 +287,7 @@ dnl fi if test "$?" = 1 then AC_STEPMAKE_WARN(Please install *GNU* make) - fi + fi fi AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) diff --git a/input/bugs/beam-translator.ly b/input/bugs/beam-translator.ly new file mode 100644 index 0000000000..42802aa556 --- /dev/null +++ b/input/bugs/beam-translator.ly @@ -0,0 +1,25 @@ +\score{ + \type GrandStaff < + \type Staff=one \notes\relative c'{ + s1 + } + \type Staff=two \notes\relative c'{ + \clef bass; + s2 + \translator Staff=one \stemup [c8 c c c ] + % the translator switch below, intended for the next beam, + % affects (and breaks) the beam above + \translator Staff=two + } + > + \paper{ + % no slur damping + slur_slope_damping = 10.0; + \translator{ + \GrandStaffContext + minVerticalAlign = 3.0*\staffheight; + maxVerticalAlign = 3.0*\staffheight; + } + linewidth=-1.; + } +} diff --git a/input/test/slur-interstaff.ly b/input/test/slur-interstaff.ly index 4670c82701..ebf5b9c0a1 100644 --- a/input/test/slur-interstaff.ly +++ b/input/test/slur-interstaff.ly @@ -13,8 +13,10 @@ \translator Staff=two \stemup c4( \translator Staff=one c \break c )c r2 - r1 - r1 +% \stemdown c4( \translator Staff=two c c \translator Staff=one )c + \stemdown d4( \translator Staff=two c c \translator Staff=one )d + \translator Staff=two + \stemup c4( \translator Staff=one c c \translator Staff=two )c r1 } \type Staff=two \notes\relative c'{ diff --git a/lily/bow.cc b/lily/bow.cc index 66c1bfd562..bd4827ba91 100644 --- a/lily/bow.cc +++ b/lily/bow.cc @@ -88,6 +88,7 @@ Bow::do_height () const Real y = c[i][Y_AXIS]; iv.unite (Interval (y,y)); } + iv -= interstaff_f_; return iv; } diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index ca50b0dab2..737f4ff4ff 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -150,7 +150,8 @@ Clef_engraver::acknowledge_element (Score_element_info info) { if (Note_head * h = dynamic_cast(it_l)) { - h->position_i_ += c0_position_i_; + // h->position_i_ += c0_position_i_; + h->position_i_ = h->steps_i_ + c0_position_i_; } else if (Local_key_item *i = dynamic_cast (it_l)) { diff --git a/lily/heads-engraver.cc b/lily/heads-engraver.cc index b60f7f2b45..c2d52cf139 100644 --- a/lily/heads-engraver.cc +++ b/lily/heads-engraver.cc @@ -46,7 +46,8 @@ Note_heads_engraver::do_process_requests() dot_p_arr_.push (d); } - note_p->position_i_ = note_req_l->pitch_.steps (); + note_p->steps_i_ = note_req_l->pitch_.steps (); + // note_p->position_i_ = note_req_l->pitch_.steps (); Score_element_info itinf (note_p,note_req_l); diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 1a34c99f23..1cc0bad9b8 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -18,8 +18,11 @@ class Note_head : public Rhythmic_head { public: - + /// position of top line (5 linestaff: 8) int position_i_; + + /// pitch in steps + int steps_i_; /// -1 = lowest, 0 = inside, 1 = top int extremal_i_; @@ -28,9 +31,6 @@ public: int staff_size_i_; Direction x_dir_; - /** - position of top line (5 linestaff: 8) - */ Note_head (); static int compare (Note_head * const &a, Note_head *const &b) ; diff --git a/lily/note-head.cc b/lily/note-head.cc index cbd0c69839..10cb7b1c25 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -20,6 +20,7 @@ Note_head::Note_head () { x_dir_ = CENTER; staff_size_i_= 8; // UGH + steps_i_ = 0; position_i_ = 0; extremal_i_ = 0; } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index d544c730f7..274263993a 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -68,7 +68,8 @@ one = \type Voice=one \notes\relative c { [)d c'-5( f,-3 e-2] [d-1 b'-5 f-3 d-2] | [)c b'-5( e,-3 d-2] [c-1 a'-5 e-3 c-2] [)b-1 a'-5( d,-3 c-2] [b-1 g'-5 d-3 b-2] | - [)a g'-5 c,-4 b] [a-"poco a poco dim." fis'-5 c-2 a-1] +% [)a g'-5 c,-4 b] [a-"poco a poco dim." fis'-5 c-2 a-1] + [)a g'-5 c,-4 b] [a fis'-5 c-2 a-1] [b-2 f' d-4 c] [b f' d-4 b-2] | [g e' c-3 b] [a e'-5 c-3 a-1] [fis-2 d' b-3 a] [g-1 d'-5 b-4 g-2] | diff --git a/stepmake/VERSION b/stepmake/VERSION index 77de07ba24..397e3cf00f 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=66 +PATCH_LEVEL=67 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index ff733a0c2d..7cab045e68 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -265,7 +265,7 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_SUBST(CONFIGSUFFIX) AC_CANONICAL_HOST - AC_CHECK_PROGS(MAKE, make gmake, error) + AC_CHECK_PROGS(MAKE, gmake make, error) AC_CHECK_PROGS(FIND, find, error) dnl system supplied INSTALL is unsafe; use our own install. @@ -285,7 +285,7 @@ dnl fi if test "$?" = 1 then AC_STEPMAKE_WARN(Please install *GNU* make) - fi + fi fi AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) -- 2.39.5