lilypond-1.1.25

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index 6845476a009a0cb43d7bf5e242b077a15056d432..97255bab01dff7509d0b757dd3c3cfbbea03ee1f 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -553,8 +553,10 @@ mudela()(
 Dynamic marks are specified by using an identifier after a note
 without a dash: code(c4 \ff).  Note that this syntax is inconsistent
 with the syntax for other types of ornaments.  The available dynamic
-marks are: code(\ppp), code(\pp), code(\p), code(\mp), code(\mf),
-code(\f), code(\ff), code(\fff), code(\fp), code(sf), and code(\sfz).
+marks are: code(\pppppp), code(\ppppp), code (\pppp), code(\ppp), code(\pp), 
+code(\p), code(\mp), code(\mf), code(\f), code(\ff), code(\fff),
+code(\ffff), code(\fffff), code(\ffffff), 
+code(\fp), code(sf), code(\sff), code(\sp), code(\spp), (\sfz) and code (\rfz).
 
 A crescendo mark is started with code(\cr) and terminated with
 code(\rc).  A decrescendo mark is started with code(\decr) and
@@ -1425,7 +1427,6 @@ COMMENT(
 Mystery properties:
 
 bar-number-engraver.cc:  "barScriptPadding"  vertical space for numbers
-mark-engraver.cc:        "markScriptPadding" vertical space for marks
 span-bar-engraver.cc:    "singleStaffBracket" do single staffs get a bracket?
 bar-column-engraver.cc:  "barColumnPriority"        
 bar-number-engraver.cc:  "barNumberBreakPriority"   Control horizontal ordering
@@ -1450,6 +1451,9 @@ equal to -1.
 dit(code(\f)) Print forte symbol on the preceeding note.
 dit(code(\ff)) Print fortissimo symbol on the preceeding note. 
 dit(code(\fff)) Print fortississimo symbol on preceeding note. 
+dit(code(\ffff)) Print fortissississimo symbol on preceeding note.
+dit(code(\fffff)) Print fffff symbol on preceeding note.
+dit(code(\ffffff)) Print ffffff symbol on preceeding note.
 dit(code(\fp)) Print fortepiano symbol on preceeding note. 
 dit(code(\free)) Used for setting direction setting properties.  Is
 equal to 0.  
@@ -1475,11 +1479,16 @@ has the same key signature.  This sets the Staff.keyoctaviation property.
 dit(code(\p)) Print a piano symbol on preceeding note. 
 dit(code(\pp)) Print pianissimo symbol on preceeding note. 
 dit(code(\ppp)) Print pianississimo symbol on preceeding note. 
+dit(code(\pppp)) Print pianissississimo symbol on preceeding note.
+dit(code(\ppppp)) Print ppppp symbol on preceeding note.
+dir(code(\pppppp)) Print pppppp symbol on preceeding note.
 dit(code(\rc)) Terminate a crescendo. 
 dit(code(\rced)) Terminate a decrescendo
+dit(code(\rfz)) Print a rinforzato symbol on preceeding note.
 dit(code(\right)) Used for setting textalignment property.  Is set to 1.
-dit(code(\sf)) Print a ?? symbol on preceeding note. 
-dit(code(\sfz)) Print a ?? symbol on preceeding note. 
+dit(code(\sf)) Print a subito-forte symbol on preceeding note. 
+dit(code(\sff)) Print a subito-fortissimo symbol on preceeding note.
+dit(code(\sfz)) Print a sforzato symbol on preceeding note. 
 dit(code(\shiftoff)) Disable horizontal shifting of note heads that collide.  
 Sets the Voice.hshift property.
 dit(code(\shifton)) Enable note heads that collide with other note heads
@@ -1490,6 +1499,8 @@ dit(code(\slurdown)) Force slurs to be below notes. This sets the
 Voice.slurydirection property. 
 dit(code(\slurup)) Force slurs to be above notes.  This sets the
 Voice.slurydirection property.  
+dit(code(\sp)) Print a subito-piano symbol on preceeding note.
+dit(code(\spp)) Print a subito-forte symbol on preceeding note.
 dit(code(\specialkey)) Allow keys signatures do differ in different
 octaves.  This sets the Staff.keyoctaviation property.  
 dit(code(\stemboth)) Allow stems, beams, and slurs to point either

diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly
new file mode 100644 (file)
index 0000000..78afbe9
--- /dev/null
+++ b/input/test/tchaikovsky.ly
@@ -0,0 +1,43 @@
+\header{
+filename =     "tchaikovsky.ly";
+title =                "Extracts from 6th symphony";
+subtitle =     "Ist movement";
+composer=      "Pjotr Iljitsj Tchaikovsky";
+enteredby =    "Maarten Storm";
+instrument=    "Violoncello";
+}
+
+\version "1.0.14";
+
+% this is an example of extreme dynamics
+
+% adagio mosso - 7 measures before Allegro vivo
+\score{
+       \notes
+         \relative c{
+               \clef "bass";
+               \key D;
+               <a2\ppp\cr d> <gis\rc\p\decr d'> | <a2\rced d> ~ <a8 d> r8 r4 |
+               a2\ppp\cr a2\rc\p\decr | <a2\rced d> ~ <a8 d> r8 r4 |
+               a2\pppp ~ a8 r8 r4 | a2\ppppp ~ a8 r8 r4 | r4 a8_"pizz"
+               r8 r2^\fermata     
+       }
+       \header{
+       piece="example 1";
+       }
+}
+
+% 8 measures before Andante come prima
+\score{
+       \notes
+       \relative c{
+               \clef "bass";
+               \key C;
+               <e1\sff cis'^\downbow> | <cis\sff a'^\downbow> | 
+               <d,\ffff\decr g> ~ <d2 g> ~ <d8\p\rced g> |
+       }
+       \header{ 
+       piece="example 2";
+       }
+}
+

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index f42a50cfa02e4635c0fdc1c4a814d1636edef3e8..cdc293a5f63dcc8e741c996dd8b6c9500b40af07 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -170,8 +170,7 @@ public:
     for FP, SF, SFZ (FP is *not* louder than FFF)
    */
   enum Loudness {
-    FFF, FF, F, MF, MP, P, PP, PPP, FP, SF, SFZ
-  };
+    FFFFFF, FFFFF, FFFF, FFF, FF, F, MF, MP, P, PP, PPP, PPPP, PPPPP, PPPPPP, FP, SF, SFF, SFZ, SP, SPP, RFZ };
   static String loudness_static_str (Loudness);
   REQUESTMETHODS(Dynamic_req);
 };

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 540bc6b6a07f8dd30f47f3034cd2e515c5300023..a359be8dfd4072c22b5195eeecdded95ee75518d 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -340,6 +340,9 @@ Dynamic_req::loudness_static_str (Loudness l)
 {
   switch (l)
     {
+    case FFFFFF: return "ffffff";
+    case FFFFF : return "fffff";
+    case FFFF: return "ffff";
     case FFF: return "fff";
     case FF: return "ff";
     case F: return "f";
@@ -348,9 +351,17 @@ Dynamic_req::loudness_static_str (Loudness l)
     case P: return "p";
     case PP: return "pp";
     case PPP: return "ppp";
+    case PPPP: return "pppp";
+    case PPPPP: return "ppppp";
+    case PPPPPP: return "pppppp";    
+
     case FP: return "fp";
     case SF: return "sf";
+    case SFF: return "sff";
     case SFZ: return "sfz";
+    case SP: return "sp";
+    case SPP: return "spp";
+    case RFZ: return "rfz";
     }
   return "";
 }

