From: Jan Nieuwenhuizen Date: Sun, 18 Mar 2001 16:33:23 +0000 (+0100) Subject: patch::: 1.3.139.jcn2 X-Git-Tag: release/1.3.140~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0fc380e6c0c8cc24523c97363fded555dbd1aeac;p=lilypond.git patch::: 1.3.139.jcn2 1.3.139.jcn2 ============ * Small fixes to Coriolan. * Bugfix: don't typeset suicided multi-measure-rests, don't set multi-measure-rests spanning less than one measure. * Bugfix: line-column-location. --- Generated by janneke@gnu.org, From = lilypond-1.3.139.jcn1, To = lilypond-1.3.139.jcn2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.139.jcn2.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 22873b892a..512f4b9e86 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,19 @@ -1.3.139.jcn1 +--- ../lilypond-1.3.139.jcn1/CHANGES Sun Mar 18 14:46:40 2001 +++ b/CHANGES Sun Mar 18 17:33:23 2001 +@@ -1,3 +1,13 @@ +1.3.139.jcn2 +============ + +* Small fixes to Coriolan. + +* Bugfix: don't typeset suicided multi-measure-rests, don't set +multi-measure-rests spanning less than one measure. + +* Bugfix: line-column-location. + + 1.3.139.jcn1 + ============ + 1.3.139.jcn1 ============ * Allow markup text for crecscendoText and decrescendoText. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 00c006f2f5..e2aab17e58 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -347,10 +347,11 @@ warning message will appear and no ties will be created. @end lilypond If you dislike the amount of ties created for a chord, you set -@code{Thread.sparseTies} to true, resulting in a smaller number of +@code{Voice.sparseTies} to true, resulting in a smaller number of ties: @lilypond[fragment,verbatim,center] - \property Thread.sparseTies = ##t +%oops: core dump +% \property Voice.sparseTies = ##t ~ @end lilypond @@ -2366,11 +2367,11 @@ one voice, as common for wind parts in orchestral scores: @lilypond[verbatim,singleline,fragment] \context Staff < \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' { - g g a b r2 + \context Thread=one \relative c'' { + g a b r } - \context Thread=two \notes\relative c'' { - g g r2 g4 f4 + \context Thread=two \relative c'' { + g r2 f4 } > @end lilypond @@ -2383,7 +2384,22 @@ while @code{two} always gets down stems and "Solo II". If you just want the splitting of Threads and setting of directions, and not the textual markings, you may set the property @var{soloADue} to -false. There are a number of other properties that you can use to tweak +false. This mode can be used to set hymns: + +@lilypond[verbatim,singleline,fragment] + \context Staff < + \property Staff.soloADue = ##f + \context Voice=one \partcombine Voice + \context Thread=one \relative c'' { + b4 a c g + } + \context Thread=two \relative c'' { + d,2 a4 g' + } + > +@end lilypond + +There are a number of other properties that you can use to tweak the behavior of part combining, refer to the automatically generated documentation. Look for @code{Thread_devnull_engraver} @code{Voice_devnull_engraver} and @code{A2_engraver}. diff --git a/VERSION b/VERSION index a7cb301d0d..46478ce7a5 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=139 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/pc-mmrest.ly b/input/bugs/pc-mmrest.ly index 4071a597d6..e188fa5098 100644 --- a/input/bugs/pc-mmrest.ly +++ b/input/bugs/pc-mmrest.ly @@ -4,26 +4,57 @@ % the problem is more complex: the mmrest-engraver lives at staff level, % but it seems that we need one per voice. % + +#(set! point-and-click line-column-location) +one = \notes\relative c'' { + + f4 \!e-.\f r2| + R1| + f2\p()es| + \property Voice.crescendoText = #'(lines " " "cresc." " ") + \property Voice.crescendoSpanner = #'dashed-line + d1\<| + d1| + d2 d2| + d2 d2| + \!f1\ff ~| + f1 +} + +two = \notes \relative c'' { + r4 c r2| + R1*6| + c1 ~| + c1 +} + \score { \notes < \context Staff = Viole < \context Voice=one \partcombine Voice - \context Thread=one \relative c''{ R1 d4 d d d } - \context Thread=two { R1*2 } + \context Thread=one \one + \context Thread=two \two > > \paper { -% { \translator { - \StaffContext - \remove Multi_measure_rest_engraver; - \remove Bar_engraver; + \ThreadContext + \consists "Rest_engraver"; } \translator { \VoiceContext + \remove "Rest_engraver"; \consists Multi_measure_rest_engraver; \consists Bar_engraver; } -% } + \translator { + \HaraKiriStaffContext + \remove Multi_measure_rest_engraver; + \remove Bar_engraver; + } + \translator { + \OrchestralScoreContext + RestCollision \override #'maximum-rest-count = #1 + } } } \ No newline at end of file diff --git a/input/bugs/pc-mmrest.ly.orig b/input/bugs/pc-mmrest.ly.orig new file mode 100644 index 0000000000..4071a597d6 --- /dev/null +++ b/input/bugs/pc-mmrest.ly.orig @@ -0,0 +1,29 @@ +% +% mmrests of second voice should not disappear +% +% the problem is more complex: the mmrest-engraver lives at staff level, +% but it seems that we need one per voice. +% +\score { + \notes < + \context Staff = Viole < + \context Voice=one \partcombine Voice + \context Thread=one \relative c''{ R1 d4 d d d } + \context Thread=two { R1*2 } + > + > + \paper { +% { + \translator { + \StaffContext + \remove Multi_measure_rest_engraver; + \remove Bar_engraver; + } + \translator { + \VoiceContext + \consists Multi_measure_rest_engraver; + \consists Bar_engraver; + } +% } + } +} \ No newline at end of file diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index f207171f96..9720596664 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -140,17 +140,22 @@ Multi_measure_rest_engraver::stop_translation_timestep () Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); if (mmrest_p_ && (now_mom () >= start_moment_) - && !mp - && (scm_ilength (mmrest_p_->get_grob_property ("columns")) >= 2)) + && !mp + && (scm_ilength (mmrest_p_->get_grob_property ("columns")) >= 2)) { typeset_grob (mmrest_p_); /* we must keep mmrest_p_ around to set measure-count. */ } + if (lastrest_p_) { - typeset_grob (lastrest_p_); + /* sanity check */ + if (scm_ilength (lastrest_p_->get_grob_property ("columns")) >= 2 + && lastrest_p_->get_bound (LEFT) && lastrest_p_->get_bound (RIGHT) + && lastrest_p_->get_bound (LEFT) != lastrest_p_->get_bound (RIGHT)) + typeset_grob (lastrest_p_); lastrest_p_ = 0; } diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 7a83efbd41..f216aeac8a 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -135,7 +135,7 @@ Multi_measure_rest::brew_molecule (SCM smob) Molecule s; - int measures = 1; + int measures = 0; SCM m (me->get_grob_property ("measure-count")); if (gh_number_p (m)) { @@ -144,6 +144,8 @@ Multi_measure_rest::brew_molecule (SCM smob) SCM limit = me->get_grob_property ("expand-limit"); + if (measures <= 0) + return SCM_EOL; if (measures == 1) { s = musfont->find_by_name (Rest::glyph_name (me, 0, "")); diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index ff033a920c..1ad0eaef57 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -18,12 +18,12 @@ staffCombinePianoStaffProperties = { \property PianoStaff.soloIIText = #"" % This is non-conventional, but currently it is % the only way to tell the difference. - \property PianoStaff.aDueText = #"\\`a2" + \property PianoStaff.aDueText = #"a2" \property PianoStaff.splitInterval = #'(1 . 0) \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) \property PianoStaff.noDirection = ##t } -#(set! point-and-click #t) +#(set! point-and-click line-column-location) #(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 8c6e89738e..4861fc0a4e 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -1,4 +1,4 @@ -#(set! point-and-click #t) +#(set! point-and-click line-column-location) \header{ filename = "violino-viola.ly"; title = "Vier Duette"; diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 555a93fc65..bc01566375 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -1,4 +1,4 @@ -#(set! point-and-click #t) +#(set! point-and-click line-column-location) opus = "BWV 924" piece = "1" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 6515363d5e..7cc393dd7a 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -1,4 +1,4 @@ -#(set! point-and-click #t) +#(set! point-and-click line-column-location) opus= "BWV 939" piece = "2" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 7b47bee65a..0a72241a69 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -1,4 +1,4 @@ -#(set! point-and-click #t) +#(set! point-and-click line-column-location) opus= "BWV 999" piece = "3" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 6cfb776a0e..21ebac2887 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -1,4 +1,4 @@ -#(set! point-and-click #t) +#(set! point-and-click line-column-location) opus = "BWV 925" piece = "4" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 9afd7e04e2..04b810b9d8 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -1,4 +1,4 @@ -#(set! point-and-click #t) +#(set! point-and-click line-column-location) piece = "5" opus = "BWV 926" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 56db045f37..3ddbbe51f1 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -1,4 +1,4 @@ -#(set! point-and-click #t) +#(set! point-and-click line-column-location) opus = "BWV 940" piece = "6" diff --git a/scm/lily.scm b/scm/lily.scm index 04c217ed46..3019ca7bdd 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -23,7 +23,7 @@ (define (line-column-location line col file) "Print an input location, including column number ." (string-append (number->string line) ":" - (number->string col) " " file " ") + (number->string col) " " file) ) (define (line-location line col file)