From: Carl Sorensen Date: Sun, 9 Aug 2009 00:42:50 +0000 (-0600) Subject: Fix autobeaming rules -- clean up examples with new autobeaming X-Git-Tag: release/2.13.4-1~179^2~158 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4230254aa4e89d48ec1a83071550f60b9198cbb6;p=lilypond.git Fix autobeaming rules -- clean up examples with new autobeaming --- diff --git a/input/les-nereides.ly b/input/les-nereides.ly index e5c1195111..53866b4780 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,4 +1,4 @@ -\version "2.12.0" +\version "2.13.4" \header { composer = "ARTHUR GRAY" @@ -40,9 +40,9 @@ treble = \new Voice \relative c''{ 8 | %4 4)\sustainOn - + \change Staff=treble - + \slurUp \set PianoStaff.connectArpeggios = ##t @@ -53,10 +53,10 @@ treble = \new Voice \relative c''{ \grace { cis8 \revert Stem #'direction - + a16[-5_( fis dis] \ottava #0 - + cis32[ a-1 fis-4 dis] cis[ a fis)-2] % the small grace in lower staff comes after us s32 @@ -68,16 +68,16 @@ treble = \new Voice \relative c''{ | %5 r8 8(\mf - + % \fingerUp \override Fingering #'direction = #UP - + e)-1-4-5 r | %6 r 8(\mf e) r - + | %7 \bar "||" } @@ -102,7 +102,7 @@ trebleTwo = \new Voice \relative c''{ \override Fingering #'slur-padding = #0.1 8[( | %6 - )] cis'4. d4 + )] cis'4. d4 8[( | %7 )] @@ -111,36 +111,36 @@ trebleTwo = \new Voice \relative c''{ bass = \new Voice \relative c{ \partial 2 \key a \major - + \slurDown \dynamicUp r8. e,16(\f_2 8[ ] | %2 %\override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak - + 4\sustainOn \change Staff=treble \stemDown 4)\arpeggio - + \change Staff=bass \stemNeutral - + r8. cis,,16(\sustainOff 8 - + | %3 4\sustainOn \change Staff=treble - + \stemNeutral - \stemDown + \stemDown )\arpeggio \change Staff=bass \stemNeutral r2 - + | %4 \stemDown 4 @@ -150,46 +150,46 @@ bass = \new Voice \relative c{ %urg: staff-change: ! on dis \arpeggio >> - + \grace { \override Stem #'stroke-style = #"grace" - + s8 s16 s s s32 s s s s s \clef bass 32(\sustainOff\sustainOn - + \revert Stem #'stroke-style } 2) - + | %5 \slurUp - + % \fingerDown \override Fingering #'direction = #DOWN - + %\override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 %tweak \set Staff.pedalSustainStyle = #'mixed %%a,8 e'[-5(]) - + a,8\sustainOn e'[-5(])-2-3 %%r b,-5 4 r b,-5\sustainOff\sustainOn 4-3-5 \slurNeutral e,8[-5(\sustainOff - + | %6 a)-2]\sustainOn \slurUp e'[()] r b,\sustainOff\sustainOn 4 \slurNeutral e,8[(\sustainOff - + | %7 a)] } @@ -217,7 +217,7 @@ middleDynamics = { s32 s s\> s s32 s s\! s - + } \textLengthOn s32 s-"rall." s s s8 s4 @@ -225,7 +225,7 @@ middleDynamics = { | %5 s2-"a tempo" s8 s \> s s - | %6 + | %6 s8\! s2 s8 s\> s | %7 @@ -235,6 +235,9 @@ middleDynamics = { theScore = \score{ \context PianoStaff << \new Staff = "treble" << + \overrideBeamSettings #'Score #'(4 . 4) #'end + #'((* . (1 1 1 1)) + ((1 . 32) (4 4 4 4 4 4 4 4))) \treble \trebleTwo >> @@ -255,11 +258,11 @@ theScore = \score{ } } } - + \book{ \score { \theScore } } - + %%% Local variables: %%% coding: utf-8 %%% LilyPond-indent-level:2 diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index a92188df11..48251ac17d 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -30,18 +30,18 @@ "domain by " maintainer "." )) } \justify { - Unrestricted modification and redistribution - is permitted and encouraged. Copy this music + Unrestricted modification and redistribution + is permitted and encouraged. Copy this music and share it! } } } - lastupdated = "2002/August/19" + lastupdated = "2009/August/08" } -\version "2.12.0" +\version "2.13.4" @@ -52,21 +52,21 @@ dux = \context Voice = "two" \relative c''{ r8 c16 b c8 g as c16 b c8 d | g, c16 b c8 d f,16 g as4 g16 f | - es c' b a g f! es d c8 es' d c | + es c' b a g f! es d c8 es' d c | bes a bes c fis, g a fis | %%5 g4 r16 c, d es f g as8~ as16 d, es f | - g a bes8 ~ bes16 es, f g as g f es d8 c'16 b! | + g a bes8 ~ bes16 es, f g as g f es d8 c'16 b! | % forced accident! c4 r4 r8 f es d | - r8 as g f g f16 es f8 d | + r8 as g f g f16 es f8 d | g4 r8 b c c16 b c8 g | - %%10 + %%10 as4 r8 a bes bes16 a bes8 f | g4 r8 g as as g - \change Staff = bass \stemUp + \change Staff = bass \stemUp f | - r8 + r8 as, bes c r8 as16 g as8 f8 | bes8 c bes as bes g f es | f des' c bes c as g f | @@ -75,7 +75,7 @@ dux = \context Voice = "two" \relative c''{ \change Staff = treble \stemDown - g'16 fis g8 c, + g'16 fis g8 c, es g16 fis! g8 a | d, g16 fis g8 a! c,16 d es4 d16 c | % forced accident! @@ -87,7 +87,7 @@ dux = \context Voice = "two" \relative c''{ c \change Staff = bass \stemUp - bes! as g + bes! as g f8 \change Staff = treble \stemDown as' g f | @@ -109,18 +109,18 @@ dux = \context Voice = "two" \relative c''{ comes = \context Voice = "one" \relative c'' { \voiceOne - \override MultiMeasureRest #'staff-position = #6 + \override MultiMeasureRest #'staff-position = #6 R1 | R1 | r8 g'16 fis g8 c, es g16 fis g8 a | d,8 g16 fis g8 a c,16 d es4 d16 c | %%5 - bes8 es16 d es8 g,8 as f'16 es f8 a, + bes8 es16 d es8 g,8 as f'16 es f8 a, bes8 g'16 f g8 b, c8 d16 es f4 ~ | - f8 es16 d c16 bes ! as g f8 as' g f + f8 es16 d c16 bes ! as g f8 as' g f es d es f b, c d b | c g'16 fis g8 d es4 r8 e8 | - %%10 + %%10 f f16 e f8 c8 d4 r8 d | es8 es16 d es8 bes c es16 d es8 f | bes, es16 d es8 f as,16 bes c4 bes16 as | @@ -159,7 +159,7 @@ bassdux = \context Voice = "three" \relative c' { R | R1 | r8 c16 b c8 g as c16 b c8 d | - g, c16 b c8 d f,16 g as4 g16 f | + g, c16 b c8 d f,16 g as4 g16 f | es c' b a g f es d c d es d c bes! as! g | % -> \classic_accidentals %%10 @@ -174,7 +174,7 @@ bassdux = \context Voice = "three" \relative c' { g,8 bes'16 a bes8 d, es c'16 bes c8 e, | f d'16 c d8 fis, g4 r16 g, a b | c16 d es8~ es16 a, bes c d es f8~ f16 b, c d | - %%20 + %%20 es8 r r e \stemNeutral \stemDown f f, es! d \stemNeutral | r as' g f g f16 es f8 g | c16 d es d c bes as g f bes' as g f es d c | @@ -185,11 +185,11 @@ bassdux = \context Voice = "three" \relative c' { g f as g f es d c b8 c16 b c8 g | as c16 b c8 d g, c16 b c8 d | f,16 g as4 g16 f es4 r8 es' | - d c g' g, + d c g' g, %%30 << { c2 ~ | c1 ~ | c1 } \\ { c,2 ~ | c1 ~ | c1 } - >> + >> } @@ -199,10 +199,13 @@ bassdux = \context Voice = "three" \relative c' { \context Score \with { \override SpacingSpanner #'spacing-increment = #1.0 - \override SpacingSpanner #'shortest-duration-space = #1.9 - } \context PianoStaff << + \override SpacingSpanner #'shortest-duration-space = #1.9 + } \context PianoStaff << \override Score.TimeSignature #'style = #'C \context Staff = "treble" << + \overrideBeamSettings #'Score #'(4 . 4) #'end + #'((* . (1 1 1 1)) + ((1 . 32) . (4 4 4 4 4 4 4 4))) \key c \minor \dux { \comes \bar "|." } diff --git a/scm/beam-settings.scm b/scm/beam-settings.scm index a0ab77ae59..22c6800351 100644 --- a/scm/beam-settings.scm +++ b/scm/beam-settings.scm @@ -73,10 +73,11 @@ ;; in 4 4 (common) time: ;; default: end beams on beats - ;; use beatLength for all except 32nd notes: - ;; end beams with 32nd notes each 1 8 beat + ;; end beams with 8th notes each 1 2 beat + ;; end beams with 32nd notes each 1 8 beat (((4 . 4) end) . - ((* . (2 2)) + ((* . (1 1 1 1)) + ((1 . 8) . (4 4)) ((1 . 32) . (4 4 4 4 4 4 4 4))))