diff --git a/ly/dynamic.ly b/ly/dynamic.ly
index 737a4ffe77a0130087b72d782d11f7e6fbde13c4..68f02880db4034a7ebd55169a73c21cc959a8915 100644 (file)
--- a/ly/dynamic.ly
+++ b/ly/dynamic.ly
@@ -2,18 +2,28 @@
 % declare the standard dynamic identifiers.
 %
 
-ppp = \absdynamic {7 }
-pp = \absdynamic { 6 }
-p = \absdynamic { 5 }
-mp = \absdynamic { 4 }
-mf = \absdynamic { 3 }
-f = \absdynamic { 2 } % f is a notename too.
-ff = \absdynamic { 1 }
-fff = \absdynamic { 0 }
+pppppp = \absdynamic { 13 }
+ppppp = \absdynamic { 12 }
+pppp = \absdynamic { 11 }
+ppp = \absdynamic { 10 }
+pp = \absdynamic { 9 }
+p = \absdynamic { 8 }
+mp = \absdynamic { 7 }
+mf = \absdynamic { 6 }
+f = \absdynamic { 5 } % f is a notename too.
+ff = \absdynamic { 4 }
+fff = \absdynamic { 3 }
+ffff = \absdynamic { 2 }
+fffff = \absdynamic { 1 }
+ffffff = \absdynamic { 0 }
 
-fp = \absdynamic { 8 }
-sf = \absdynamic { 9 }
-sfz = \absdynamic { 10 }
+fp = \absdynamic { 14 }
+sf = \absdynamic { 15 }
+sff = \absdynamic { 16 }
+sfz = \absdynamic { 17 }
+sp = \absdynamic { 18 }
+spp = \absdynamic { 19 }
+rfz = \absdynamic { 20 }
 
 cr = \spandynamic { 1 1 } 
 decr = \spandynamic { -1 1 }

