From: fred Date: Tue, 26 Mar 2002 22:43:23 +0000 (+0000) Subject: lilypond-1.3.5 X-Git-Tag: release/1.5.59~1991 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2b05252d49ef442cd660a9f09e273b4c47fda7c3;p=lilypond.git lilypond-1.3.5 --- diff --git a/Documentation/ntweb/angels.ly b/Documentation/ntweb/angels.ly index 6eab51ce02..80e068658e 100644 --- a/Documentation/ntweb/angels.ly +++ b/Documentation/ntweb/angels.ly @@ -13,7 +13,7 @@ global = \notes { \keysignature bes; \tempo 2=60; } -\version "1.2.0"; +\version "1.3.4"; % \include "score-paper.ly" flute1 = \notes \relative c'' { diff --git a/TODO b/TODO index f21b67e5dc..23f829958f 100644 --- a/TODO +++ b/TODO @@ -11,9 +11,8 @@ Grep -i for TODO, FIXME and ugh/ugr/urg. .* TODO . * make this file understandable for 3rd parties. . * break align order from SCM list. -. * time description should be put into SCM -. * context in embedded SCM errors. - +. * \accepts -> \acceptedby +. * context in embedded SCM errors. . * eradicate all VIRTUAL_COPY_CONS () macros ; use indexed creation, eg. @@ -44,9 +43,6 @@ John . * bracket pdf hack . * Mondrup: -- I would like the possibility of forcing clef- and key- changes to be -printed _after_ the new bar line - - I would like an option to define the number of systems on which the score must be distributed. As it is now it seems that I may only influence that indirectly through the gourlay_maxmeasures property. diff --git a/input/bugs/auto-staff-switch.ly b/input/bugs/auto-staff-switch.ly index 94bc3037a3..cd4e3f27e4 100644 --- a/input/bugs/auto-staff-switch.ly +++ b/input/bugs/auto-staff-switch.ly @@ -35,4 +35,4 @@ }} -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/bugs/p.ly b/input/bugs/p.ly index fb5acbf510..bf4bedc628 100644 --- a/input/bugs/p.ly +++ b/input/bugs/p.ly @@ -23,7 +23,7 @@ * organ staff... %} -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/denneboom.ly b/input/denneboom.ly index 7120bb9c99..4c00608404 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.2.0"; +\version "1.3.4"; oden = \lyrics{ O | diff --git a/input/example-3.ly b/input/example-3.ly index b9f4f6186b..86fc80ba98 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 3b273123c7..f7e1ec8c2a 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -56,4 +56,4 @@ of a certain tune (Jazz, Real Book, for example), like } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index ed568286ed..638a23de1f 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -23,7 +23,7 @@ * organ staff... %} -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/rhythm.ly b/input/rhythm.ly index cabd887437..607044a99b 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.2.0"; +\version "1.3.4"; ritme = \notes\transpose c'' { \time 4/4; diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 0cc8c8b8a6..14c789e621 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -175,4 +175,4 @@ handLyrics = \notes \context GrandStaff < } -\version "1.2.14"; +\version "1.3.4"; diff --git a/input/test/auto-staff-switch.ly b/input/test/auto-staff-switch.ly index 94bc3037a3..cd4e3f27e4 100644 --- a/input/test/auto-staff-switch.ly +++ b/input/test/auto-staff-switch.ly @@ -35,4 +35,4 @@ }} -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 307b8656fa..27d9d30bb8 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.2"; +\version "1.3.4"; \header{ enteredby = "jcn"; @@ -9,6 +9,12 @@ TestedFeatures = "Banter named chords"; % test German (Banter) naming % for more conventional naming, comment scm stuff out +% urg, +% this shows a serious shortcoming with our guile approach: +% we can't (easily) display banter/non banter chords alongside +% eachother. These guile lists are fixed in the guile environment +% when this file has been parsed... + % { #(set! pitch-names-alist (append diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index e9d5510258..244941017d 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.2.0"; +\version "1.3.4"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index 7f4a6df29c..9632cff782 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,8 +1,8 @@ -\version "1.2.0"; +\version "1.3.4"; \score{ \notes\transpose c'{ - \property Score.beamquantisation = \none + \property Score.beamQuantisation = #'none [a'8 ] [c ] diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 376b25c3c9..7b098fd15b 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -30,4 +30,4 @@ } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 7b2b32dece..979bff7762 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -21,4 +21,4 @@ } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index de594f1faf..b111d5001e 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,8 +1,8 @@ -\version "1.2.0"; +\version "1.3.4"; \score{ \notes\transpose c''{ - \property Score.beamquantisation = 3 % TEST + \property Score.beamQuantisation = 'test [c8 c] [c c] [c c] [c c] [a' a'] [a' a'] [a' a'] [a' a'] diff --git a/input/test/beams.ly b/input/test/beams.ly index edc36187da..ca5100b1ab 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,11 +6,11 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.2.0"; +\version "1.3.4"; \score{ < -% \property Score.beamquantisation = \none +% \property Score.beamQuantisation = #'none \context GrandStaff < \notes\transpose c' { diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index 8d657fb789..1f44591a0f 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; \score { \notes \relative c' { diff --git a/input/test/broken.ly b/input/test/broken.ly index 32c214fafc..54afc678e5 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.2.0"; +\version "1.3.4"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index c54281fa6d..5473e1f6e9 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 94df658308..c42e61bb12 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/chords.ly b/input/test/chords.ly index cf6251d30d..d2ad6261cd 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.2"; +\version "1.3.4"; %{ Would this be acceptable/good enough/convenient for entry? diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 09caa7c38e..5698f18caa 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index 50954aa893..ddfb6fd32a 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.2.0"; +\version "1.3.4"; 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 146b0e1c0a..3012e1f52e 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,9 +1,9 @@ -\version "1.2.0"; +\version "1.3.4"; \score { \notes { - \property Staff.barAlways = "1" + \property Staff.barAlways = ##t \property Staff.defaultBarType = ":|:" c4 c4 c4 c4 } } diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly index a305601958..663debb068 100644 --- a/input/test/dotted-slur.ly +++ b/input/test/dotted-slur.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; \score{ \notes{ diff --git a/input/test/extender.ly b/input/test/extender.ly index c51eff9938..594b0ed0e8 100644 --- a/input/test/extender.ly +++ b/input/test/extender.ly @@ -5,4 +5,4 @@ > } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 0959de5016..68dfaf3125 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index cb0adb26cc..7e1a3dd1ff 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 45b940cc19..929ce40fc5 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.2.0"; +\version "1.3.4"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 6fd60c468d..753f2cf8e3 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.2.0"; +\version "1.3.4"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index dd6fc96016..92ba14edc2 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 9ba7522e20..9d1f86f647 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.2.0"; +\version "1.3.4"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index c90b692b30..ae04bf9f9e 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; %{ diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index e15164a2d8..ecbf1ba2f0 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 46e7a59981..e7a968c567 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; toeter_i = \notes\relative c <{ \property Staff.instrument = "Toeters" diff --git a/input/test/hyphen.ly b/input/test/hyphen.ly index 8706a90c29..c0e9d5a096 100644 --- a/input/test/hyphen.ly +++ b/input/test/hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 796def730f..482bc50876 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.2.0"; +\version "1.3.4"; incipit = \notes\relative c'{ diff --git a/input/test/keys.ly b/input/test/keys.ly index 3e9b232f38..ff84c866d0 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; %{ test key itemv breaking diff --git a/input/test/keys2.ly b/input/test/keys2.ly index e5db2a612f..168dcd3032 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; blah = \notes { diff --git a/input/test/knee.ly b/input/test/knee.ly index 961296f9e1..140006c1e8 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; \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 ce903d6292..19a347082d 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -7,13 +7,13 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; m =\notes \relative c'' { - \property Staff.automaticMelismata = "1" + \property Staff.automaticMelismata = ##t \autoBeamOff g4 r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4 - \property Staff.textEmptyDimension = "1" + \emptyText d8.^"melisma" \melisma c16 \melismaEnd b } diff --git a/input/test/mark.ly b/input/test/mark.ly index 37d7e4befb..7cc6b75cc2 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index c2b8660e17..5ac6035362 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index e151d7dfec..ababf37326 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,10 +1,10 @@ -\version "1.2.0"; +\version "1.3.4"; voice_one = \notes\transpose c''{ \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | f'4-. r r2 | R1 * 3 | es'4-. r r2 | r1 | - \property Score.skipBars = 1 + \property Score.skipBars = ##t6 g4-. r r2 | g4-. r r2 | R1 * 5 | r2 r4 g4-. | @@ -15,7 +15,7 @@ voice_two = \notes R1 * 2 | f'4-. r r2 | R1 * 3 | f'4-. r r2 | R1 * 3 | es'4-. r r2 | r1 | - \property Score.skipBars = 1 + \property Score.skipBars = ##t6 g4-. r r2 | g4-. r r2 | R1 * 5 | r2 r4 g4-. | diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 55306fc661..f772a5c03d 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -26,4 +26,4 @@ c4 c2 c8 c16 c16 c1 } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 5652aa1f0d..03f2f6f866 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index a38f7c42d6..f4ccc6fe1e 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; 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 9e5f6efbe4..7809c6578b 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; \score { diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index 7506a60f5a..c55e003f74 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -38,4 +38,4 @@ restsII = \context Staff \notes { } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index 294e7195d0..fee2ddbd59 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.2.0"; +\version "1.3.4"; blah = \notes{ \transpose c'' { diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 2631ebcd07..184240a7bf 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.2.0"; +\version "1.3.4"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index e53a579f89..5304af6ab5 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -36,4 +36,4 @@ } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index b1e61feb52..0ed40df697 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.2.0"; +\version "1.3.4"; \score{ \notes\relative c'{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 9005941ffd..fc3a2cd7da 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.2.0"; +\version "1.3.4"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 6caa244a7b..34034f0831 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.2.0"; +\version "1.3.4"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 92e3edccc9..305c913de1 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.2.0"; +\version "1.3.4"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index 463e330e79..b0edad672d 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.2.0"; +\version "1.3.4"; 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 f3dc5ba654..5dac9ee680 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.2.0"; +\version "1.3.4"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index c0a5872e54..89d7a4b456 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 0e07435b25..e983315c6b 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -1,17 +1,17 @@ \score { \notes \relative c' < \context Voice { - \property Staff.staffLineLeading = "4" - \property Staff.fontSize = "-1" - \property Voice.fontSize = "-1" + \property Staff.staffLineLeading = 4 + \property Staff.fontSize = #-1 + \property Voice.fontSize = #-1 - \property Voice . dynamicDirection = \up \stemdown + \property Voice . dynamicDirectionection = \up \stemdown %\key gis; c8 d [e f g a] b c \ff } -\context Staff = VB { \property Voice . dynamicDirection = \down c,,4 \ff c c c } +\context Staff = VB { \property Voice . dynamicDirectionection = \down c,,4 \ff c c c } > \paper { linewidth = -1.; } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index d6b96591a4..053b2acbb5 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.2.0"; +\version "1.3.4"; \score{ \notes \transpose c'''{ \stemup diff --git a/input/test/stem.ly b/input/test/stem.ly index 90607e9914..5322eefbe8 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.2.0"; +\version "1.3.4"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index f8d02ff067..4ccd618a2a 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.2.0"; +\version "1.3.4"; % this is an example of extreme dynamics diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly index d59b8c4db9..d26b7c9876 100644 --- a/input/test/test-lyrics.ly +++ b/input/test/test-lyrics.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/thumb.ly b/input/test/thumb.ly index 4b9fb6f029..c2bac9dbe5 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.2.0"; +\version "1.3.4"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/title.ly b/input/test/title.ly index dd7e3cd734..d33d3f0e9f 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.2.0"; +\version "1.3.4"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 7c6a2f060c..f363613967 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tup.ly b/input/test/tup.ly index 29b4c3c879..ec251312cb 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 46a8b98d60..c57f946448 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,11 +1,11 @@ -\version "1.2.0"; +\version "1.3.4"; \score { \notes < \context GrandStaff < { - \property GrandStaff . maxVerticalAlign = "60." - \property GrandStaff . minVerticalAlign = "35." + \property GrandStaff . maxVerticalAlign = #60.0 + \property GrandStaff . minVerticalAlign = #35.0 c'1 \break c'''''1 } diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 038ee69e55..87fe13892d 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 9df29ef6de..bacc0ab2b4 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; melodie = \notes\relative c'' { \clef "violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index 847368ebeb..a59b7d52ea 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats, auto beaming, adding lyrics to notes, hyphens %} -\version "1.2.0"; +\version "1.3.4"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/include/directional-spanner.hh b/lily/include/directional-spanner.hh index 93d226fdaa..e268b20b92 100644 --- a/lily/include/directional-spanner.hh +++ b/lily/include/directional-spanner.hh @@ -12,14 +12,14 @@ /** a spanner which can be pointing "up" or "down". - JUNKME? + JUNKME */ class Directional_spanner : public Spanner, public Directional_element { public: - /// offset of "center" relative to left-column/0-pos of staff virtual Offset center() const; virtual Direction get_default_dir() const; + VIRTUAL_COPY_CONS(Score_element); protected: virtual void do_pre_processing(); }; diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index de4ea2373a..0ec8964888 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -31,7 +31,6 @@ static Keyword_ent the_key_tab[]={ {"alternative", ALTERNATIVE}, {"bar", BAR}, {"breathe", BREATHE}, - {"cadenza", CADENZA}, {"chordmodifiers", CHORDMODIFIERS}, {"chords", CHORDS}, {"clef", CLEF}, @@ -75,7 +74,6 @@ static Keyword_ent the_key_tab[]={ {"translator", TRANSLATOR}, {"transpose", TRANSPOSE}, {"type", TYPE}, - {"version", VERSION}, {0,0} }; diff --git a/lily/parser.yy b/lily/parser.yy index 6c02b4967e..a76260f9dd 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -45,7 +45,7 @@ #include "auto-change-music.hh" // mmm -Mudela_version oldest_version ("1.1.52"); +Mudela_version oldest_version ("1.3.4"); @@ -184,7 +184,6 @@ yylex (YYSTYPE *s, void * v_l) %token TRANSPOSE %token TYPE %token CONTEXT -%token VERSION /* escaped */ %token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER @@ -920,6 +919,15 @@ command_element: $1-> set_spot (THIS->here_input ()); ((Simultaneous_music*)$$) ->add_music ($1);//ugh } + | PARTIAL duration_length ';' { + Translation_property * p = new Translation_property; + p->var_str_ = "measurePosition"; + p->value_ = (new Moment (-$2->length_mom ()))->smobify_self (); + delete $2; + Context_specced_music * sp = new Context_specced_music (p); + $$ =sp ; + sp-> translator_type_str_ = "Score"; + } ; command_req: @@ -1014,13 +1022,6 @@ verbose_command_req: | tempo_request { $$ = $1; } - | CADENZA unsigned { - $$ = new Cadenza_req ($2); - } - | PARTIAL duration_length { - $$ = new Partial_measure_req ($2->length_mom ()); - delete $2; - } | CLEF STRING { $$ = new Clef_change_req (ly_scm2string ($2)); diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index 811ee7e894..ed54d15b10 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.2.0"; +\version "1.3.4"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index 22e1e0dce0..8c75bf5d8c 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.2.0"; +\version "1.3.4"; \include "declarations.ly"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 8afe9fb6d5..94c7377708 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.2.0"; +\version "1.3.4"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index 96010a1fb2..6bc0ab2825 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.2.0"; +\version "1.3.4"; \include "declarations.ly" diff --git a/ly/fragment.ly b/ly/fragment.ly index f644c2867a..93722c224f 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.2.0"; +\version "1.3.4"; \include "declarations.ly" diff --git a/ly/init.ly b/ly/init.ly index 8cd49a0428..748f075f3c 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.2.0"; +\version "1.3.4"; \include "declarations.ly"; diff --git a/ly/paper16.ly b/ly/paper16.ly index 14fab61a39..6d2a93da79 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -2,7 +2,7 @@ -\version "1.2.0"; +\version "1.3.4"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/ly/paper20.ly b/ly/paper20.ly index 65f9100c73..de1c7d3342 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.2.0"; +\version "1.3.4"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/paper23.ly b/ly/paper23.ly index 7a129b3356..aa9d14dfb7 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,7 +1,7 @@ % paper23.ly -\version "1.2.0"; +\version "1.3.4"; paper_twentythree = \paper { staffheight = 23.0\pt; diff --git a/ly/property.ly b/ly/property.ly index b056e35111..9e755f6a11 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS. %} -\version "1.2.16"; +\version "1.3.4"; %hmm, (these) abbrevs suck, imo % i guess they're meant as some form of doco @@ -24,6 +24,12 @@ slurdown = \property Voice.slurVerticalDirection = \down shifton = \property Voice.horizontalNoteShift = #1 shiftoff = \property Voice.horizontalNoteShift = #0 +cadenzaOn = \property Score.timing = ##f +cadenzaOff = { \property Score.timing = ##t + \property Score.measurePosition = #(make-moment 0 1) + } + + onevoice = { \stemboth \shiftoff } diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index 5a513ce553..e8259e45f2 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index ff47dfe03d..ee3fdac7c0 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 47bebf6ef0..0c08f9fe15 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 4b82d40d64..b875cabb01 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; clarinetto1 = \notes \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 167502ac7d..4fdf51d8dc 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; clarinetto2 = \notes \relative c { R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly index c17fb2c245..655e148f3f 100644 --- a/mutopia/Coriolan/contrabasso-part.ly +++ b/mutopia/Coriolan/contrabasso-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "contrabasso.ly" diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index c1ba901cfd..f10bb426bd 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; contrabasso = \notes \relative c { % \translator Staff=violoncello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 517e03b6ad..bf55e888cf 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 117b7b38f4..8d0a10b2de 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 3af778c380..e692c12565 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 73bc7378ea..2c75ca8f62 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; corno1 = \notes \relative c { R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index 1b12ae5eaa..5e2c861791 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; corno2 = \notes \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 205dbb595b..17b5ceef51 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 4176f08f30..60d63f4482 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 95d63fd3f1..e7b182a340 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; fagotto1 = \notes \relative c { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 589fa6907d..7de10de2c8 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; fagotto2 = \notes \relative c { R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index e427601844..cc078a5348 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 231b6c2860..5b295d1f48 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 0d7243cc1d..7e6c1f6b5a 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; flauto1 = \notes \relative c { R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 32782681bc..cbb400044c 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; flauto2 = \notes \relative c { R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 86a3bd44fa..335a15a56c 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; global = \notes { \time 4/4; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 31fefbe66a..0afed078f6 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; oboe1 = \notes \relative c'' { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index fa89670b3c..39ae9c267a 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; oboe2 = \notes \relative c{ R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index c48a4e17de..3d2d699320 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 0d004223a0..b9ab15e912 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 483e31eb29..b6d74169b2 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; timpani = \notes \relative c { R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 84f7a2648e..049cdb74fb 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 15c6c892e0..b867b99597 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 9f89f1341c..2775eeb1b3 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; trombo1 = \notes \relative c { R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index fe8ea16072..234514fb96 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; trombo2 = \notes \relative c { R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index 26f091d9cb..a8933dca19 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; viola1 = \notes \relative c { c'1\ff ~ | c | f,4-. r r2 | r1 | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 2980793d5e..b08dbbeace 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; viola2 = \notes \relative c { % starts on (actualy, most part is on) same staff as viola1 diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly index f82acfe1fb..f7d22fa737 100644 --- a/mutopia/Coriolan/viola-part.ly +++ b/mutopia/Coriolan/viola-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index 4e69087c74..8361806520 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index be83a5d61a..ab138a28af 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; violino1 = \notes \relative c { c'1\ff ~ | c | r r2 | R1 | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index 0b01973c1a..49ce642e33 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index 15415cf844..9f084fd86c 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; violino2 = \notes \relative c { c'1\ff ~ | c | r r2 | R1 | diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index c6790225e4..b5640ad4b9 100644 --- a/mutopia/Coriolan/violoncello-part.ly +++ b/mutopia/Coriolan/violoncello-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 3211ed1486..ed29c77488 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; violoncello = \notes \relative c { c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 | diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly index 619aa58538..b865ab858a 100644 --- a/mutopia/D.Zipoli/verso_2.ly +++ b/mutopia/D.Zipoli/verso_2.ly @@ -17,7 +17,7 @@ title = "Verso II"; under the Gnu Public Licence. %} -\version "1.2.0"; +\version "1.3.4"; $voice_one = \notes \relative c' { a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| diff --git a/mutopia/E.Satie/gnossienne-4-autochange.ly b/mutopia/E.Satie/gnossienne-4-autochange.ly index 2780a7016e..05a0754f61 100644 --- a/mutopia/E.Satie/gnossienne-4-autochange.ly +++ b/mutopia/E.Satie/gnossienne-4-autochange.ly @@ -12,7 +12,7 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.2.0"; +\version "1.3.4"; \include "nederlands.ly" diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index 6094281c8b..bc6c08c869 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.2.0"; +\version "1.3.4"; \include "nederlands.ly" diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index 1e9a7f0449..74423e6eb4 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.2.0"; +\version "1.3.4"; \include "nederlands.ly" diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly index e25ecfdfe6..31e896e01d 100644 --- a/mutopia/F.Schubert/standchen-16.ly +++ b/mutopia/F.Schubert/standchen-16.ly @@ -9,6 +9,6 @@ description = "A schubert song in 16 pt"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; \include "standchen.ly" diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly index 9c2f4eaefd..221c232bfc 100644 --- a/mutopia/F.Schubert/standchen-20.ly +++ b/mutopia/F.Schubert/standchen-20.ly @@ -10,7 +10,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index 627d3cc47a..1f29fc4f2d 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -41,10 +41,10 @@ multiple \paper{}s in one \score Note: Original key F. %} -\version "1.2.0"; +\version "1.3.4"; vocalVerse = \notes\relative c''{ - \property Voice.dynamicDirection=1 + \property Voice.dynamicDirectionection=1 \times 2/3 { [ g8( )as] g } c4. g8 | \times 2/3 { [ f8( )g] f } c'4 f,8 r | g4.-> f8 \times 2/3 { [ f( )es] d } | @@ -73,7 +73,7 @@ vocalVerse = \notes\relative c''{ } vocalThrough = \notes\relative c{ - \property Voice.dynamicDirection=1 + \property Voice.dynamicDirectionection=1 g''8. g16 b8. b16 d8. d16 | c4 b r | g4. b8 d8. c16 | @@ -240,7 +240,7 @@ trebleThrough = \notes \relative c'{ } bassIntro = \notes\relative c{ - \property Voice.dynamicDirection=1 + \property Voice.dynamicDirectionection=1 %1 r4 | r4 | @@ -250,7 +250,7 @@ bassIntro = \notes\relative c{ bassVerseOne = \notes\relative c{ % \clef bass; - \property Voice.dynamicDirection=1 + \property Voice.dynamicDirectionection=1 %5 r4 | r4 | @@ -281,7 +281,7 @@ bassVerseOne = \notes\relative c{ } bassEentje = \notes\relative c{ - \property Voice.dynamicDirection=1 + \property Voice.dynamicDirectionection=1 [ ] | c,8 [ ] | [ ] | @@ -293,7 +293,7 @@ bassEentje = \notes\relative c{ } bassThrough = \notes\relative c{ - \property Voice.dynamicDirection=1 + \property Voice.dynamicDirectionection=1 %61 [ b-> d->> ] | [ b-> d->> ] | @@ -351,7 +351,7 @@ vocals = \notes{ \property Voice.noAutoBeaming = "1" \property Staff.automaticMelismata=1 - \property Voice.dynamicDirection = \up + \property Voice.dynamicDirectionection = \up \skip 4 * 12; \vocalVerse \skip 4 * 24; diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index e47849828c..265a65cac4 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -7,7 +7,7 @@ metre = "6 6. 8 6. D"; } -\version "1.2.0"; +\version "1.3.4"; sop=\notes \transpose c''{ ees2 ees4 ees4 g2 g2 | c'1. diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly index b8635916c6..b997362317 100644 --- a/mutopia/Hymns/laudatedom.ly +++ b/mutopia/Hymns/laudatedom.ly @@ -4,7 +4,7 @@ composer = "Parry"; metre = "10 10 . 11 11"; } -\version "1.2.0"; +\version "1.3.4"; sop = \notes \transpose c''{ f4 | d' bes c' | f2 \bar "||"; diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly index 3c846f945b..f4d4356afd 100644 --- a/mutopia/Hymns/maccabaeus.ly +++ b/mutopia/Hymns/maccabaeus.ly @@ -7,7 +7,7 @@ title = "Maccabaeus"; metre = "10 11. 11 11. and refrain"; } -\version "1.2.0"; +\version "1.3.4"; sop=\notes \relative c'' { b2 gis4. a8 |b2 e,2 | diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index 0390551292..42e6b9ff81 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -7,7 +7,7 @@ metre = "8 7 8 7 D"; } -\version "1.2.0"; +\version "1.3.4"; sop=\notes \relative c'' { b4 b c d | d c b a | g g a b | b4. a8 a2 | diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly index ac38071a46..be80e22543 100644 --- a/mutopia/Hymns/stille.ly +++ b/mutopia/Hymns/stille.ly @@ -8,7 +8,7 @@ } -\version "1.2.0"; +\version "1.3.4"; %{ Note: there are other verses, but the three here seem to be diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly index fe1f10e753..e0591c715b 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,7 +4,7 @@ piece = "Allemande"; } -\version "1.2.0"; +\version "1.3.4"; global = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly index 4e1db670e8..d4ee80c115 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,7 +10,7 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.2.0"; +\version "1.3.4"; global = \notes{ \time 2/4; diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index 5ef6093be2..79617ee877 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,7 +10,7 @@ copyright = "Public Domain"; } -\version "1.2.0"; +\version "1.3.4"; global = \notes { \time 4/4; diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index 392363ff8e..abd64a8be8 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.2.0"; +\version "1.3.4"; $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 1e92f7093c..0f5aa1ea74 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.2.0"; +\version "1.3.4"; $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 162b02c7c9..1127323be8 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.2.0"; +\version "1.3.4"; \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 f3c0cb2082..b168a6521c 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.2.0"; +\version "1.3.4"; \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 8942edabec..9eb6cb5a7f 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.2.0"; +\version "1.3.4"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 29adf73a61..0688ef5b0f 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.2.0"; +\version "1.3.4"; $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 33434601ce..8c2584d3ef 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.2.0"; +\version "1.3.4"; $violino_ii = \notes\relative c''{ R1*8 | @@ -101,4 +101,4 @@ $violino_ii_staff = \context Staff = violino < \$violino_ii \$global_ii > -\version "1.2.0"; +\version "1.3.4"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index 19834e05dd..a5b6196346 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.2.0"; +\version "1.3.4"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index b674f68b81..f3ed9fd392 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.2.0"; +\version "1.3.4"; % { \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 0fd5501ff6..47c3b66d49 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.2.0"; +\version "1.3.4"; % { \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 473b59a354..03d3ebbf40 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.2.0"; +\version "1.3.4"; $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 1853c17463..e1ffdf05e1 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.2.0"; +\version "1.3.4"; $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 00083c7f3a..9ffcaef121 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.2.0"; +\version "1.3.4"; % { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 7d36bb4cb5..e816b51716 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -11,7 +11,7 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; % upper = \context Staff \notes\relative c { upper = \context Staff=upper \notes\relative c { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 21c88c4178..2c08fa9e0d 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -1,30 +1,56 @@ +%{ + + Six Petits Preludes, + Collection Johann Peter Kellner + ca 1703 - 1707 + + + + Kellner was a student of Bach's. + +%} + \header{ -filename = "preludes-2.ly"; -% -% page 10 -% -% Six Petits Preludes -% Collection Johann Peter Kellner -% ca 1703- 1707 -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "public domain"; + copyright = "public domain"; + source = "Ed. Henry Lemoine Urtext"; + + + composer = "Johann Sebastian Bach (1685-1750)"; + enteredby = "jcn,hwn"; + copyright = "public domain"; + + % mutopia headers. + mutopiatitle = "Prelude"; + mutopiacomposer = "J.S.Bach"; + mutopiainstrument = "Piano"; + style = "baroque"; + copyright = "Public Domain"; + tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Jan Nieuwenhuizen.\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; + maintainer = "janneke@gnu.org"; + lastupdated = "1999/Nov/8"; } -\version "1.2.0"; +%{ +Old versions of LilyPond include this prelude with dynamics and fingerings. + +%} + + + +\version "1.3.4"; upper = \context Staff \notes\relative c{ \context Voice=i \property Voice . textStyle = "italic" - r8\mf c'-1( e-2 g-4 e-2 c-1 bes'-5 g-3 | - )a-4\< c,-1( f-2 a-4 f c c'-5 a-3 | - )b-4 g-1( b-2 d-4 b-2 g f'-5 \!d-3 | + r8 c'( e g e c bes' g | + )a c,( f a f c c' a | + )b g( b d b g f' d | < - {\stemup )e2-4\f r4 e-5 } + {\stemup )e2 r4 e } \context Voice = ii {\stemdown r4 } > \stemboth | < - { \stemup d2-4 r4 d-4 } + { \stemup d2 r4 d } \context Voice = ii { \stemdown r4 } > \stemboth | @@ -33,34 +59,34 @@ upper = \context Staff \notes\relative c{ \context Voice = ii { \stemdown } > \stemboth - g, 8-1\mf( b-2 d-4 + g, 8( b d < - { \stemup )b 4 e-5 } + { \stemup )b 4 e } \context Voice = ii { \stemdown g, 4 b } > \stemboth | < - { \stemup c2 r4 < {c-5 ~ c8} {a 4 ~ a 8} > } + { \stemup c2 r4 < {c ~ c8} {a 4 ~ a 8} > } \context Voice=ii { \stemdown c2 r4 e, 4 ~ e 8 } > \stemboth - d,-1\p( fis-2 a-4 fis-2 d-1 c'-5 a-3 | - )b-4\< g-1( b-2 d-4 b-2 g-1 f'!-5 d-3 | - )e-4 g,-1( c-2 e-4 c-2 g g'-5 e-3 | - )fis-4 a,-1( c-2 fis-4 c a a'-5 \!fis-3 | + d,( fis a fis d c' a | + )b g( b d b g f'! d | + )e g,( c e c g g' e | + )fis a,( c fis c a a' fis | < - { \stemup )g2-5\f } + { \stemup )g2 } \context Voice = ii { \stemdown } > \stemboth - r4 b4-2( | - c,8-1 e-2 g c g-2 e-1 bes'-4 g-2 | - )a16->-3 g-2 f-1 e-3 d c b !-3 a-2 - b-3\< g-1 a b c-1 d e \!f | - g4-5\ff + r4 b4( | + c,8 e g c g e bes' g | + )a16-> g f e d c b ! a + b g a b c d e f | + g4 < - { \stemup c,2-5 b 4-4 } - \context Voice=ii { \stemdown g 2-2 d 4-1 } + { \stemup c,2 b 4 } + \context Voice=ii { \stemdown g 2 d 4 } > \stemboth < @@ -78,20 +104,20 @@ lower = \context Staff \notes\relative c{ \context Voice=ii { \stemdown c,1 ~ | c ~ | c } > \stemboth | - r8 c-5( e-3 g-1 e-3 c-5 c' e,-4 | - )fis-3 d-5( fis-3 a-1 fis-3 d-5 d' fis,-4 | - )g2-3 r4 g-2( | - )a8 a,-5( c-4 e-2 c-4 a-5 g' e-3 | - )fis2 r4 d-4 | + r8 c( e g e c c' e, | + )fis d( fis a fis d d' fis, | + )g2 r4 g( | + )a8 a,( c e c a g' e | + )fis2 r4 d | g-\mordent-"(\\textsharp)" g, 4 g'-\mordent g, | % mordents in brackets... g'-\mordent g, g'-\mordent g, | g'-\mordent g, g'-\mordent g, | - g'8 g,-5( b-4 d-2 b-4 g-5 f'!-1 d-3 | - )e-2 c-4 e-2 g-1 e-3 c-5 c' e,-4 | + g'8 g,( b d b g f'! d | + )e c e g e c c' e, | \property Voice . textStyle = "finger" f1^"3\\_1" ~ | - f8 d-3 e-2 c-4 g'4-1 g,^"5\\_2" | + f8 d e c g'4 g,^"5\\_2" | \bar "|."; } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 46cf6561d5..894117f60c 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -36,7 +36,7 @@ TODO: this file needs additional layouting: the upper voice should switch staffs to avoid leger lines. %} -\version "1.2.13"; +\version "1.3.4"; upper = \notes \transpose c'' { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 406d00b953..d5eeedface 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -10,7 +10,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; one = \context Staff \notes\relative c { \context Voice=i diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index f26b187f99..0ccb570c2e 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -10,7 +10,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; upper = \context Staff \notes\relative c{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 3cc949bbc4..d51b769e9d 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -10,7 +10,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.2.0"; +\version "1.3.4"; one = \context Staff \notes\relative c{ diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index 473a743eca..b2a4e655ab 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -1,6 +1,6 @@ -\version "1.2.0"; +\version "1.3.4"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 380f553b9d..ce797d3dbd 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -99,4 +99,4 @@ allemande = \context Staff \notes< > -\version "1.2.0"; +\version "1.3.4"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly index 543edf7588..f152601f4e 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -1,5 +1,5 @@ -\version "1.2.0"; +\version "1.3.4"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index e28db4df3c..216cd0176a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -1,5 +1,5 @@ -\version "1.2.0"; +\version "1.3.4"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index cda7712a71..e7abdfe37a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -88,4 +88,4 @@ courante = \context Staff \notes< \$courante_b > -\version "1.2.0"; +\version "1.3.4"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly index 9bc027b86d..75d83d657c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -1,7 +1,7 @@ -\version "1.2.0"; +\version "1.3.4"; \include "courante-urtext.ly"; 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 c1742e50c3..20313c7071 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -1,7 +1,7 @@ -\version "1.2.0"; +\version "1.3.4"; \include "gigue-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index dd69687191..630b9b0a6d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -102,4 +102,4 @@ gigue = \notes< \$gigue_b > -\version "1.2.0"; +\version "1.3.4"; 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 b5fa115eac..5359bab409 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -1,6 +1,6 @@ -\version "1.2.0"; +\version "1.3.4"; \include "gigue-urtext.ly"; 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 2b4d6043b9..385673c34f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -1,7 +1,7 @@ -\version "1.2.0"; +\version "1.3.4"; \include "menuetto-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 6475b772ba..07e1531223 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -148,4 +148,4 @@ menuetto_ii = \context Staff\notes \relative c { d2. } -\version "1.2.0"; +\version "1.3.4"; 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 a993e206c6..c795cf65e9 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -1,7 +1,7 @@ -\version "1.2.0"; +\version "1.3.4"; \include "menuetto-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index 59231c48e3..88d0f2158e 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -1,7 +1,7 @@ -\version "1.2.0"; +\version "1.3.4"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index faa88b84b9..1b9fd3ef76 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -194,4 +194,4 @@ prelude = \context Staff \notes< \$prelude_b > -\version "1.2.0"; +\version "1.3.4"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly index ca34467d2b..de544f4f9c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -1,7 +1,7 @@ -\version "1.2.0"; +\version "1.3.4"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index 9a9b238eff..5949715a51 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -1,7 +1,7 @@ -\version "1.2.0"; +\version "1.3.4"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 593384ab1a..8a6f7eae16 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -89,4 +89,4 @@ sarabande = \context Staff \notes< \$sarabande_b > -\version "1.2.0"; +\version "1.3.4"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly index fdb2b4e899..111625d701 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 18ea02ec54..f18a619e85 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -19,7 +19,7 @@ enteredby = "Shay Rojansky"; %{ TODO: use autobeaming. %} -\version "1.2.13"; +\version "1.3.4"; tenor = diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 1fef17664f..cae280c7b1 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -20,7 +20,7 @@ % It would be nice to squeeze this onto two pages, but I am not sure % if it would work with US paper. -\version "1.2.13"; +\version "1.3.4"; global = \notes { \key c \minor; diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 1766da98f1..6c4a53559e 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -15,7 +15,7 @@ enteredby = "Shay Rojansky"; lastupdated = "1999/Oct/14"; } -\version "1.2.13"; +\version "1.3.4"; % should do programmable input. soprane = diff --git a/mutopia/L.Mozart/sinfonia.ly b/mutopia/L.Mozart/sinfonia.ly index ebb4d6e3c2..6024061e03 100644 --- a/mutopia/L.Mozart/sinfonia.ly +++ b/mutopia/L.Mozart/sinfonia.ly @@ -383,4 +383,4 @@ bassocontinuo = \notes \relative c'{ \midi{ \tempo 4 = 100; } } -\version "1.2.0"; +\version "1.3.4"; diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly index 34deb5ed7c..37e7d28a7a 100644 --- a/mutopia/N.W.Gade/brass.ly +++ b/mutopia/N.W.Gade/brass.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; corI=\notes\relative c'' { \key c; diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly index d6181f7dd5..5e4c429c19 100644 --- a/mutopia/N.W.Gade/parts.ly +++ b/mutopia/N.W.Gade/parts.ly @@ -11,7 +11,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + % Process with 'ly2dvi -s parts.ly' to get the separate parts. -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "wood.ly" diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly index 7680cffced..d905d8e050 100644 --- a/mutopia/N.W.Gade/score.ly +++ b/mutopia/N.W.Gade/score.ly @@ -8,7 +8,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + "Statens Musikbibliotek, Stockholm, Sweden"; } -\version "1.2.0"; +\version "1.3.4"; \include "global.ly" \include "wood.ly" @@ -56,12 +56,12 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \property Staff.instr = "Cor." \context Voice = corI < \globalNoKey - \stemup \property Voice.dynamicDirection = \up + \stemup \property Voice.dynamicDirectionection = \up \property Voice.articulationScriptVerticalDirection = \up \corI > \context Voice = corII { - \stemdown \property Voice.dynamicDirection = \down + \stemdown \property Voice.dynamicDirectionection = \down \property Voice.articulationScriptVerticalDirection = \down \corII } @@ -71,12 +71,12 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \property Staff.instr = "Trp." \context Voice = trpI < \globalNoKey - \stemup \property Voice.dynamicDirection = \up + \stemup \property Voice.dynamicDirectionection = \up \property Voice.articulationScriptVerticalDirection = \up \trpI > \context Voice = trpII { - \stemdown \property Voice.dynamicDirection = \down + \stemdown \property Voice.dynamicDirectionection = \down \property Voice.articulationScriptVerticalDirection = \down \trpII } diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly index 0e17a3a0dd..d8adf8359f 100644 --- a/mutopia/N.W.Gade/strings.ly +++ b/mutopia/N.W.Gade/strings.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; viI=\notes\relative c'' { diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly index 84a5062b90..8291299980 100644 --- a/mutopia/N.W.Gade/wood.ly +++ b/mutopia/N.W.Gade/wood.ly @@ -1,4 +1,4 @@ -\version "1.2.0"; +\version "1.3.4"; flauto=\notes\relative c''' { \clef "treble"; diff --git a/mutopia/W.A.Mozart/horn-concerto-3/cadenza.ly b/mutopia/W.A.Mozart/horn-concerto-3/cadenza.ly index f7e100661e..414eb16df2 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3/cadenza.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3/cadenza.ly @@ -26,14 +26,14 @@ Herman Jeurissen. %} -\version "1.2.13"; +\version "1.3.4"; cad = \notes \relative c' { \property Score.midiInstrument = "french horn" \context Staff { \emptyText - \cadenza 1; + \cadenzaOn \clef "violin"; diff --git a/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly index 4b6e4b48e8..8060346f56 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly @@ -38,7 +38,7 @@ longgrace = \property Grace.stemStyle = "" aftergrace = \property Grace.graceAlignPosition = \right -\version "1.2.13"; +\version "1.3.4"; \include "allegro.ly" \include "romanze.ly" diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index feff7c9bc6..66d30cfafa 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.2.0"; +\version "1.3.4"; global = \notes { \property StaffGroup.timeSignatureStyle = "old" @@ -130,7 +130,7 @@ vi1=\context Staff = vi1 < e2 r8 d d d16 e | fis a g fis e d c b a8 d d d16 e | fis4 g2 fis!4 | - \cadenza 1; + \cadenzaOn g\breve } }> @@ -201,7 +201,7 @@ vi2=\context Staff = vi2 < c8 g g g16 a b d c b a g fis e | d8 d' d d16 e fis16 a g fis e d c b | a d c b a g fis e d4 d' | - \cadenza 1; + \cadenzaOn b\breve } }> @@ -251,7 +251,7 @@ bc=\context Staff = bc < d1^"3 4 3" | G^"3 4 3" | c2 G | d1^"\\textsharp" ( | ) d^"3 4 3" | - \cadenza 1; + \cadenzaOn G\breve } }>