From: fred Date: Tue, 26 Mar 2002 22:43:43 +0000 (+0000) Subject: lilypond-1.3.7 X-Git-Tag: release/1.5.59~1973 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=365b54a777aa852a6ed7f4e82af89edd0301c340;p=lilypond.git lilypond-1.3.7 --- diff --git a/input/test/auto-staff-switch.ly b/input/test/auto-staff-switch.ly index cd4e3f27e4..5439d0241d 100644 --- a/input/test/auto-staff-switch.ly +++ b/input/test/auto-staff-switch.ly @@ -35,4 +35,4 @@ }} -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 27d9d30bb8..77ef6e5f06 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index 244941017d..808d7b9186 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index 9632cff782..26d9920c70 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 7b098fd15b..27e00e64b2 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -30,4 +30,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 979bff7762..3be056715d 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -21,4 +21,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index b111d5001e..edcd5e9253 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\transpose c''{ diff --git a/input/test/beams.ly b/input/test/beams.ly index ca5100b1ab..d73c211332 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.4"; +\version "1.3.5"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index 1f44591a0f..da77f7b461 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { \notes \relative c' { diff --git a/input/test/broken.ly b/input/test/broken.ly index 54afc678e5..55d23edbed 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index 5473e1f6e9..1de6ac3c50 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index c42e61bb12..04534576fa 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/chords.ly b/input/test/chords.ly index d2ad6261cd..9c00e7f71e 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; %{ Would this be acceptable/good enough/convenient for entry? diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 5698f18caa..726e7fe9e3 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index ddfb6fd32a..46e7c42e7e 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.4"; +\version "1.3.5"; twovoice = \context Staff \notes < \context Voice=i { \stemdown c4 d e f g2~ g4 a [c8 d e f] c2| } diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 3012e1f52e..434590731f 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly index 663debb068..d6e63b23d0 100644 --- a/input/test/dotted-slur.ly +++ b/input/test/dotted-slur.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes{ diff --git a/input/test/extender.ly b/input/test/extender.ly index 594b0ed0e8..cce1ba02c4 100644 --- a/input/test/extender.ly +++ b/input/test/extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 68dfaf3125..ac340aed20 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 7e1a3dd1ff..9f8c70c30a 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 929ce40fc5..0aef283cba 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 753f2cf8e3..8b0a2d1ba1 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 92ba14edc2..60bbb05da8 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 9d1f86f647..4e8ac8a0d9 100644 --- a/input/test/gmsusd.ly +++ b/input/test/gmsusd.ly @@ -3,7 +3,7 @@ % perhaps the current modifier approach is too simplistic -\version "1.3.4"; +\version "1.3.5"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index ae04bf9f9e..784eaff039 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; %{ diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index ecbf1ba2f0..8680850bb2 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index e7a968c567..dc0bcd1f98 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; toeter_i = \notes\relative c <{ \property Staff.instrument = "Toeters" diff --git a/input/test/hyphen.ly b/input/test/hyphen.ly index c0e9d5a096..26558228e0 100644 --- a/input/test/hyphen.ly +++ b/input/test/hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 482bc50876..3d06b9be56 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.4"; +\version "1.3.5"; incipit = \notes\relative c'{ diff --git a/input/test/keys.ly b/input/test/keys.ly index ff84c866d0..f173024633 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; %{ test key itemv breaking diff --git a/input/test/keys2.ly b/input/test/keys2.ly index 168dcd3032..bbef861b3c 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; blah = \notes { diff --git a/input/test/knee.ly b/input/test/knee.ly index 140006c1e8..eee5e3887e 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index 19a347082d..3c63f9f257 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.4"; +\version "1.3.5"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/mark.ly b/input/test/mark.ly index 7cc6b75cc2..6b82ae50d4 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index 5ac6035362..ba5bead23e 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index ababf37326..e6761b7fb9 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; voice_one = \notes\transpose c''{ \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index f772a5c03d..d89e365530 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -26,4 +26,4 @@ c4 c2 c8 c16 c16 c1 } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 03f2f6f866..56e220ce04 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index f4ccc6fe1e..5bda50efe0 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; m = \notes \relative c''{ c1 | c2 c | c c | c c | c c | c c | c c | c c | diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 7809c6578b..6fcd07e08f 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index c55e003f74..de22b4a611 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -38,4 +38,4 @@ restsII = \context Staff \notes { } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index fee2ddbd59..73eb6c0455 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; blah = \notes{ \transpose c'' { diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 184240a7bf..f9f6cd1d8f 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index 5304af6ab5..e0eca072b6 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -36,4 +36,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 0ed40df697..4a505be00b 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\relative c'{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index fc3a2cd7da..0c956ea94c 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 34034f0831..0488af9387 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 305c913de1..401725c56a 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.3.4"; +\version "1.3.5"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index b0edad672d..e653b0b2d5 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index 5dac9ee680..f2e5edf033 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.4"; +\version "1.3.5"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 89d7a4b456..61df82d328 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index e983315c6b..37046fc5f0 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -4,14 +4,14 @@ \property Staff.fontSize = #-1 \property Voice.fontSize = #-1 - \property Voice . dynamicDirectionection = \up \stemdown + \property Voice . dynamicDirection = \up \stemdown %\key gis; c8 d [e f g a] b c \ff } -\context Staff = VB { \property Voice . dynamicDirectionection = \down c,,4 \ff c c c } +\context Staff = VB { \property Voice . dynamicDirection = \down c,,4 \ff c c c } > \paper { linewidth = -1.; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 053b2acbb5..bc962393de 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes \transpose c'''{ \stemup diff --git a/input/test/stem.ly b/input/test/stem.ly index 5322eefbe8..5621c4302e 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.4"; +\version "1.3.5"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 4ccd618a2a..831c12ce21 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.4"; +\version "1.3.5"; % this is an example of extreme dynamics diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly index d26b7c9876..89146f1c4e 100644 --- a/input/test/test-lyrics.ly +++ b/input/test/test-lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/thumb.ly b/input/test/thumb.ly index c2bac9dbe5..795af1647f 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.3.4"; +\version "1.3.5"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/title.ly b/input/test/title.ly index d33d3f0e9f..c20c9741f8 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.4"; +\version "1.3.5"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index f363613967..6c4d9b0e2c 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.3.4"; +\version "1.3.5"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tup.ly b/input/test/tup.ly index ec251312cb..e228bfac84 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index c57f946448..67f85f575f 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 87fe13892d..5a4f991628 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/mutopia/E.Satie/gnossienne-4-autochange.ly b/mutopia/E.Satie/gnossienne-4-autochange.ly index 05a0754f61..1d3d4ee91a 100644 --- a/mutopia/E.Satie/gnossienne-4-autochange.ly +++ b/mutopia/E.Satie/gnossienne-4-autochange.ly @@ -141,7 +141,7 @@ accompany = \notes \relative c{ slurVerticalDirection = 1; verticalDirection = -1; - beamAutoEnd = "1/2"; + beamAutoEnd = #(make-moment 1 2) } } \midi { diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index bc6c08c869..c53e26066f 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -12,7 +12,7 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.3.4"; +\version "1.3.5"; \include "nederlands.ly" @@ -162,7 +162,7 @@ accompany = \notes \relative c{ \accepts "Staff"; slurVerticalDirection = 1; verticalDirection = -1; - beamAutoEnd = "1/2"; + beamAutoEnd = #(make-moment 1 2) } \translator { \type "Engraver_group_engraver"; diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index 74423e6eb4..240a44542b 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,7 +12,7 @@ Tested Features: %} -\version "1.3.4"; +\version "1.3.5"; \include "nederlands.ly" @@ -152,8 +152,8 @@ lower = \context Staff \notes \relative c{ \translator{ \OrchestralScoreContext } \translator{ \VoiceContext - beamAutoEnd_8 = "1/4"; - beamAutoEnd_16 = "1/4"; + beamAutoEnd_8 = #(make-moment 1 4) + beamAutoEnd_16 = #(make-moment 1 4) } } \midi { diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index abd64a8be8..fb540fccc8 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; $global_i = \notes{ \time 12/8; diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index 0f5aa1ea74..e83492890a 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; $global_ii = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index 1127323be8..72c59dec06 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; \include "global-i.ly" \include "violoncello-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index b168a6521c..6e4fd42104 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; \include "global-ii.ly" \include "violoncello-ii.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index 9eb6cb5a7f..2f6c10bfb4 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 0688ef5b0f..559bedf620 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violino_i = \notes\relative c'' { \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 8c2584d3ef..4ff51ba2fb 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violino_ii = \notes\relative c''{ R1*8 | @@ -101,4 +101,4 @@ $violino_ii_staff = \context Staff = violino < \$violino_ii \$global_ii > -\version "1.3.4"; +\version "1.3.5"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index a5b6196346..798567be9b 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index f3ed9fd392..54adae15c8 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index 47c3b66d49..a48730fc5e 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index 03d3ebbf40..a37c92ff3b 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violoncello_i = \notes\relative c{ \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index e1ffdf05e1..c6c786d631 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violoncello_ii = \notes\relative c{ r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis| diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index 9ffcaef121..2d24632ce6 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 20313c7071..840b9f02cf 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -39,8 +39,8 @@ gigue_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; - beamAutoEnd_16 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + beamAutoEnd_16 = #(make-moment 3 4) } } \midi{ \tempo 4 = 60; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index 5359bab409..ee57409f0a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -37,8 +37,8 @@ gigue_viola_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; - beamAutoEnd_16 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + beamAutoEnd_16 = #(make-moment 3 4) } } \midi{ \tempo 4 = 60; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 385673c34f..ccc68f781f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -53,7 +53,7 @@ menuetto_i_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) } } \midi{ \tempo 4 = 110; } @@ -90,7 +90,8 @@ menuetto_ii_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + } } \midi{ \tempo 4 = 130; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index c795cf65e9..c7bd0c0930 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -52,7 +52,8 @@ menuetto_i_viola_staff = \context Staff < gourlay_maxmeasures = 7.0; \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + } } \midi{ \tempo 4 = 110; } @@ -87,7 +88,8 @@ menuetto_ii_viola_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + } } \midi{ \tempo 4 = 130; } diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index 827d52a582..57d3324966 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -387,6 +387,15 @@ if 1: conversions.append ((1,3,4), conv, '\\cadenza -> \cadenza{On|Off}') +if 1: + def conv (str): + str = re.sub ('beamAuto([^=]+)= *"([0-9]+)/([0-9]+)" *;', + 'beamAuto\\1 = #(make-moment \\2 \\3)', + str) + return str + + conversions.append ((1,3,5), conv, 'beamAuto moment properties') + ############################