From: Jan Nieuwenhuizen Date: Thu, 7 Dec 2000 21:22:26 +0000 (+0100) Subject: patch::: 1.3.115.jcn1 X-Git-Tag: release/1.3.116~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6eab06d05832f47c82dff829a9a334bdb86234aa;p=lilypond.git patch::: 1.3.115.jcn1 1.3.115.jcn1 ============ * Bugfix: auto-beamer beaming over bar lines. * Bugfix: consecutive and non-consecutive glissandi. --- Generated by janneke@gnu.org, From = lilypond-1.3.115, To = lilypond-1.3.115.jcn1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.115.jcn1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- diff --git a/CHANGES b/CHANGES index b6874de7a5..274109bda4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,15 @@ +--- ../lilypond-1.3.115/CHANGES Mon Dec 4 17:42:18 2000 +++ b/CHANGES Thu Dec 7 22:22:26 2000 +@@ -1,3 +1,9 @@ +1.3.115.jcn1 +============ + +* Bugfix: auto-beamer beaming over bar lines. +* Bugfix: consecutive and non-consecutive glissandi. + + + 1.3.114.mb1 1.3.115.hwn1 ============ diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index b2d8b87c0b..b1b43938ac 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -61,6 +61,8 @@ and documenting bugfixes. @lilypondfile{glissando.ly} +@lilypondfile{follow-thread.ly} + @section Chord names @@ -83,6 +85,8 @@ and documenting bugfixes. @lilypondfile{beam-position.ly} +@lilypondfile{auto-beam-bar.ly} + @lilypondfile{slur-nice.ly} @lilypondfile{slur-symmetry.ly} @lilypondfile{slur-symmetry-1.ly} diff --git a/VERSION b/VERSION index 989a449275..e47a31ef02 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=115 -MY_PATCH_LEVEL=hwn1 +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/auto-beam-bar.ly b/input/test/auto-beam-bar.ly new file mode 100644 index 0000000000..645c62de7c --- /dev/null +++ b/input/test/auto-beam-bar.ly @@ -0,0 +1,20 @@ +\header{ +texidoc=" +The first two a8 notes should not be beamed. +Also, no automatic beaming accross bar lines. +"; +} + +\score{ +\notes \notes\relative c'' { +\time 2/8; +a8 a +\time 6/8; +a16 cis d a bes g fis4 g8 +%a4. fis4 g8 +a16 g a bes c d % ees8 d c +} +\paper{ + linewidth=-1.; +} +} \ No newline at end of file diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly new file mode 100644 index 0000000000..bf8d2788f6 --- /dev/null +++ b/input/test/beam-rest.ly @@ -0,0 +1,17 @@ +\header{ +texidoc=" +Beams over rests. +"; +} + +\score{ + \context Staff=one \notes\relative c''{ + r4 [r8 g a] + [bes8 r16 f g a] + [bes8 r16 \property Voice.stemLeftBeamCount = #1 f g a] + + } + \paper{ + linewidth =-1; + } +} diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly index d22f1fcf9b..e58e1c91f8 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -1,3 +1,9 @@ +\header{ +texidoc=" +Theads can be traced automagically when they switch staffs by setting +property @code{followThread}. +"; +} % followThread: connect note heads with line when thread switches staff \score{ diff --git a/input/test/glissando.ly b/input/test/glissando.ly index 951557e530..74d43fba58 100644 --- a/input/test/glissando.ly +++ b/input/test/glissando.ly @@ -1,19 +1,22 @@ \header{ texidoc=" -Simple glissando lines between notes are supported. +Simple glissando lines between notes are supported. The first two glissandi are not consecutive. "; } \score{ - < \context Staff=one \notes\relative c''{ - a \glissando e' \glissando a, \glissando - \translator Staff=two - a,, - } - \context Staff=two { \clef bass; \skip 1; } - > + % gliss non gliss and + c \glissando d e \glissando f\break + % consecutive + c \glissando d \glissando e f + } \paper{ linewidth = 70.\mm; + \translator{ + \StaffContext + % makes for handier debugging + % \remove Clef_engraver; + } } } \ No newline at end of file diff --git a/input/test/glissando.ly.orig b/input/test/glissando.ly.orig new file mode 100644 index 0000000000..951557e530 --- /dev/null +++ b/input/test/glissando.ly.orig @@ -0,0 +1,19 @@ +\header{ +texidoc=" +Simple glissando lines between notes are supported. +"; +} + +\score{ + < + \context Staff=one \notes\relative c''{ + a \glissando e' \glissando a, \glissando + \translator Staff=two + a,, + } + \context Staff=two { \clef bass; \skip 1; } + > + \paper{ + linewidth = 70.\mm; + } +} \ No newline at end of file diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index d5af0fcf66..07ff86dceb 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -56,7 +56,7 @@ private: Link_array* stem_l_arr_p_; - bool count_i_; + int count_i_; Moment last_add_mom_; /* @@ -193,7 +193,7 @@ Auto_beam_engraver::consider_begin (Moment test_mom) void Auto_beam_engraver::consider_end (Moment test_mom) { - if (stem_l_arr_p_ && stem_l_arr_p_->size () > 1) + if (stem_l_arr_p_) { /* Allow already started autobeam to end: don't check for noAutoBeaming */ @@ -396,7 +396,6 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info) but the code didn't match: */ #if 1 - consider_end (dur); consider_begin (dur); diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index 9ca614859b..b2717201cf 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -128,10 +128,13 @@ Note_head_line_engraver::create_grobs () announce_grob (line_, last_req_); } + + last_head_ = 0; + if (!follow_ && !req_) + head_ = 0; last_req_ = 0; follow_ = false; - last_head_ = 0; } } diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index ec78e2b2f6..a23e2c6224 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -60,6 +60,9 @@ ((end 1 16 2 4) . ,(make-moment 1 4)) ((end 1 32 2 4) . ,(make-moment 1 8)) + ;; It seems that, because of a bug in the previous auto-beamer, + ;; we had the effect of this setting x + ;; ((end * * 2 8) . ,(make-moment 2 8)) ((end * * 4 8) . ,(make-moment 1 4)) ((end 1 16 4 8) . ,(make-moment 1 4))