From: fred Date: Tue, 26 Mar 2002 23:23:07 +0000 (+0000) Subject: lilypond-1.3.60 X-Git-Tag: release/1.5.59~1572 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=335acfb93b4b6b7310d3cc9a17a1731ac8614868;p=lilypond.git lilypond-1.3.60 --- diff --git a/Documentation/ntweb/angels.ly b/Documentation/ntweb/angels.ly index 2ea62654ff..ae7d223aa2 100644 --- a/Documentation/ntweb/angels.ly +++ b/Documentation/ntweb/angels.ly @@ -15,7 +15,7 @@ global = \notes { \clef treble; } -\version "1.3.41"; +\version "1.3.59"; % \include "paper16.ly" flute1 = \notes \relative c'' \context Voice = flute { diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 7d7d5bbe01..3e63b48eaf 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -144,7 +144,7 @@ the duration of the long a. is proportionate to that of the main note. %\property Voice.textEmptyDimension = ##t \property Voice.textStyle = "large" \notes\relative c'' { -\key d; +\key d \major; \time 4/4; r { \property Grace.stemStyle = "" @@ -165,7 +165,7 @@ An appoggiatura may have more notes preceding the main note. \emptyText \property Voice.textStyle = "large" \notes\relative c'' { - \key as; + \key as \major; \time 2/4; \grace { bes16 } as8_"notation" as16 bes as8 g | \grace { [as16 ( bes] } < ) c4 as > @@ -296,7 +296,7 @@ start of the music. @ @mudela[13pt,eps] -\key g; +\key g \major; \time 4/4; \notes\relative c'' { g4 c b a | g1 \bar "||";} \time 3/8; @@ -512,7 +512,7 @@ Melody moving in the narrow steps of the scale; @ @mudela[13pt,eps] -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { g4 g g a | b2 a | g4 b a a | g1 \bar "||"; } @end mudela @@ -546,7 +546,7 @@ composition methods. \property Score.timeSignatureStyle = "C2/2" \context GrandStaff < \notes\relative c' { - \key bes; + \key bes \major; \time 4/4; \clef treble; < \context Voice = rha { @@ -563,7 +563,7 @@ composition methods. } \notes\relative c' { \clef bass; - \key bes; + \key bes \major; < \context Voice = lha { \stemup r8 d es g, fis4 g | r8 a16 bes c8 bes16 a bes4 g | @@ -601,7 +601,7 @@ abbreviation "cresc.". @ @mudela[13pt,eps] -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { g4 \< a b c | \! d1 \bar "|."; } @end mudela @@ -633,7 +633,7 @@ frequently near the beginning marked by a sign: @mudela[13pt,eps] \property Voice.textStyle = "large" -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { d1 | g,4^\segno a b c | b a g2_"d.s." \bar "|."; } @end mudela @@ -647,7 +647,7 @@ or the abbreviation "decresc.". @ @mudela[13pt,eps] -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { d4 \> c b a | \! g1 \bar "|."; } @end mudela @@ -860,7 +860,7 @@ scale. Opposite of @ar{}@strong{conjunct movement}. @ @mudela[13pt,eps] -\key a; +\key a \major; \time 4/4; \notes\relative c' { \partial 8; e8 | a4. gis8 b a e cis | @@ -1582,14 +1582,14 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8) or @mudela[13pt,eps] \notes\relative c'' { \time 3/4; - \key f; + \key f \major; c es d | c bes8 a bes4 | c es d | c2 \bar "||";} @end mudela @mudela[13pt,eps] \notes\relative c' { \time 6/8; - \key f; + \key f \major; f8 f f f a16 g a f | c'8 c c c e16 d e c \bar "||";} @end mudela @@ -1597,7 +1597,7 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8) or @mudela[13pt,eps] \notes\relative c'' { \time 5/4; - \key g; + \key g \major; d4 b8 g b d d c a4 | g8 g16 g g8 g16 g g8 fis16 g a8 fis16 e d4 \bar "||";} @end mudela @@ -1686,7 +1686,7 @@ subject. \property Voice.textStyle = "large" \notes\relative c'' { \time 4/4; - \key g; + \key g \major; \partial 8; g16_"------" fis | g8 d16_"------" c d8 g16 fis g8 b,16 a b8 g'16 fis | g8 g,16 a b8 cis d16 s @@ -2012,10 +2012,10 @@ the same @w{@ar{}@strong{signature}}. \property Score.barNonAuto = ##t \property Voice.textStyle = "large" \notes\relative c' { - \key es; + \key es \major; es1_"e flat major" f g as bes c d es \bar "||"; s16 - \key es; + \key es \major; c,1_"c minor" d es f g a! b! c \bar "||"; } @end mudela @@ -2027,7 +2027,7 @@ gen@-ta@-gel@-se, S: repris, N: . @ @mudela[13pt,eps] -\key g; +\key g \major; \time 4/4; \notes\relative c'' { \repeat volta 2 {g4 g d' d | e e d2 | c4 c b b | a a g2 } @@ -2239,7 +2239,7 @@ notehead. @ @mudela[13pt,eps] -\key d; +\key d \major; \time 4/4; \notes\relative c'' { \partial 8; a8 | @@ -2430,7 +2430,7 @@ with figures designating the chief @w{@ar{}@strong{interval}}s and \context GrandStaff < \notes\relative c'' { \time 4/4; - \key es; + \key es \major; \clef treble; < \context Voice = rha { \stemup @@ -2446,7 +2446,7 @@ with figures designating the chief @w{@ar{}@strong{interval}}s and \addlyrics \notes\relative c' { \clef bass; - \key es; + \key es \major; es8 c () c bes () bes as () as g16 f | es4 } \context Lyrics \lyrics { @@ -2503,10 +2503,10 @@ Shifting a melody up or down in pitch, while keeping the same relative pitches. \context Staff { \time 3/4; \notes\relative c'' { - \key g; + \key g \major; d4 g,8 a b c | d4 g, g | e' c8 d e fis | g4 g, g \bar "|."; } \transpose bes\relative c'' { - \key g; + \key g \major; d4 g,8 a b c | d4 g, g | e' c8 d e fis | g4 g, g \bar "|."; } } @end mudela @@ -2599,7 +2599,7 @@ line. @w{@ar{}@strong{measure}} @w{@ar{}@strong{meter}} @ @mudela[13pt,eps] -\key f; +\key f \major; \time 4/4; \notes\relative c' { \partial 4; f4 | bes4. a8 bes4 c | diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 6b7ac8a458..b7db980a02 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1798,10 +1798,10 @@ will print flats. @mudela[fragment,verbatim] \context Staff { \clef "F"; - { \key e; c d e f } + { \key e \major; c d e f } \clef "G"; - \transpose des'' { \key e; c d e f } - \transpose cis'' { \key e; c d e f } + \transpose des'' { \key e \major; c d e f } + \transpose cis'' { \key e \major; c d e f } } @end mudela diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 136410e948..f15f05f515 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -45,7 +45,7 @@ of the famous menuet in J. S. Bach's @emph{Klavierbuechlein}. \notes \relative c'' \sequential{ \time 3/4; - \key g; + \key g \major; \repeat "volta" 2 { d4 g,8 a b c d4 g, g | @@ -168,7 +168,7 @@ sign is printed. This command is also used to generate bar lines in the right spots. @example - \key g; + \key g \major; @end example This command changes the current key to G-major. Although this diff --git a/input/bugs/addlyrics.ly b/input/bugs/addlyrics.ly index b278d881cb..f38a604e1a 100644 --- a/input/bugs/addlyrics.ly +++ b/input/bugs/addlyrics.ly @@ -12,7 +12,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/bugs/knee.ly b/input/bugs/knee.ly index eee5e3887e..f5590cf4a5 100644 --- a/input/bugs/knee.ly +++ b/input/bugs/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.59"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/denneboom.ly b/input/denneboom.ly index 9ecd76a180..ff0f985206 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.3.42"; +\version "1.3.59"; oden = \lyrics{ O | diff --git a/input/example-3.ly b/input/example-3.ly index 025a3a7bf7..f245ae37b1 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 96ae93f9ba..cd427c7eca 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.3.42"; +\version "1.3.59"; diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index fee4e0cb9b..cfccea91c9 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -22,13 +22,13 @@ * organ staff... %} -\version "1.3.42"; +\version "1.3.59"; praeludium_commands = \notes { \time 4/4; - \key e; + \key e \major; } praeludium_right = \notes { @@ -99,7 +99,7 @@ praeludium_pedal = \notes \relative c{ fugaII_commands = \notes{ \time3/4; - \key e; % E-major + \key e \major; % E-major } fugaII_right = \notes \relative c'' { diff --git a/input/rhythm.ly b/input/rhythm.ly index 05ace2961e..df4bfcb489 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.3.42"; +\version "1.3.59"; ritme = \notes\transpose c'' { \time 4/4; diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 8fbb694dcd..1bb791a165 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html http://www.Arkkra.com/doc/star.ps %} -\version "1.3.42"; +\version "1.3.59"; % TODO: % @@ -35,7 +35,7 @@ http://www.Arkkra.com/doc/star.ps global = \notes { \time 3/4; - \key d; + \key d \major; \partial 4; } diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index e397bb363b..642aaa8bae 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index c4a4ab84df..fa80b18037 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index eeeb0062f2..87e04d39d7 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 0cc40434da..fd96d8c81c 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -30,4 +30,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 626449eaa8..c71fc9116c 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -21,4 +21,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/beams.ly b/input/test/beams.ly index aa6dd10886..fff0213aa8 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.42"; +\version "1.3.59"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index efa0424573..0920abe866 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,8 +1,8 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes \relative c' { - \key es; \time 3/4; + \key es \major; \time 3/4; < \context Voice = two { \stemdown es4 bes es } \context Voice = one { \stemup g4 as g } > | diff --git a/input/test/broken.ly b/input/test/broken.ly index 26626169e1..656a96ec38 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.42"; +\version "1.3.59"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index ab7d7e993e..a2ed40d107 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.42"; +\version "1.3.59"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index ab5e8fb1c2..435c465cfa 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.42"; +\version "1.3.59"; diff --git a/input/test/chords.ly b/input/test/chords.ly index 4d1383e2ad..1e1ed03ee7 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; %{ Would this be acceptable/good enough/convenient for entry? @@ -37,21 +37,21 @@ keys = \notes{ s1 s1 s1 s1 s1 s1 - \key g; s1 - \key d; s1 - \key a; s1 - \key e; s1 - \key b; s1 - \key fis; s1 - \key c; s1 - \key f; s1 - \key bes; s1 - \key es; s1 - \key as; s1 - \key des; s1 - \key ges; s1 - \key c; s1*2 - \key c; s1*6 + \key g \major; s1 + \key d \major; s1 + \key a \major; s1 + \key e \major; s1 + \key b \major; s1 + \key fis \major; s1 + \key c \major; s1 + \key f \major; s1 + \key bes \major; s1 + \key es \major; s1 + \key as \major; s1 + \key des \major; s1 + \key ges \major; s1 + \key c \major; s1*2 + \key c \major; s1*6 } \score{ diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 364547fed3..97ff37a3c3 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index ea481c472a..c1b0d55e6c 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.42"; +\version "1.3.59"; 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 55b9152232..b7640f5e40 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score { diff --git a/input/test/extender.ly b/input/test/extender.ly index ff42bcce2b..a088a49a77 100644 --- a/input/test/extender.ly +++ b/input/test/extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 146e52e7ac..e5f208d4cc 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 970031c1ba..9349d53ab4 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; FontBody= \notes\transpose c''{ \bar "|:"; @@ -28,19 +28,19 @@ FontBody= \notes\transpose c''{ e32 _| g'32^| g''32-\ltoe g''32-\lheel e64-\rtoe g'64-\rheel c4... | \context Voice = mensural \relative c'' { -\property Voice . noteHeadStyle = "mensural" +\property Voice . noteHeadStyle = #'mensural \property Voice. stemCentered = ##t c\maxima*1/8 c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 } - \property Voice . noteHeadStyle = "harmonic" + \property Voice . noteHeadStyle = #'harmonic \transpose c'{ \time 4/4; \property Voice . textStyle = "finger" - \property Voice . noteHeadStyle = "diamond" + \property Voice . noteHeadStyle = #'diamond c1^"1" d2^"2" e4^"3" - \property Voice . noteHeadStyle = "cross" + \property Voice . noteHeadStyle = #'cross f4^"4" g4^"5" \property Voice . noteHeadStyle = "" diff --git a/input/test/font.ly b/input/test/font.ly index 83741ed452..e7e4eb13b2 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.42"; +\version "1.3.59"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index a05324fd6a..480b237936 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.42"; +\version "1.3.59"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 4c2440e14a..3aaf6c2458 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 61354761e3..d6d0cd320e 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.42"; +\version "1.3.59"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index a3de6d41c6..0c0cb2f314 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; %{ diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index 0bf06da305..920aabbdac 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index c09fb85c82..28bd2f0163 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; toeter_i = \notes\relative c <{ \property Staff.instrument = #"Toeters" diff --git a/input/test/hyphen.ly b/input/test/hyphen.ly index f97c78d878..45db2afa18 100644 --- a/input/test/hyphen.ly +++ b/input/test/hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 08a8794003..974ab04d5e 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.42"; +\version "1.3.59"; incipit = \notes\relative c'{ @@ -27,7 +27,7 @@ violin = \notes\relative c''{ } BC = \notes\relative c{ - \key d; + \key d \major; \time 2/2; \clef "bass"; diff --git a/input/test/keys.ly b/input/test/keys.ly index 35b11a9a15..1b694cd321 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,16 +1,16 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes \relative c'' { \property Staff. createKeyOnClefChange = ##t - \key bes; c2 -% \key c ; % \minor; - \key es ; % \minor; + \key bes \major; c2 +% \key c \major; % \minor; + \key es \major; % \minor; c2 \break - \key bes ; % \major; - c2 \clef alto; c2 \key d; \clef treble; c2 + \key bes \major; % \major; + c2 \clef alto; c2 \key d \major; \clef treble; c2 \property Staff. keySignature = #'((2 . -1) (6 . -1) (4 . -1)) e2 } diff --git a/input/test/keys2.ly b/input/test/keys2.ly index b9209cfe48..499d0b1e8d 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; blah = \notes { diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index fe6e070526..83e016bbfe 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -21,4 +21,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/knee.ly b/input/test/knee.ly index b48bfd7bd8..f5590cf4a5 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \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 ae6a1f405b..a1e28d0b80 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.42"; +\version "1.3.59"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index 724732b04a..8086e1eb1a 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/mark.ly b/input/test/mark.ly index 2a46b75f39..522d529275 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index ab1260b632..774abcb841 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index f6a35de05a..579c3db142 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; 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 86202823ca..0ec56ee0cc 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -40,4 +40,4 @@ c4 c2 c8 c16 c16 c1 c\breve c\longa } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index c4d177381b..7df9324746 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 34078216c7..c9b7da5316 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; m = \notes \relative c''{ diff --git a/input/test/ossia.ly b/input/test/ossia.ly index de27172cf2..bcc443185e 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score { diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index 05dc23fbdf..c6944f7ea6 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -38,4 +38,4 @@ restsII = \context Staff \notes { } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index a84dfc2700..96967a613d 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; blah = \notes{ \transpose c'' { diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 6eddcb7cf7..2df0f6f404 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.42"; +\version "1.3.59"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index 914afd1fe5..d6409add0b 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -36,4 +36,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 4372acc205..4e5f76f18f 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.42"; +\version "1.3.59"; \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index 9ae3325894..e47e3eb6ba 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 03debe0993..d065f3ce59 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 89ff29ad66..48efac0a56 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -18,9 +18,9 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; e4 dis4 e2 } \context Voice = VB { \property Voice.verticalDirection= -1 [cis8 a] [fis b] gis2 } - {\key e; } + {\key e \major; } > - \context Staff = SB { \clef "bass"; \key e; + \context Staff = SB { \clef "bass"; \key e \major; [a,,16 e dis e] [b'8 b,] [e16 e, gis b] e4 } > @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 15c560e909..324150f03c 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.42"; +\version "1.3.59"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index f0db341dcf..f2ea46d754 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index 712773b5cc..ce2817935b 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -1,6 +1,6 @@ % test staff margin with partial measure. -\version "1.3.42"; +\version "1.3.59"; \score { \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index 290fd256b4..ef8617d874 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.42"; +\version "1.3.59"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 6ee2f1ad75..c84e272264 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 48beef13b1..48a6fc3c29 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -5,7 +5,7 @@ \property Voice.fontSize = #-1 \property Voice . dynamicDirection = \up \stemdown -%\key gis; +%\key gis \major; c8 d [e f g a] b c \ff } @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 9ed889d5f1..d1b8151eef 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \context Voice\notes \relative c''{ %%? diff --git a/input/test/stem.ly b/input/test/stem.ly index 1ccb9c5978..5fe3bf91c0 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.42"; +\version "1.3.59"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index dc61889f27..80153ee52d 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.42"; +\version "1.3.59"; % this is an example of extreme dynamics @@ -16,7 +16,7 @@ instrument= "Violoncello"; \notes \relative c{ \clef "bass"; - \key d; + \key d \major; | ~ r8 r4 | a2\ppp\cr a2\rc\p\decr | ~ r8 r4 | a2\pppp ~ a8 r8 r4 | a2\ppppp ~ a8 r8 r4 | r4 a8_"pizz" @@ -32,7 +32,7 @@ instrument= "Violoncello"; \notes \relative c{ \clef "bass"; - \key c; + \key c \major; | | ~ ~ | } diff --git a/input/test/thumb.ly b/input/test/thumb.ly index acd3319b8d..14e1e1197d 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.42"; +\version "1.3.59"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/title.ly b/input/test/title.ly index 261668a4fa..ae4d4650ae 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.42"; +\version "1.3.59"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 93aa108473..d9a576b634 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,16 +22,16 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; vOne = \notes \relative c''{ \clef"violin"; - \key d; + \key d \major; \time 2/4 ; d4 d | - \key fis; + \key fis \major; fis4 fis | - \key es; + \key es \major; c4 c | } diff --git a/input/test/tup.ly b/input/test/tup.ly index 8c1d54b4c3..c236afff84 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index d39c302143..7ce624fbd9 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,4 +1,4 @@ -\version "1.3.47" +\version "1.3.59" \score { \context Voice \notes\relative c'' { diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index 0ec7feb0d0..a203483870 100644 --- a/input/test/twinkle-as5.ly +++ b/input/test/twinkle-as5.ly @@ -6,7 +6,7 @@ enteredby = "hwn and jcn"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "paper-as5.ly" diff --git a/input/test/updown.ly b/input/test/updown.ly index 9b19cefadd..fdc47121c8 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -10,7 +10,7 @@ {\voicetwo c}> - \version "1.3.42"; + \version "1.3.59"; } \paper { } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 23ab328f83..29d1ab180e 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 53a6aaf636..57de581d51 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 2930e6ca21..2483ba6094 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.3.42"; +\version "1.3.59"; melodie = \notes\relative c'' { \clef "violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index af10d1800c..afa9353aa7 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.3.42"; +\version "1.3.59"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 615928a62c..53afd01816 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -15,7 +15,8 @@ /** Rationals with glue for Guilification; - */ + + FIXME: remove self_scm_ and then remove this class */ struct Moment : public Rational { Moment () { self_scm_ = SCM_EOL; } @@ -27,7 +28,7 @@ struct Moment : public Rational DECLARE_SMOBS; }; - +SCM smobify (Moment*); Moment * unsmob_moment (SCM); IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / ); diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 8e8babad66..172961dacf 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -3,12 +3,10 @@ (c) 1997--2000 Han-Wen Nienhuys */ -// clean up! #include "musical-request.hh" #include "command-request.hh" #include "local-key-item.hh" -#include "debug.hh" #include "key-item.hh" #include "tie.hh" #include "note-head.hh" @@ -19,8 +17,6 @@ #include "side-position-interface.hh" #include "engraver.hh" -#include "parray.hh" - /** Make accidentals. Catches note heads, ties and notices key-change @@ -40,32 +36,32 @@ protected: virtual void do_removal_processing (); public: - SCM last_accs_; + // todo -> property + SCM last_keysig_; Key_engraver *key_grav_l_; - Array mel_l_arr_; - Array support_l_arr_; - Link_array forced_l_arr_; - Link_array tied_l_arr_; + + Link_array mel_l_arr_; + Link_array support_l_arr_; + Link_array forced_l_arr_; + Link_array tied_l_arr_; Local_key_engraver(); - bool self_grace_b_; + Grace_align_item * grace_align_l_; }; - - Local_key_engraver::Local_key_engraver() { key_grav_l_ = 0; key_item_p_ =0; grace_align_l_ =0; - last_accs_ = SCM_EOL; + last_keysig_ = SCM_EOL; } - void Local_key_engraver::do_creation_processing () { - last_accs_ = get_property ("keySignature"); + last_keysig_ = get_property ("keySignature"); + daddy_trans_l_->set_property ("localKeySignature", last_keysig_); } void @@ -144,6 +140,11 @@ Local_key_engraver::process_acknowledged () } } } + + /* + UGH ! + */ + if (key_item_p_ && grace_align_l_) { Side_position_interface (grace_align_l_).add_support (key_item_p_); @@ -193,8 +194,6 @@ Local_key_engraver::acknowledge_element (Score_element_info info) Note_req * note_l = dynamic_cast (info.req_l_); Note_head * note_head = dynamic_cast (info.elem_l_); - - if (he_gr != selfgr) return; @@ -212,7 +211,6 @@ Local_key_engraver::acknowledge_element (Score_element_info info) void Local_key_engraver::do_process_music() { - SCM smp = get_property ("measurePosition"); Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); @@ -222,7 +220,7 @@ Local_key_engraver::do_process_music() if (!to_boolean (get_property ("noResetKey"))) daddy_trans_l_->set_property ("localKeySignature", sig); } - else if (last_accs_ != sig) + else if (last_keysig_ != sig) { daddy_trans_l_->set_property ("localKeySignature", sig); } diff --git a/lily/score-element.cc b/lily/score-element.cc index 327cffe787..906c4c5a96 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -89,6 +89,12 @@ Score_element::Score_element (Score_element const&s) Score_element::~Score_element() { + // this goes awry when score-elements are copied... + + /* + Kijk goed naar hoe smobify en unsmobify werken. unsmobify_self + is te gebruiken wanneer C++ geheugen beheer weer overneemt van + GUILE. --hwn */ } diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index d5c12324ca..cf792a4408 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index 09c7f6601d..95abb1a0c6 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly"; diff --git a/ly/catalan.ly b/ly/catalan.ly index d8545e00a4..2d3d5238c5 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -71,4 +71,4 @@ -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 32688fd45a..6253a5330c 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index e08c2114bc..887ac83a4e 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/declarations-as.ly b/ly/declarations-as.ly index ccf8db4a43..fe4d71c552 100644 --- a/ly/declarations-as.ly +++ b/ly/declarations-as.ly @@ -1,4 +1,8 @@ - + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% UGH UGH UGH UGHUGH FIXME +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -> duplication! + + breve = \duration { -1 0 } longa = \duration { -2 0 } maxima = \duration { -3 0 } @@ -24,17 +28,8 @@ center=0 break = \penalty -1000000; nobreak = \penalty 1000000; +\include "scales.ly" -major = 0 -minor = 3 - -ionian = 0 -locrian = 1 -aeolian = 3 -mixolydian = 5 -lydian = 7 -phrygian = 8 -dorian = 10 melisma = \property Staff.melismaBusy = ##t melismaEnd = \property Staff.melismaBusy = ##f diff --git a/ly/declarations.ly b/ly/declarations.ly index d6c0930ea8..c113cfec3c 100644 --- a/ly/declarations.ly +++ b/ly/declarations.ly @@ -25,17 +25,7 @@ center=0 break = \penalty -1000000; nobreak = \penalty 1000000; - -major = 0 -minor = 3 - -ionian = 0 -locrian = 1 -aeolian = 3 -mixolydian = 5 -lydian = 7 -phrygian = 8 -dorian = 10 +\include "scales.ly" melisma = \property Staff.melismaBusy = ##t melismaEnd = \property Staff.melismaBusy = ##f diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 04effbdb3d..5a4beb4e0c 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/english.ly b/ly/english.ly index 1a611b9d08..50042bb52b 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -77,5 +77,5 @@ (bss . ( -1 6 2 )) ) -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/fragment.ly b/ly/fragment.ly index ca24d7eb51..43b2b15806 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/init-as.ly b/ly/init-as.ly index 923aa1ba6b..ce7099b426 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations-as.ly" diff --git a/ly/init.ly b/ly/init.ly index 04c15677b7..27c3fa6612 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly"; diff --git a/ly/italiano.ly b/ly/italiano.ly index e3752a9319..9a5a262012 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ( -1 6 2 )) } -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/key.ly b/ly/key.ly new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/ly/key.ly @@ -0,0 +1 @@ + diff --git a/ly/norsk.ly b/ly/norsk.ly index f6d714a122..602b820be4 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -1,5 +1,5 @@ -% $Id: norsk.ly,v 1.4 2000/04/04 17:00:58 fred Exp $ +% $Id: norsk.ly,v 1.5 2000/06/16 14:10:51 fred Exp $ %{ @@ -104,4 +104,4 @@ -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index edbbdf23f6..60e4168474 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,6 +1,6 @@ % paper-as5.ly -\version "1.3.42"; +\version "1.3.59"; paper_as_five = \paper { staffheight = 5.\char; diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 6e44c78abb..4f34c73c75 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,6 +1,6 @@ % paper-as9.ly -\version "1.3.42"; +\version "1.3.59"; paper_as_nine = \paper { staffheight = 9.\char; diff --git a/ly/paper16.ly b/ly/paper16.ly index c098eb0bb4..4b25071532 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -2,7 +2,7 @@ -\version "1.3.42"; +\version "1.3.59"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/ly/paper20.ly b/ly/paper20.ly index c3bade0b38..57848f8d1e 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.3.42"; +\version "1.3.59"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/paper23.ly b/ly/paper23.ly index efa2d33107..30f640ee06 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,7 +1,7 @@ % paper23.ly -\version "1.3.42"; +\version "1.3.59"; paper_twentythree = \paper { staffheight = 23.0\pt; diff --git a/ly/property.ly b/ly/property.ly index b3fd74191a..cfed38993a 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS. %} -\version "1.3.42"; +\version "1.3.59"; %hmm, (these) abbrevs suck, imo % i guess they're meant as some form of doco diff --git a/ly/scales.ly b/ly/scales.ly new file mode 100644 index 0000000000..873f58313b --- /dev/null +++ b/ly/scales.ly @@ -0,0 +1,32 @@ + + +major = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . 0) + + ) +minor = #'( + (0 . 0) + (1 . 0) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . -1) + (6 . -1) + ) + + +%{ OUTDATED: someone please fix these +ionian = 0 +locrian = 1 +aeolian = 3 +mixolydian = 5 +lydian = 7 +phrygian = 8 +dorian = 10 +%} diff --git a/ly/svenska.ly b/ly/svenska.ly index 2c18b3d686..e25ade6934 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ( -1 6 1 )) (hississ . ( -1 6 2 )) ) -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index 2e432c85c3..2a124a83ec 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index ddac5c36aa..23feeb7db4 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 5e1a2db34a..bce020e355 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" @@ -24,7 +24,7 @@ $clarinetti_staff = \context Staff = clarinetti < %\notes \context Voice=clarinetti < \notes \context Staff=clarinetti < \time 4/4; - \key f; + \key f \major; \skip 1*341; \bar "|."; \context VoiceOne=clarinettoi \$clarinetto1 diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 8e55f54f4b..67ea94f751 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; clarinetto1 = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 5699d11076..ae92af6fbb 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; clarinetto2 = \notes \relative c { R1*2 bes''4-.\ff r r2 | diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly index 35e2ab0045..46eea2f6cf 100644 --- a/mutopia/Coriolan/contrabasso-part.ly +++ b/mutopia/Coriolan/contrabasso-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "contrabasso.ly" diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 6001098b52..4b53586a6d 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; contrabasso = \notes \relative c { % \translator Staff=violoncello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 67d127646d..126cfaa4e6 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -8,7 +8,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "paper16.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 404e0178e5..ba5c9ffae8 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 470f00c463..4c83ed3fb3 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 1313558389..88a280a0df 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; corno1 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index f04d8fdb93..b141ebdd29 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; corno2 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index d9228f5b10..ac33ccedfd 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 5e10487759..e544773c3c 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 30d77e9953..4aba1af595 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; fagotto1 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 54b9a9d5ea..46e20bd21c 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; fagotto2 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index 5b93e92dd4..64c15a8d61 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 4e3e991a65..4de0fdd353 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 589c0e53d8..fa500b659c 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; flauto1 = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index bb150d5b87..4dcfbd0eac 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -6,7 +6,7 @@ composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; flauto2 = \notes \relative c { R1 *2 | as'''4-.\ff r r2 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 3c1799526a..6cc38edca0 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -9,11 +9,11 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; global = \notes { \time 4/4; - \key es; + \key es \major; \skip 1*314; \bar "|."; } diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index ab1ede99f1..aa4ce8c21a 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; oboe1 = \notes \relative c'' { R1*2 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index dead69de2e..bbdeb2634a 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; oboe2 = \notes \relative c{ R1*2| diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 27dd5295fe..f217a8e852 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 75f4c8962b..a6814311b4 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index ac21d1281a..49541e048d 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 576e6da21e..72876e2ab9 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; timpani = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 6bd558eecd..fe127d7bef 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 34fd0f5680..f8a5b7669a 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 6770593652..dbb308534a 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; trombo1 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 65801e02d4..2d4396247e 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; trombo2 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index fa89bff6e4..7ab497ebae 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; viola1 = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index d9be550c73..34c94b537f 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; 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 fc9712f64d..d0a900cb3c 100644 --- a/mutopia/Coriolan/viola-part.ly +++ b/mutopia/Coriolan/viola-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index dead91e2c4..1782486f72 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.3.42"; +\version "1.3.59"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index fe8bcc17a2..76cc3ff3ba 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; violino1 = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index 717263d665..1805dd62ec 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.3.42"; +\version "1.3.59"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index c2ed90d964..a73e30da1a 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; violino2 = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index 5f9bf94ae7..221ea9cc33 100644 --- a/mutopia/Coriolan/violoncello-part.ly +++ b/mutopia/Coriolan/violoncello-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 56a09f2345..8d20f1198c 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; violoncello = \notes \relative c { c1\ff ~ | diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly index 13df9f73f7..82f56b6512 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.3.42"; +\version "1.3.59"; $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.ly b/mutopia/E.Satie/gnossienne-4.ly index 71fb470337..f3a510c59b 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -11,7 +11,7 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.3.42"; +\version "1.3.59"; global = \notes { \key a \minor; diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index e542fcf9c1..f7360334e4 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.42"; +\version "1.3.59"; \include "nederlands.ly" diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly index 803a7d9484..92135491c0 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.3.42"; +\version "1.3.59"; \include "standchen.ly" diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly index 2431ec2414..6e8b094129 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.3.42"; +\version "1.3.59"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index 1e334f5783..a7025e113d 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -41,7 +41,7 @@ multiple \paper{}s in one \score Note: Original key f. %} -\version "1.3.42"; +\version "1.3.59"; vocalVerse = \notes\relative c''{ \property Voice.dynamicDirection=\up @@ -328,7 +328,7 @@ bassThrough = \notes\relative c{ global = \notes{ \time 3/4; - \key es; + \key es \major; \skip 4 * 12; \break \skip 4 * 234; diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index 8928666b3f..e010b894aa 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -7,7 +7,7 @@ metre = "6 6. 8 6. D"; } -\version "1.3.42"; +\version "1.3.59"; sop=\notes \transpose c''{ ees2 ees4 ees4 g2 g2 | c'1. @@ -57,7 +57,7 @@ bass=\notes \transpose c' { global = \notes{ \time 4/2; - \key ees; + \key ees \major; \skip 2*4; \skip 1.; \bar "||"; \skip 2; \skip 2*4; \skip 1.; \bar "||";\break \skip 2; \skip 2*12;\skip 1.; \bar "||";\break diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly index 589c8b63b4..bb01415976 100644 --- a/mutopia/Hymns/laudatedom.ly +++ b/mutopia/Hymns/laudatedom.ly @@ -4,7 +4,7 @@ composer = "Parry"; metre = "10 10 . 11 11"; } -\version "1.3.42"; +\version "1.3.59"; sop = \notes \transpose c''{ f4 | d' bes c' | f2 \bar "||"; @@ -53,7 +53,7 @@ bass = \notes \transpose c'{ global = \notes { \time 3/4; \partial 4; - \key bes; + \key bes \major; } \score { diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly index 4e0aea2199..dd9eb31971 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.3.42"; +\version "1.3.59"; sop=\notes \relative c'' { b2 gis4. a8 |b2 e,2 | @@ -78,7 +78,7 @@ bass=\notes \relative c { global = \notes { \time 2/2; \property Staff.timeSignatureStyle = "C" - \key e; + \key e \major; } $upper_staff = \context Staff = upper { diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index fc4735dcd7..fabe4073af 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -7,7 +7,7 @@ metre = "8 7 8 7 D"; } -\version "1.3.42"; +\version "1.3.59"; sop=\notes \relative c'' { b4 b c d | d c b a | g g a b | b4. a8 a2 | @@ -41,7 +41,7 @@ bass= \notes \relative c' { global=\notes{ \time 4/4; \property Staff.timeSignatureStyle="C" - \key g; + \key g \major; \skip 1*4; \bar "||"; \skip 1*4; \bar "||"; \skip 1*4; \bar "||"; diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly index 0b41a2d486..8e706d195b 100644 --- a/mutopia/Hymns/stille.ly +++ b/mutopia/Hymns/stille.ly @@ -8,7 +8,7 @@ } -\version "1.3.42"; +\version "1.3.59"; %{ Note: there are other verses, but the three here seem to be @@ -18,7 +18,7 @@ global=\notes { \time 6/4; - \key bes; + \key bes \major; \skip 1.*12; \bar "|."; } 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 d1ac8a9ec5..e88e4afdb7 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,12 +4,12 @@ piece = "Allemande"; } -\version "1.3.42"; +\version "1.3.59"; global = \notes{ \time 4/4; \partial 8*3; - \key es; + \key es \major; \skip 1*15; \skip 4*3; \skip 16*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 ca85c32dde..a279987a65 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,11 +10,11 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.3.42"; +\version "1.3.59"; global = \notes{ \time 2/4; - \key es; + \key es \major; s2*48 \bar ":|:"; s2*48 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 037146d7b5..c31dcbc275 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,11 +10,11 @@ copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; global = \notes { \time 4/4; - \key es; + \key es \major; \skip 1*7; \bar "||"; \skip 1*22; diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index 3f8948524f..ca0b53a981 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,6 +1,6 @@ -\version "1.3.42"; +\version "1.3.59"; $global_i = \notes{ \time 12/8; - \key g; + \key g \major; } diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index 4c1f3080aa..cc165b65bb 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.42"; +\version "1.3.59"; $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 552deed2f0..cdb9ef96e1 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.42"; +\version "1.3.59"; \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 868bcf2475..4d10562208 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.42"; +\version "1.3.59"; \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 2181cdf549..e1479f2403 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.42"; +\version "1.3.59"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 396a043f4c..1bbdb808ac 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.42"; +\version "1.3.59"; $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 5cfc445189..28c9e6cb21 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.42"; +\version "1.3.59"; $violino_ii = \notes\relative c''{ R1*8 | @@ -101,4 +101,4 @@ $violino_ii_staff = \context Staff = violino < \$violino_ii \$global_ii > -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index c2e417bd0e..3156a1b6ed 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.42"; +\version "1.3.59"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 1d8068455e..0d42aab083 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.42"; +\version "1.3.59"; % { \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 e194b469ad..56b3a279ff 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.42"; +\version "1.3.59"; % { \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 6a420c3e0b..00237bce7c 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.42"; +\version "1.3.59"; $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 191e097e7e..b8d32cb81f 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.42"; +\version "1.3.59"; $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 b290408a20..59b8371d21 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.42"; +\version "1.3.59"; % { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 7d0341b60d..b2e65c266b 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -44,7 +44,7 @@ Lemoine puts fermatas on ending bar lines everywhere. -\version "1.3.42"; +\version "1.3.59"; lowstaff = \translator "Staff" = "lower" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 599c21b2d1..530557f9d1 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -42,7 +42,7 @@ Old versions of LilyPond include this prelude with dynamics and fingerings. -\version "1.3.42"; +\version "1.3.59"; upper = \context Staff \notes\relative c{ \context Voice=i \property Voice . textStyle = "italic" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 0e5eed7da5..40145117bd 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -45,7 +45,7 @@ note, some have dotted half notes. %} -\version "1.3.42"; +\version "1.3.59"; upper = \notes \transpose c'' { @@ -162,7 +162,7 @@ lower = \notes{ global = \notes{ \time 3/4; - \key es; + \key es \major; } \score{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 7c09bc86c7..4b12ff5ee5 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -31,7 +31,7 @@ } -\version "1.3.42"; +\version "1.3.59"; upper = \context Staff \notes\relative c \context Voice=i { @@ -201,7 +201,7 @@ lower = \context Staff \notes\relative c{ global = \notes{ \time 3/4; - \key f; + \key f \major; } \score{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index fe112bdd32..ddb0f635f6 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -31,7 +31,7 @@ } -\version "1.3.42"; +\version "1.3.59"; @@ -124,7 +124,7 @@ four = \context Staff \notes\relative c{ global = \notes{ \time 4/4; - \key f; + \key f \major; } \score{ 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 1fead8ac0b..c117c81428 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -1,12 +1,12 @@ -\version "1.3.42"; +\version "1.3.59"; \include "allemande-urtext.ly"; allemande_cello_global = \notes{ \time 4/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \partial 16; 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 1076affa1d..39788eb40f 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.3.42"; +\version "1.3.59"; 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 0e1ffaa596..3bb73dc71d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -1,11 +1,11 @@ -\version "1.3.42"; +\version "1.3.59"; \include "allemande-urtext.ly"; allemande_viola_global = \notes{ \time 4/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \partial 16; 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 e4aeb50c91..53aa6f0309 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -1,11 +1,11 @@ -\version "1.3.42"; +\version "1.3.59"; \include "courante-urtext.ly"; courante_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \partial 16; 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 a3fcd4d70b..0d27d057dd 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.3.42"; +\version "1.3.59"; 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 3b901141ef..5bb63c9c8f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "courante-urtext.ly"; courante_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \partial 16; 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 0c58fe97f2..0cab683945 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "gigue-urtext.ly"; gigue_cello_global = \notes{ \time 3/8; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \partial 8; 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 fd68404719..6cf2f6f46e 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.3.42"; +\version "1.3.59"; 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 777524b132..e988b49cba 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -1,12 +1,12 @@ -\version "1.3.42"; +\version "1.3.59"; \include "gigue-urtext.ly"; gigue_viola_global = \notes{ \time 3/8; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \partial 8; 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 d656bbc05c..ea3b68ee7c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "menuetto-urtext.ly"; menuetto_i_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \skip 2.*8; @@ -64,7 +64,7 @@ menuetto_i_cello_staff = \context Staff < menuetto_ii_cello_global = \notes{ \time 3/4; - \key d; + \key d \major; \clef bass; \repeat "volta" 2 { \skip 2.*8; 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 2fa2d5dc0e..8c717afbb1 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.3.42"; +\version "1.3.59"; 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 3c166c43bb..61d0ebc254 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "menuetto-urtext.ly"; menuetto_i_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \skip 2.*8; @@ -64,7 +64,7 @@ menuetto_i_viola_staff = \context Staff < menuetto_ii_viola_global = \notes{ \time 3/4; - \key d; + \key d \major; \clef alto; \repeat "volta" 2 { \skip 2.*8; 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 3679938668..82cb02b163 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "prelude-urtext.ly"; prelude_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \skip 2.*63; \bar "|."; 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 833c019696..7a971639f2 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.3.42"; +\version "1.3.59"; 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 9de8497143..894a1ca908 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "prelude-urtext.ly"; prelude_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \skip 2.*63; \bar "|."; 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 d3e8a6b449..1b3cb39228 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "sarabande-urtext.ly"; sarabande_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { s2.*12 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 714a945536..3a5656491d 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.3.42"; +\version "1.3.59"; 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 63a0fcd712..897411cb12 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -1,10 +1,10 @@ -\version "1.3.42"; +\version "1.3.59"; \include "sarabande-urtext.ly"; sarabande_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { s2.*12 diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 47a19d4b23..a62fc09853 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.3.42"; +\version "1.3.59"; tenor = diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index abf6daf7c9..fe76c48871 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -21,7 +21,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.3.42"; +\version "1.3.59"; dux = \context Voice=two \notes \relative c''{ @@ -165,6 +165,7 @@ bassdux = \context Voice=three \notes \relative c' { \notes \context PianoStaff < \context Staff = treble < \key c \minor; +% \key es \major; \dux { \comes \bar "|."; } \time 4/4; diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index c4562082b2..4d4ae50369 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.3.42"; +\version "1.3.59"; % should do programmable input. soprane = diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index 567669efb3..595bf6afd4 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.3.42"; +\version "1.3.59"; global = \notes { \property StaffGroup.timeSignatureStyle = "old" @@ -231,45 +231,45 @@ bc=\context Staff = bc < \repeat "volta" 2 { - G2 d^"4 3" | G1 | - g2 c4 G | d1^"3 4 3" | - G1 | g2 c4 G | - d1^"3 4 3" | G | - g2 c4 d | G1^"3 4 3" | - c1 | c2 F4 c | - G1^"3 4 3" | c | - c2 F4 c | G1^"3 4 3" | - c2 G | g G | - c4 G d2^"3 4 3" | G g | + g,2 d^"4 3" | g,1 | + g2 c4 g, | d1^"3 4 3" | + g,1 | g2 c4 g, | + d1^"3 4 3" | g, | + g2 c4 d | g,1^"3 4 3" | + c1 | c2 f,4 c | + g,1^"3 4 3" | c | + c2 f,4 c | g,1^"3 4 3" | + c2 g, | g g, | + c4 g, d2^"3 4 3" | g, g | fis g | d1^"3 4 3" | - G2 B | d1^"3 4 3" | - G^"3 4 3" | c4 B c2 | - G1^"3 4 3" | c4 B c g | - c B c G | d1^"3 4 3" | - G1 | + g,2 b, | d1^"3 4 3" | + g,^"3 4 3" | c4 b, c2 | + g,1^"3 4 3" | c4 b, c g | + c b, c g, | d1^"3 4 3" | + g,1 | } \repeat "volta" 2 { g1. | c | f | d^"\\textsharp" | g | c | - A | d^"\\textsharp" | - G | c | + a, | d^"\\textsharp" | + g, | c | d^"\\textsharp" | e | - f | g1 B2 | + f | g1 b,2 | d1.^"3 4 3" | - G1 | + g,1 | } \repeat "volta" 2 { - g2 fis | g G | + g2 fis | g g, | g1^"3 4 3" | c | - G^"3 4 3" | c2 G | - d1^"3 4 3" | G^"3 4 3" | - c2 G | d1^"\\textsharp" ( | + g,^"3 4 3" | c2 g, | + d1^"3 4 3" | g,^"3 4 3" | + c2 g, | d1^"\\textsharp" ( | ) d^"3 4 3" | \cadenzaOn - G\breve + g,\breve } }> diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index e55c4db7ce..d144bcc4f2 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -473,6 +473,13 @@ if 1: conversions.append ((1,3,49), conv, 'noteHeadStyle value: string -> symbol') +if 1: + def conv (str): + str = re.sub (r"""\\key *([a-z]+) *;""", r"""\\key \1 \major;""",str); + return str + conversions.append ((1,3,59), conv, + '\key X ; -> \key X major; ') + ############################