From: Jan Nieuwenhuizen Date: Mon, 27 Dec 1999 16:43:44 +0000 (+0100) Subject: patch::: 1.3.17.jcn1 X-Git-Tag: release/1.3.18~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bca7a3578db7183d5fdca41f6008b820a8b69d67;p=lilypond.git patch::: 1.3.17.jcn1 1.3.17.jcn1 =========== * Bugfix: multi-measure rest: #measures (even more scm2int/int2scm mixups!) * mutopia/J.S.Bach/pa.ly: organ score (for my father) * small fix to mutopia/J.S.Bach/Duette/violino-ii.ly --- diff --git a/CHANGES b/CHANGES index 59d59c2a77..3fbde72607 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +1.3.17.jcn1 +=========== + +* Bugfix: multi-measure rest: #measures (even more scm2int/int2scm mixups!) + +* mutopia/J.S.Bach/pa.ly: organ score (for my father) + +* small fix to mutopia/J.S.Bach/Duette/violino-ii.ly + 1.3.16.hwn1 =========== diff --git a/TODO b/TODO index fb57dd8de0..fd1e7d2e2d 100644 --- a/TODO +++ b/TODO @@ -5,7 +5,6 @@ Features you cannot find in the documentation as working, should be mentioned here. This is an assorted collection of stuff that will be done, might be done, or is an idea that we want to think about. -m Most of the items are marked in the code as well Grep -i for TODO, FIXME and ugh/ugr/urg. @@ -17,6 +16,9 @@ Grep -i for TODO, FIXME and ugh/ugr/urg. . * script columns . * Must stop before this music ends: verse=\lyrics { +. * [ppc] crash on 'lilypond -I mutopia/J.S.Bach/Duette violino-viola' +. * input/bugs/clef.sly: clef changes go missing +. * input/test/grace.sly: wierd big spacing on grace notes . * TODO^2: . * make a TODO.texi, like http://www.gnu.org/software/guile/ideas.html . * make this file understandable for 3rd parties. @@ -24,6 +26,15 @@ verse=\lyrics { . * context in embedded SCM errors. . * acc at tied note after linebreak. . * fix font-naming and selecting +. * barcheck warning doesn't resync anymore +. * provide settable/invisible span-score-bar bracket +. * add context information to warnings +Paper: +waarschuwing: Kan niet beide uiteinden van bindingsboog vinden +MIDI: +pa.ly:33:23: waarschuwing: Schroot verzoek: `Span_req': + g' a4 bes8 \grace f8( + )es16 d es8 r c | . * sparse ties. . * chord tonic: placement of accidental C#, Cb (from scm and C++) . * note head on stem err msg in dutch. diff --git a/VERSION b/VERSION index 5097f24666..3d78c0f374 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=17 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/clef.sly b/input/bugs/clef.sly new file mode 100644 index 0000000000..8eb104509f --- /dev/null +++ b/input/bugs/clef.sly @@ -0,0 +1,2 @@ +\clef "violin"; c' c \clef "alto"; d, d +\clef "violin"; c' c \clef "alto"; d, d diff --git a/input/bugs/grace.sly b/input/bugs/grace.sly new file mode 100644 index 0000000000..a488e30572 --- /dev/null +++ b/input/bugs/grace.sly @@ -0,0 +1 @@ +c'' \grace c8 c c \grace c8 c diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index e602943161..08d97fe22f 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -87,7 +87,7 @@ Multi_measure_rest_engraver::do_process_requests () ly_str02scm ("scripts-repeatsign")); announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_)); start_measure_i_ - = gh_int2scm (time->get_property ("currentBarNumber", 0)); + = gh_scm2int (time->get_property ("currentBarNumber", 0)); } } @@ -127,7 +127,7 @@ Multi_measure_rest_engraver::do_post_move_processing () { lastrest_p_ = mmrest_p_; lastrest_p_->measures_i_ - = gh_int2scm (time->get_property ("currentBarNumber", 0)) - start_measure_i_; + = gh_scm2int (time->get_property ("currentBarNumber", 0)) - start_measure_i_; mmrest_p_ = 0; } diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 559bedf620..5242d77007 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -25,7 +25,7 @@ $violino_i = \notes\relative c'' { %5 %%<\grace a,16 \grace d, g'16 > e(fis)d cis d e(fis)d cis d - g,8 f16 d(e)c b c fis,!8 ~| + g,8 ~f16 d(e)c b c fis,!8 ~| c(d)b a b e, b'(c)a g a d, a'(b)g fis g c, g'(a)fis e fis | b,(d)e fis(g)a b(d)c b(a)g fis(g)a b(c)d e(a)g fis e d | g d(e)fis g a b g(fis)g c, a' b, g'(fis)g a, c fis, g(a)b ~| diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 4ff51ba2fb..9a9fed15f4 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -64,8 +64,8 @@ $violino_ii = \notes\relative c''{ c2 e,|f8 e(d)cis d e fis gis|a e a2 gis4(|)a b()c b8 a|b4()cis ~| %100 c8 b c4 ~| gis8 fis g2\prall| - | - %| + | + %| checkme \context Staff< \context Voice { \property Voice.verticalDirection=1 @@ -78,7 +78,7 @@ $violino_ii = \notes\relative c''{ } \context Voice=x { \property Voice.verticalDirection=-1 - d,4 ss| s2| + d,4 ss| s2| %105 s2|s1| %e2 d ()\grace c| diff --git a/mutopia/J.S.Bach/pa.ly b/mutopia/J.S.Bach/pa.ly new file mode 100644 index 0000000000..1a199cea5b --- /dev/null +++ b/mutopia/J.S.Bach/pa.ly @@ -0,0 +1,265 @@ +\header { + filename = "pa.ly"; + title = "Wachet auf, ruft uns die Stimme"; + opus = "BWV"; + composer = "Johann Sebastian Bach 1685-1750 "; + enteredby = "JCN"; + copyright = "public domain"; +} + + + +commands = \notes { + \time 4/4; + \property Staff.timeSignatureStyle = "C" + \key es; + \partial 8; +} + +right = \notes \relative c' { + \commands +%if urtekst +% \clef "alto"; + \clef "violin"; + \property Voice."beamAutoEnd_8" = #(make-moment 1 4) + bes8 | + es16 f g8 g f as g bes, as | + \repeat "volta" 2 { + g'16 es f8 as, g d' es r bes, | + es'16 f g8 g f as g bes, as| + g'16 es f8 as, g d' es r bes' | + bes4 as16 g f es f es d c bes8 c16 d | + es f g f as g f es g8 f r bes, | + g' a4 bes8 \grace f8()es16 d es8 r c | + a'8 bes4 c8 \grace f,()es16 d es8 r \grace{\slurdown [c'16( d ]}\stemboth)es8 | + d16 c bes8 bes16\prall a bes8 ~bes16 a g f es d c bes| + c d es8 \grace f()es16 d es8~es16 a bes c bes a g f | + bes8 f d\trill c16 bes bes es d c d8 bes| + \grace a()g8. a16 a8.\prallprall g32 a bes4 r8 bes| + es16 f g8 g f as g bes, as| + g'16es f8 as, g d' es r bes| + es16 f g8 g f as g bes, as| + g'16 es f8 as , g d' es r f | + g a4 bes8 \grace f()es16 d es8 r es| + a bes4 c8 \grace g()f16 es f8 r4 | + r r8 bes bes4 as16 g f es| + f es d c bes8 c16 d es f g f as g f es + } + \alternative { + { g8 f r4 r r8 bes,| es16 f g8 g f as g bes, as } + { g'8 f r4 r r8 bes | } } + bes4 as16 g f es f es d c bes8 c16 d | + es f g f as g f es g8 f r bes, | + g' a4 bes8 \grace f() es16 d es8 r c | + a' bes4 c8 \grace f,()es16 d es8 r es' | + d16 c bes8 bes16\prall a bes8~bes16 as g f es d c bes| + c d es8 es16\prall d es8~es16 a bes c bes a g f| + bes8 f d\trill c16 bes bes es d c d8 bes| + g8. a16 a8.\prallprall g32 a bes4 r8 d| + es f4 g8 bes,16\prall as bes8 r bes'| + bes4 as16 g f es f es d c bes8 c16 d| + es f g f as g f es g8 f r4| + r r8 g c16 d es8 es d | + f es g, f es'16 c d8 f, es| + b' c r g g4 f16 es d c | + d c b a g8 a16 b c d es d f es d c| + es8 d r g, es'fis4 g8| + \grace d()c16 bes c8 r a fis' g4 a8| + \grace d,() c16 bes c8 r c' bes16 a g8~g16\trill fis g8~| + g16 f es d c bes a g a bes c8~c16\trill bes c8~| + c16 fis g a g fis e d g8 d bes\trill a16 g | + g4 r r r8 bes| + es16 f g8 g f as g bes, as| + g'16 es f8 as, g d' es r4| + r r8 bes' bes4 as16 g f es| + f es d c bes8 c16 d es f g f as g f es | + g8 f r es b' d4 es8| + as,16\prall g as8 r c d es4 f8| + \grace bes,() as16 g as8 r f g16 f es8~es16\trill d es8~| + es16 des' c bes as g f es f g as8~as16\trill g as8~| + as16 d, es f es d c bes bes'8 es, g16 f es d | + es as g f g8 es \grace d()c8. d16 d8. es16| + es1| + \bar "|."; +} + +clefs = \notes{ + \clef "alto"; + \partial 8; + \skip 8; + \clef "violin"; + \skip 1; + \clef "alto"; + \repeat "volta" 2 { \skip 1*19; } + \alternative { + { \skip 1*2; } + { \skip 1*1; } } + \skip 1*11; + s4 \clef "violin"; + s4 s2 + s1 + s4 s8 \clef "alto"; s8 s2 + \skip 1*12; + s4 r8 \clef "violin"; s8 s2 \clef "alto"; +} + +left = \notes \relative c { + \commands + \property Staff.noVoltaBraces = ##t +%if urtekst +% \clef "tenor"; + \clef "bass"; + \property Voice."beamAutoEnd_8" = #(make-moment 1 4) + r8 + R1 + \repeat "volta" 2 { + R1*11 + r2 es4 g | + bes bes bes bes| + c2 bes | + r r4 bes| + es bes es8 f g4| + f4. es8 d4 c8.\prallprall bes32 c| + bes2 r| + r4 bes \grace bes8() es4 bes| + } + \alternative { + { c g8. as32 bes as8 g f4\trill| es2 r | } + { c'4 g8. as32 bes as8 g f4\trill |} } + es2 r | + R1*6 | + r2 r4 bes'4| + bes as g f\trill | + es2 r| + r4 bes' bes as| + g f\trill es2| + R1| + f4 g as2\trill| + g r| + R1*5| + r4 bes c d| + es2 r| + r r4 es8 f| + g4 f\trill es2| + R1| + r4 bes es bes| + c g as8 g f4\trill| + es1| + R1*4 + \bar "|."; +} + +pedal = \notes \relative c, { + \commands + \property Staff.noVoltaBraces = ##t + \clef "bass"; + r8 | + es4 es es g + \repeat "volta" 2 { + as bes es, r| + es es es g | + as bes es, r | + g c bes as | + g es bes' d | + es d c es| + f g a f| + bes a g f | + es d c es| + d8 bes f' f, g a bes d,| + es c f4 bes8 c bes as| + g f es d c4 c'| + g bes es, g | + as as' d, es | + c d es d| + c g c8 d es4~| + es8 d g, a bes d, es f| + bes a bes c d bes es4| + bes as! g es |} + \alternative { + { as8 bes c4 f, bes8 as| g4 es' d es |} + { as,8 bes c4 f, bes8 as}} + g4 c bes as | + g es bes' d| + es d c es| + f g a f| + bes a g f| + es d c es| + d8 bes f' f, g a bes d,| + es c f4 bes8 c bes as!| + g f es d es g as bes| + c d es4 bes as | + g es bes'8 c d bes | + es d c b c g' c bes| + as4 es f g| + as8 g f e f es d c| + b g g' f es4 c| + g' b c bes| + a c, d es| + fis, d g f| + es' d c bes| + a c bes8 g d' d,| + g es f g as g as bes| + c bes c d es4 c| + as bes c8 bes c d | + es d es f g f g as| + d, bes bes'as g4 es| + bes'8 as g4 as g| + f es f bes, | + c as bes g| + as8 g f es d4 f| + bes8 c bes as g c as bes| + c d es g as f bes bes,| + es1 + \bar "|."; +} + + + + +% these should be two separate scores... +\score{ + \context Score < + \context StaffGroup< + \context PianoStaff < + \context Staff = treble { + \property Score.midiInstrument = "church organ" + < +%if urtekst +% \context Voice=i \clefs + \context Voice=ii \right + > + } + \context Staff = bass \left + > + \context Staff = pedal \pedal + > + > + +\paper { + \translator { + \OrchestralScoreContext + minVerticalAlign = 4.0*\staffheight; + maxVerticalAlign = 4.0*\staffheight; + } + \translator { + \StaffGroupContext + minVerticalAlign = 4.0*\staffheight; + maxVerticalAlign = 4.0*\staffheight; + } + \translator { + \PianoStaffContext + minVerticalAlign = 3.0*\staffheight; + maxVerticalAlign = 3.0*\staffheight; + } +%{ + \translator{ + \VoiceContext + % consider ending beam at every 1/2 note + "beamAutoEnd_8" = "1/4"; + } +%} + } + \midi { + \tempo 4 = 69; + } +}