diff --git a/mutopia/L.Mozart/sinfonia.ly b/mutopia/L.Mozart/sinfonia.ly
index 17bc4457e06831cf252ce978701d7e4ab33cb3b1..f7d2ed958985e9ec16c184a30f2f8577188a8be2 100644 (file)
--- a/mutopia/L.Mozart/sinfonia.ly
+++ b/mutopia/L.Mozart/sinfonia.ly
@@ -1,31 +1,3 @@
-       %{
-Dit is de fout:
-
-GNU LilyPond 1.1.19.
-Parsing...[/home/lily/usr/share/lilypond/ly/init.ly[/home/lily/usr/share/lilypond/ly/declarations.ly[/home/lily/usr/share/lilypond/ly/dynamic.ly][/home/lily/usr/share/lilypond/ly/nederlands.ly][/home/lily/usr/share/lilypond/ly/chord-modifiers.ly][/home/lily/usr/share/lilypond/ly/script.ly][/home/lily/usr/share/lilypond/ly/paper20.ly[/home/lily/usr/share/lilypond/ly/table20.ly][/home/lily/usr/share/lilypond/ly/table13.ly][/home/lily/usr/share/lilypond/ly/table16.ly][/home/lily/usr/share/lilypond/ly/params.ly[/home/lily/usr/share/lilypond/ly/a4.ly][/home/lily/usr/share/lilypond/ly/paper.ly][/home/lily/usr/share/lilypond/ly/engraver.ly]]][/home/lily/usr/share/lilypond/ly/midi.ly[/home/lily/usr/share/lilypond/ly/performer.ly]][/home/lily/usr/share/lilypond/ly/property.ly][/home/lily/usr/share/lilypond/scm/lily.scm]][Sinfonia.ly]]
-Interpreting music...[8][16][24][32][40]
-Sinfonia.ly:239:24: warning: barcheck failed by: 1/4:
-       \times 2/3 {[e g fis] |
-                                [e fis g]} | fis4 r |
-
-Sinfonia.ly:87:34: warning: barcheck failed by: 1/4:
-       \times 2/3 {[g'8 b a] [g fis e] |
-                                          [a d, cis] [d cis d] |
-
-Sinfonia.ly:240:25: warning: barcheck failed by: 1/4:
-       \times 2/3 {[e8 g fis] |
-                                 [e fis g]} | fis4 r |
-
-Sinfonia.ly:88:21: warning: barcheck failed by: 1/4:
-       [g, b a] [g fis e] |
-                             [a d, cis] [d cis d]} |
-[48][56][64][72][80][88][96][104][112][120][123]
-time: 24.16 seconds
-Preprocessing elements... lilypond: score-element.cc:134: class
-Paper_def * Score_element::paper() const: Assertion `pscore_l_' failed.
-
-%}
-
 \header{
 filename="Sinfonia.ly";
 title="Sinfonia";
@@ -34,6 +6,7 @@ composer="Leopold Mozart";
 arranger="(1719-1787)";
 copyright="public domain";
 enteredby="Maarten Storm";
+
 }
 
 
@@ -59,11 +32,11 @@ global = \notes{
        s2*5 \break
         s2*5 \break
         s2*5 \break
-       s2*5 \break
         s2*5 \break
         s2*5 \break
        s2*4 \break
        s2*5 \bar ":|";
+
 %fine
 }
 
@@ -74,17 +47,27 @@ tempi = \notes{
 }
 
 dynamics = \notes{
-%      \type Voice=i
+       \type Voice=i
+       s16\f s8. s4 | s2*17
+       s8\p s4. | s8\f s4. | s2*4
+       s8\p s4. | s8\f s4. | s2*29
+       s8\p s4. | s2 |
+       s8\f s4. | s2 | s8\p s4. | s2 | s8\f s4. | s2*47
+       s16 s16\p s4. | s2 |
+       s16 s16\f s4. |
+       s16 s16\p s4. |
+       s16 s16\f s4. | 
 }
 
 
 violinoi = \notes \relative c'{
        \type Voice=i
        \clef "violin";
-       [<g8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
-       [<g,,8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
+       \stemup
+       [<g8 d' b' g'> g'' g g] \stemboth | [g16 a b a] [g a b a] |
+       \stemup [<g,,8 d' b' g'> g'' g g] \stemboth | [g16 a b a] [g a b a] |
 %5     
-       [<g,,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
+       \stemup [<g,,8 d' b' g'> g'' g g] \stemboth | [g16 d c b] [a g fis g] |
        [e' fis g fis] [g e d c] | [b c d c] [d b a g] |
        [e' fis g fis] [g e d c] | [b c d c] [d b a g] |
 %11    
@@ -92,69 +75,82 @@ violinoi = \notes \relative c'{
        [a b c d] [e c b a] | [b c d c] [d b a g] |
 %15    
        [fis g a g] [fis e d c] | [b a g8] r4 |
-       [<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-       [g'8\p d c] [b a g] |  
+       \stemup [<g8 d' b' g'> g'' g g] \stemboth | 
+       \times 2/3 {[g8 d c]} \times 2/3 {[b a g]} |
+       \times 2/3 {[g'8 d c]} \times 2/3 {[b a g]} |  
 %20    
-       [f'\f d c] [b a g]} | 
-       [<c,8 e c' e> e' e e] | <c,2 e c' e> |
-        [<a8 e' cis' a'> a'' a a] |
-       \times 2/3 {[a8 e d] [cis b a] | [a'\p e d] [cis b a] |
+       \times 2/3 {[f' d c]} \times 2/3 {[b a g]} | 
+       \stemup [<c,8 e c' e> e' e e] | <c,2 e c' e> |
+        [<a8 e' cis' a'> a'' a a] \stemboth |
+       \times 2/3 {[a8 e d]} \times 2/3 {[cis b a]} | 
+       \times 2/3 {[a' e d]} \times 2/3 {[cis b a]} |
 %26    
-       [g'\f e d] [cis b a]} | [<d,8 a' fis'> fis' fis fis] |
-       <d,2 a' fis'> | \times 2/3 {[b'8 c d] [e fis g] |
-       [g fis g] [b, a g] | [a b cis] [d e fis] |
+       \times 2/3 {[g' e d] [cis b a]} | 
+       \stemup [<d,8 a' fis'> fis' fis fis] \stemboth|
+       <d,2 a' fis'> | \times 2/3 {[b'8 c d]} \times 2/3 {[e fis g]} |
+       \times 2/3 {[g fis g]} \times 2/3 {[b, a g]} | 
+       \times 2/3 {[a b cis]} \times 2/3 {[d e fis]} |
 %32
-       [fis e fis] [a, g fis] | [g a b] [cis d e] |
-       [e d e] [g, fis e]}
+       \times 2/3 {[fis e fis]} \times 2/3 {[a, g fis]} | 
+       \times 2/3 {[g a b]} \times 2/3 {[cis d e]} |
+       \times 2/3 {[e d e]} \times 2/3 {[g, fis e]} |
 %35
        [fis16 d e d] [e d e d] | [g d e d] [e d e d] |
        [a' d, e d] [e d e d] | [b' d, e d] [e d e d] |
        [cis' a b a] [b a b a] | [d a b a] [b a b a] |
        [e' a, b a] [a b a b] | [fis' a, b a] [a b a b] |
 %43
-       \times 2/3 {[g'8 b a] [g fis e] | [a d, cis] [d cis d] |
-       [g, b a] [g fis e] | [a d, cis] [d cis d]} |
+       \times 2/3 {[g'8 b a]} \times 2/3 {[g fis e]} | 
+       \times 2/3 {[a d, cis]} \times 2/3 {[d cis d]} |
+       \times 2/3 {[g, b a]} \times 2/3 {[g fis e]} | 
+       \times 2/3 {[a d, cis]} \times 2/3 {[d cis d]} |
 %47 
        [b''16 g fis e] [a fis e d] | [g e d cis] [fis d cis b] | gis,2 |
 %50
        a4 g'! | [fis16 fis e d] e4 | d d' | r8 r16 gis,16 a4 |
        r8 [fis g! a] | d,2 
-       [d'8\p e f a,] | [gis a] r4 | 
-       \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
+       [d'8 e f a,] | [gis a] r4 | 
+       \times 2/3 {[f8 e d]} \times 2/3 {[c b a]} | [gis a] r4 |
 %60
-       [c'8\p d e g,?] | [fis g] r4 |
-       \times 2/3 {[d8\f a' c] [b a b]} | [b a] r4 |
+       [c'8 d e g,?] | [fis g] r4 |
+       \times 2/3 {[d8 a' c]} \times 2/3 {[b a b]} | [b a] r4 |
 %64 : reprise
-       [<g,8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
-        [<g,,8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
-        [<g,,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
+       \stemup [<g,8 d' b' g'> g'' g g] | \stemdown [g16 a b a] [g a b a] |
+        \stemup [<g,,8 d' b' g'> g'' g g] | \stemdown [g16 a b a] [g a b a] |
+        \stemup [<g,,8 d' b' g'> g'' g g] | \stemboth [g16 d c b] [a g fis g] |
 %70        
        [e' fis g fis] [g e d c] | [b c d c] [d b a g] |
         [fis g a g] [fis e d c] | [b a g8] r4 |
-        [<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-       [f\f d c] [b a g]} | [e' c] r4 |
+        \stemup [<g8 d' b' g'> g'' g g] \stemboth | 
+       \times 2/3 {[g8 d c]} \times 2/3 {[b a g]} |
+       \times 2/3 {[f d c]} \times 2/3 {[b a g]} | [e' c] r4 |
 %78    
-       [<a8 e' cis' a'> a'' a a] |
-        \times 2/3 {[a8 e d] [cis b a] | 
-        [g e d] [cis b a]} | [fis' d] r4 |     
-       \times 2/3 {[e'8 fis g] [a b c] | [c b c] [e, d c] |
-       [d e fis] [g a b] | [b a b] [d, c b] | [c d e] [fis g a] |
-       [a g a] [c, b a]} |
+       \stemup [<a8 e' cis' a'> a'' a a] \stemboth |
+        \times 2/3 {[a8 e d]} \times 2/3 {[cis b a]} | 
+        \times 2/3 {[g e d]} \times 2/3 {[cis b a]} | [fis' d] r4 |    
+       \times 2/3 {[e'8 fis g]} \times 2/3 {[a b c]} | 
+       \times 2/3 {[c b c]} \times 2/3 {[e, d c]} |
+       \times 2/3 {[d e fis]} \times 2/3 {[g a b]} | 
+       \times 2/3 {[b a b]} \times 2/3 {[d, c b]} | 
+       \times 2/3 {[c d e]} \times 2/3 {[fis g a]} |
+       \times 2/3 {[a g a]} \times 2/3 {[c, b a]} |
 %88
        [b16 g a g] [a g a g] | [c g a g] [a g a g] | [d' g, a g] [a g a g] |
        [e' g, a g] [a g a g] | [fis' d e d] [e d e d] | [g d e d] [e d e d] |
        [a' d, e d] [e d e d] | [b' d, e d] [e d e d] | 
 %96
-       \times 2/3 {[c'8 e, d] [c b a] | [d g, fis] [g fis g] | 
-       [d c' c] [c b a] | [d g, fis] [g fis g]} |
+       \times 2/3 {[c'8 e, d]} \times 2/3 {[c b a]} | 
+       \times 2/3 {[d g, fis]} \times 2/3 {[g fis g]} | 
+       \stemup \times 2/3 {[d c' c]} \times 2/3 {[c b a]} \stemboth | 
+       \times 2/3 {[d g, fis]} \times 2/3 {[g fis g]} |
 %100
        [e'16 c b a] [d b a g] | [c a g fis] [b g fis e] | cis2 | d4 c'! |
-       [b16 b a g] a4 | g g' | 
+       [b16 b a g] a4^\trill | g g' | 
 %106
        r8 r16 cis,, d4 | r8 [b c? d] | [g,16 g'' g g] g4:16 | 
        [fis16 g a g] [fis e d c] | [b g' g g] g4:16 | 
-       [fis16 g a g] [fis e d c] | [b g' g, a] a4 |
-       [b16 g' g, a] a4 | [b16 g' g, a] a4 | [g8 d] g,4 
+       [fis16 g a g] [fis e d c] | [b g' g, a] a4^\trill |
+       [b16 g' g, a] a4^\trill | [b16 g' g, a] a4^\trill | [g8 d] g,4 
 %fine  
 
 }
@@ -162,10 +158,10 @@ violinoi = \notes \relative c'{
 violinoii = \notes \relative c'{
        \type Voice=i
        \clef "violin";
-       [<g8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
-       [<g,8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
+       \stemup [<g8 d' b' g'> g'' g g] \stemboth | [b,16 c d c] [b c d c] |
+       \stemup [<g,8 d' b' g'> g'' g g] \stemboth | [b,16 c d c] [b c d c] |
 %5
-       [<g,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
+       \stemup [<g,8 d' b' g'> g'' g g] \stemboth | [g16 d c b] [a g fis g] |
        [e' fis g fis] [g e d c] | [b c d c] [d b a g] |
        [e' fis g fis] [g e d c] | [b c d c] [d b a g] |
 %11    
@@ -173,68 +169,82 @@ violinoii = \notes \relative c'{
         [a b c d] [e c b a] | [b c d c] [d b a g] |
 %15
         [fis g a g] [fis e d c] | [b a g8] r4 |
-       [<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-       [g'8\p d c] [b a g] | [f'\f d c] [b a g]} |
+       \stemup [<g8 d' b' g'> g'' g g] \stemboth | 
+       \times 2/3 {[g8 d c]} \times 2/3 {[b a g]} |
+       \times 2/3 {[g'8 d c]} \times 2/3 {[b a g]} | 
+       \times 2/3 {[f' d c]} \times 2/3 {[b a g]} |
 %21
-       [<c,8 e c' e> e' e e] | <c,2 e c' e> |
-       [<a8 e' cis' a'> a'' a a] |
-       \times 2/3 {[a8 e d] [cis b a] | [a'\p e d] [cis b a] |
+       \stemup [<c,8 e c' e> e' e e] | <c,2 e c' e> |
+       [<a8 e' cis' a'> a'' a a] \stemboth |
+       \times 2/3 {[a8 e d]} \times 2/3 {[cis b a]} | 
+       \times 2/3 {[a' e d]} \times 2/3 {[cis b a]} |
 %26   
-        [g'\f e d] [cis b a]} | [<d, a' fis'> fis' fis fis] |
-        <d,2 a' fis'> | \times 2/3 {[b'8 c d] [e fis g] |
-        [g fis g] [b, a g] | [a b cis] [d e fis] |
+        \times 2/3 {[g' e d]} \times 2/3 {[cis b a]} | 
+       \stemup [<d, a' fis'> fis' fis fis] \stemboth |
+        <d,2 a' fis'> | \times 2/3 {[b'8 c d]} \times 2/3 {[e fis g]} |
+        \times 2/3 {[g fis g]} \times 2/3 {[b, a g]} | 
+       \times 2/3 {[a b cis]} \times 2/3 {[d e fis]} |
 %32
-        [fis e fis] [a, g fis] | [g a b] [cis d e] |
-        [e d e] [g, fis e]}
+        \times 2/3 {[fis e fis]} \times 2/3 {[a, g fis]} | 
+       \times 2/3 {[g a b]} \times 2/3 {[cis d e]} |
+        \times 2/3 {[e d e]} \times 2/3 {[g, fis e]}
 %35
         [fis16 d e d] [e d e d] | [g d e d] [e d e d] |
         [a' d, e d] [e d e d] | [b' d, e d] [e d e d] |
         [cis' a b a] [b a b a] | [d a b a] [b a b a] |
         [e' a, b a] [a b a b] | [fis' a, b a] [a b a b] |
 %43
-        \times 2/3 {[g'8 b a] [g fis e] | [a d, cis] [d cis d] |
-        [g, b a] [g fis e] | [a d, cis] [d cis d]} |
+        \times 2/3 {[g'8 b a]} \times 2/3 {[g fis e]} | 
+       \times 2/3 {[a d, cis]} \times 2/3 {[d cis d]} |
+        \times 2/3 {[g, b a]} \times 2/3 {[g fis e]} | 
+       \times 2/3 {[a d, cis]} \times 2/3 {[d cis d]} |
 %47
         [b''16 g fis e] [a fis e d] | [g e d cis] [fis d cis b] | gis,2 |
 %50
         a4 g'! | [fis16 fis e d] e4 | d d' | r8 r16 g,16 a4 |
         r8 [fis g! a] | d,2
-       f4\p r8 f | [e-. ~ e-.] r4 |
-       \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
+       f4 r8 f | [e-. ~ e-.] r4 |
+       \times 2/3 {[f8 e d]} \times 2/3 {[c b a]} | [gis a] r4 |
 %60
-       e'4\p r8 e | [d-. ~ d-.] r4 |
-       \times 2/3 {[d8\f a' c] [b a b]} | [b a] r4 |
+       e'4 r8 e | [d-. ~ d-.] r4 |
+       \times 2/3 {[d8 a' c]} \times 2/3 {[b a b]} | [b a] r4 |
 %64 : reprise
-       [<g,8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
-        [<g,8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
-        [<g,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
+       \stemup [<g,8 d' b' g'> g'' g g] \stemboth | [b,16 c d c] [b c d c] |
+        \stemup [<g,8 d' b' g'> g'' g g] \stemboth | [b,16 c d c] [b c d c] |
+        \stemup [<g,8 d' b' g'> g'' g g] \stemboth | [g16 d c b] [a g fis g] |
 %70        
        [e' fis g fis] [g e d c] | [b c d c] [d b a g] |
         [fis g a g] [fis e d c] | [b a g8] r4 |
-        [<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-       [f\f d c] [b a g]} | [e' c] r4 |
+        \stemup [<g8 d' b' g'> g'' g g] \stemboth | 
+       \times 2/3 {[g8 d c]} \times 2/3 {[b a g]} |
+       \times 2/3 {[f d c]} \times 2/3 {[b a g]} | [e' c] r4 |
 %78
-        [<a8 e' cis' a'> a'' a a] |
-        \times 2/3 {[a8 e d] [cis b a] | 
-        [g e d] [cis b a]} | [fis' d] r4 |
-       \times 2/3 {[e'8 fis g] [a b c] | [c b c] [e, d c] |
-        [d e fis] [g a b] | [b a b] [d, c b] | [c d e] [fis g a] |
-        [a g a] [c, b a]} |
+        \stemup [<a8 e' cis' a'> a'' a a] \stemboth |
+        \times 2/3 {[a8 e d]} \times 2/3 {[cis b a]} | 
+        \times 2/3 {[g e d]} \times 2/3 {[cis b a]} | [fis' d] r4 |
+       \times 2/3 {[e'8 fis g]} \times 2/3 {[a b c]} | 
+       \times 2/3 {[c b c]} \times 2/3 {[e, d c]} |
+        \times 2/3 {[d e fis]} \times 2/3 {[g a b]} | 
+       \times 2/3 {[b a b]} \times 2/3 {[d, c b]} | 
+       \times 2/3 {[c d e]} \times 2/3 {[fis g a]} |
+        \times 2/3 {[a g a]} \times 2/3 {[c, b a]} |
 %88
         [b16 g a g] [a g a g] | [c g a g] [a g a g] | [d' g, a g] [a g a g] |
         [e' g, a g] [a g a g] | [fis' d e d] [e d e d] | [g d e d] [e d e d] |
         [a' d, e d] [e d e d] | [b' d, e d] [e d e d] |
 %96
-        \times 2/3 {[c'8 e, d] [c b a] | [d g, fis] [g fis g] |
-        [d c' c] [c b a] | [d g, fis] [g fis g]} |
+        \times 2/3 {[c'8 e, d]} \times 2/3 {[c b a]} | 
+       \times 2/3 {[d g, fis]} \times 2/3 {[g fis g]} |
+        \stemup \times 2/3 {[d c' c]} \times 2/3 {[c b a]} \stemboth | 
+       \times 2/3 {[d g, fis]} \times 2/3 {[g fis g]} |
 %100
         [e'16 c b a] [d b a g] | [c a g fis] [b g fis e] | cis2 | d4 c'! |
-        [b16 b a g] a4 | g g' |
+        [b16 b a g] a4^\trill | g g' |
 %106
         r8 r16 cis,, d4 | r8 [b c? d] | [g,16 g'' g g] g4:16 |
         [fis16 g a g] [fis e d c] | [b g' g g] g4:16 |
-        [fis16 g a g] [fis e d c] | [b g' g, a] a4 |
-        [b16 g' g, a] a4 | [b16 g' g, a] a4 | [g8 d] g,4
+        [fis16 g a g] [fis e d c] | [b g' g, a] a4^\trill |
+        [b16 g' g, a] a4^\trill | [b16 g' g, a] a4^\trill | [g8 d] g,4
 %fine
 
 }
@@ -256,22 +266,22 @@ viola = \notes \relative c'{
        [e16 f? g f] [e f g f] | [g8 e e d] |
        [cis16 d e d] [cis d e d] | cis4 r | 
 %25
-       e\p e | e\f e | [fis16 g a g] [fis g a g] | 
-       [fis8 fis a a] | d4 b | b g' | cis,? a |
+       e e | e e | [fis16 g a g] [fis g a g] | 
+       [fis8 fis a a] | d,4 b | b g' | cis,? a |
        a fis' b, g' | a a, |
 %35
        [a8 fis' fis fis] | r [g g g] | r [a a a] |
        r [b, b b] | r [cis cis cis] | r [d d d] | r [e e e] |
        r [fis fis fis] |
 %43
-       \times 2/3 {[e g fis] | [e fis g]} | fis4 r |
-       \times 2/3 {[e8 g fis] | [e fis g]} | fis4 r |
+       \times 2/3 {[e g fis]} \times 2/3 {[e fis g]} | fis4 r |
+       \times 2/3 {[e8 g fis]} \times 2/3 {[e fis g]} | fis4 r |
 %47
        [d8 g d fis] | r [e a, d] | r b [b cis16 d] |
        [e8 d e cis] | [d d d cis] | d4 d' | r8 r16 gis, a4 |
        r8 [fis8 g! a] | d,2  
-       [d8\p d d d] | [d c!] r4 |
-       \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
+       [d8 d d d] | [d c!] r4 |
+       \times 2/3 {[f8 e d]} \times 2/3 {[c b a]} | [gis a] r4 |
 %60
        [c8\p c c c] | [c b] r4 | [a8 fis e g] | [g fis] r4 |
 %64 : reprise
@@ -290,10 +300,11 @@ viola = \notes \relative c'{
        [d8 b b b] | r [c c c] | r [d d d] | r [e e e] | r [fis fis fis] |
        r [g g g] | r [a a a] | r [b b b] | 
 %96
-       \times 2/3 {[a c b] [a b c]} | b4 r | \times 2/3 {[a,8 a g] [a b c]} |
+       \times 2/3 {[a c b]} \times 2/3 {[a b c]} | b4 r | 
+       \times 2/3 {[a,8 a g]} \times 2/3 {[a b c]} |
        b4 r | [g8 c g b] | r [a' d, g] | r e [e fis16 g] | [a8 g a fis] |
 %104
-       g8 g4 fis8 | g4 g | r8 r16 cis, d4 | r8 [b c! d] | [g, b d e] | 
+       g8 g4 fis8 | g4 g | r8 r16 cis, d4 | r8 [b c? d] | [g, b d e] | 
        [a, a a' a] | [d, b d e] | [a, a a' a] | [d, d e d] | [d d e d] | 
        [d g g fis] | [g d] g,4
 %fine 
@@ -307,11 +318,11 @@ bassocontinuo = \notes \relative c'{
        [g16 a b a] [g a b a] | [g8 g, g g'] | 
 %5
        [g16 a b a] [g a b a] | [g8 g,] r4 |
-       [c'8 c,] [e_"6" fis_"6"_"5" | [g g g b,_"6"] |
-       [c c] [e_"6" fis_"6"_"5" | [g g b_"6" c] |
+       [c'8 c,] [e fis] | [g g g b,] |
+       [c c] [e fis] | [g g b c] |
 %11
-       [d d d c_"2"] | [b_"6" b b b] | [fis_"6"_"5" fis fis fis] |
-       [g g b_"6" c] | [d fis,_"6"_"5" fis fis] | [g16 g fis e] [d c b a] |
+       [d d d c] | [b b b b] | [fis fis fis fis] |
+       [g g b c] | [d fis, fis fis] | [g16 g fis e] [d c b a] |
 %17
        [g g' b a] [g a b a] | g4 r | b, b | b b |
 %21
@@ -327,7 +338,7 @@ bassocontinuo = \notes \relative c'{
        g8 r fis r | e r d r | r [e e d] | [cis b cis a] | [d fis g a] |
        d,4 d' | r8 r16 gis, a4 | r8 [fis g! a] | d,2 
        r2 | r |
-       \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
+       \times 2/3 {[f8 e d]} \times 2/3 {[c b a]} | [gis a] r4 |
 %60
        r2 | r |
        [f'8 d g g,] | [d' d'] [d16 c b a] |
@@ -336,19 +347,19 @@ bassocontinuo = \notes \relative c'{
         [g16 a b a] [g a b a] | [g8 g, g g'] |
 %68
         [g16 a b a] [g a b a] | g4 r |
-       [c8 c,] [e fis] | [g g b c] | [e fis fis fis] |
+       [c8 c,] [e fis] | [g g b, c] | [e fis fis fis] |
 %73
        [g16 g, a b] [c d e fis] | [g a b a] [g a b a] | g4 r |
        b, b | [c8 c'16 d] [e d cis b] | [a b cis b] [a b cis b] |
 %79
        a4 r | cis,4 cis | [d8 d'16 e] [d8 b] | 
-       c?4 c | a a | b b | g g | a a | fis fis | g2:8 | a2:8 |
+       c4 c | a a | b b | g g | a a | fis fis | g2:8 | a2:8 |
 %90
        [b8 b, b b] | c2:8 | d2:8 | e2:8 | fis2:8 | g2:8 | 
        fis4 fis | g r | fis fis | g r | c8 r b r | a r g r |
        r [a a g] | [fis e fis d] | [g, b c d] | g,4 g' |
 %106
-       r8 r16 cis, d4 | r8 [b c! d] | [g, g' b c] | [d fis, fis fis] |
+       r8 r16 cis, d4 | r8 [b c? d] | [g, g' b c] | [d fis, fis fis] |
        [g g, b c] | [d fis fis fis] | [g b, c d] | [g, b c d] | 
        [g, b c d] | [g d] g,4
 %fine
@@ -357,17 +368,18 @@ bassocontinuo = \notes \relative c'{
 
 \score{
         \type StaffGroup <
-                \type Staff = i < \tempi \global \dynamics \violinoi >
+                \type Staff = i < %\tempi 
+                                       \global \dynamics \violinoi >
                 \type Staff = ii < \global \dynamics \violinoii >
                 \type Staff = iii < \global \dynamics \viola >
                 \type Staff = iv < \global \dynamics \bassocontinuo >
         >
-        \paper{
-          %      \translator { \OrchestralScoreContext }
-        }
+        \header{
+               piece="I. Allegro";
+       }
+       \paper{
+                \translator { \OrchestralScoreContext }
+       }
         \midi{ \tempo 4 = 100; }
 }
 
-
-
-