working

diff --git a/arrays/i-4.md b/arrays/i-4.md
index 7af78a8d07cba0abad2f38141a58344ba4593fac..42bb089e841495cb52b4c217c8bcdcb46d6a38eb 100644 (file)
--- a/arrays/i-4.md
+++ b/arrays/i-4.md
@@ -5,18 +5,18 @@
 |  2e974  |   16    |  30t85  |   27    |  41e96  |   38    |  520t7  |   49    |
 |   05    |  42e97  |   16    |  530t8  |   27    |  641e9  |   38    |  7520t  |
 |         |         |         |         |         |         |         |         |
-|  (38)   |  (37)   |  (37)   |  (48)   |  (48)   |  (28)   |  (28)   |  (58)   |
+|  (34)   |  (34)   |  (34)   |  (24)   |  (24)   |  (23)   |  (23)   |  (14)   |
 
 | 1765432 | 1765432 | 1765432 | 1765432 | 1765432 | 1765432 | 1765432 | 1765432 |
 | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: |
 | 31e86   | 5t      | 42097   | 6e      | 531t8   | 70      | 642e9   | 81      |
 | 49      | 631e8   | 5t      | 74209   | 6e      | 8531t   | 70      | 9642e   |
 |         |         |         |         |         |         |         |         |
-| (58)    | (25)    | (25)    | (27)    | (27)    | (24)    | (24)    | (49)    |
+| (14)    | (13)    | (13)    | (12)    | (12)    | (12)    | (12)    | (23)    |
 
 | 7654321 | 7654321 | 7654321 | 7654321 | 7654321 | 7654321 | 7654321 | 7654321 |
 | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: |
-| 7530t   | 92      | 8641e   | t3      | 97520   | e4      | t8631   | ---     |
-| 18      | 7530t   | 29      | 8641e   | 3t      | 97520   | e4      | ---     |
+| 7530t   | 92      | 8641e   | t3      | 97520   | e4      | t8631   | 50      |
+| 18      | 7530t   | 29      | 8641e   | 3t      | 97520   | 4e      | t8631   |
 |         |         |         |         |         |         |         |         |
-| (49)    | (17)    | (17)    | (13)    | (13)    | (58)    | (58)    |         |
+| (23)    | (14)    | (14)    | (24)    | (24)    | (13)    | (13)    | (34)    |

diff --git a/lilypond-files/eng-files/pp-document-structure.ly b/lilypond-files/eng-files/pp-document-structure.ly
index 6b68f9919ed86b18c108905e23af579fb42fcf61..bb564030f223b32ec21f653716c7dbe7697d96a3 100644 (file)
--- a/lilypond-files/eng-files/pp-document-structure.ly
+++ b/lilypond-files/eng-files/pp-document-structure.ly
@@ -68,7 +68,7 @@
                                         >>
                                 }
                 >>
-                \midi { }
+                %\midi { }
                 \layout {
                         \context {
                                 \Score
@@ -108,7 +108,7 @@
                                 >>
                         }
                 >>
-                \midi { }
+                %\midi { }
                 \layout {
                         \context {
                                 \Score

diff --git a/lilypond-files/eng-files/pp-variables.ly b/lilypond-files/eng-files/pp-variables.ly
index 4996e0456ca2d411461b25332d3a4df997795aaf..47261ba12d89feaa11e739ad5482026819ca4ddb 100644 (file)
--- a/lilypond-files/eng-files/pp-variables.ly
+++ b/lilypond-files/eng-files/pp-variables.ly
@@ -16,7 +16,7 @@ tmarkione = \tempo "Molto rubato"
 tmarksev = \tempo "Poco rubato" 4 = 46-52
 tmarktfour = \tempo "Tempo giusto" 4 = 60
 tmarktthree = \tempo "Presto" 4 = 165
-tmarktwo = \tempo "Moderato" 4. = 72
+tmarktwo = \tempo "Allegro moderato" 4 = 103
 bh = \break
 ds = #2.5
 sods = #3.4

diff --git a/lilypond-files/manuscripts/pp-i4.ly b/lilypond-files/manuscripts/pp-i4.ly
index a0ddc2bce193a9578a3639ef84fd4322f2593348..4c702e231b67dc8f06008106305b123b4bc57f5a 100644 (file)
--- a/lilypond-files/manuscripts/pp-i4.ly
+++ b/lilypond-files/manuscripts/pp-i4.ly
@@ -1,54 +1,26 @@
 \version "2.22.2"
 
 voiceAfour = { \tmarktwo
-\time 9/8 d''4. \pitchedTrill b4\startTrillSpan_( a a8\stopTrillSpan_) g8[ r8 e8~] | %1
-e8[ r8 cis'8~] cis4. fis4. | %2
-ees8-. r8 r8 c8-. bes8-. aes8(~ aes4 f8-.) | %3
-r4. d'4.~ d8 g4 | %4
-e8-. r8 r8 r16 cis16 \pitchedTrill b4\startTrillSpan( a a8-.)[\stopTrillSpan r8 fis8~] | %5
-fis8 dis'4~ dis4.~ dis8 gis4 | %6
-f4. d8. c16 bes8-. r8 r8 g8-. | %7
-r4. r8 e'4~ e8 a4~ | %8
-a4.~ a8 r16 dis,16( \tuplet 3/2 { cis16 b16 cis16} b8-.)[ r16 gis16-. fis8~] | %9
-fis8 f4~ f8 bes4~ bes4.~ | %10
-bes8 r16 e16( \tuplet 3/2 { d16 e d } c8~ c8. a16 g4.) | %11
-r8 fis4~ fis4. b4.~ | %12
-b4. \tuplet 3/2 { r16 f'16( ees16 } des32 ees32 des8. r16 bes16 aes32 bes32 aes8.~ |%13
-aes8 g4 c2. | %14
-r8 r16 fis16-. e16-. d16-. r4. \tuplet 3/2 { b16( a16 b16 } a4~) | %15
-a8 r8 r8 aes4.~ aes4 des8 | %16
-s4. s4. s4. | %17
-a2. d4. | %18
-s4. s4. s4. | %19
-bes4 ees8~ ees2. | %20
-s4. s4. s4. | %21
-r4. r8 b4~ b8 e4 | %22
-s4. s4. s4. \bar "|." %23
+\time 4/4 d''2 \tuplet 3/2 { r16 b16_( a16 } g16 a16 g8_) e'8~ |
+e2 cis4-> fis4-> |
+ees2 r32 c32( bes32 c32 bes16 aes16-.) r8 f'8~ |
+f4 d2-> g4-> |
+e4~ e16 cis( b a b a16-.) r8 r16 fis'16-. r8 |
+r4 dis4-> gis2-> |
+f4. \tuplet 3/2 { d16( c16 bes16-.) } r8 g'8~ g4 |
+e2.-> a4-> |
+r8 dis,8-. cis8-. b-.
 }
 
 
 voiceBfour = { \tmarktwo
-\time 9/8 r8 r8 c8~ c4.~ c8 f4 | %1
-e8( d8-.) r8 b8-. a8-. g8~ g4.~ | %2
-g8[ r8 des'8~] des4. ges4. | %3
-\pitchedTrill f4\startTrillSpan( ees ees8-.)\stopTrillSpan r8 r8 c16 bes16 aes4. | %4
-r4. d4.~ d8 g4 | %5
-fis16( e16-.) r8 r8 \pitchedTrill cis4\startTrillSpan( b b8\stopTrillSpan a8-.) r8 r8 | %6
-r8 ees'4~ ees4.~ ees8 aes4 | %7
-\pitchedTrill g4.\startTrillSpan( f f8.)\stopTrillSpan d16( \tuplet 3/2 { c16 bes16 c16 } bes4.~ | %8
-bes4.~ bes8) e4~ e8 a4 | %9
-fis8. dis16( cis8 b8-.) r8 r8 gis4.~ | %10
-gis8 f4~ f8 bes4~ bes4. | %11
-g'4.~ g16 e16( d8 c8~ c4 a8-.) | %12
-r8 fis4~ fis4. b4. | %13
-aes'8-. \tuplet 3/2 { r16 f16( ees } des32 ees des16~ des4. bes4.~ | %14
-bes8) g4 c2. | %15
-s4. s4. s4. | %16
-s4. aes4.~ aes4 des8 | %17
-s4. s4. s4. | %18
-a2. d4. | %19
-s4. s4. s4. | %20
-bes4 ees8~ ees2. | %21
-s4. s4. s4. | %22
-r4. r8 b4~ b8 e4 \bar "|."
+\time 4/4 r2 c4-> f4-> |
+e4.( d8-.) \tuplet 3/2 { r16 b16( a16 } g16 a16 g4~ |
+g2) des'4-> ges4-> |
+f8( ees8~ ees4) r32 c32( bes32 c32 bes16 aes16-.) r4 |
+r4 d2-> g4-> |
+fis16( e8.~ e16) cis( b a b a16-.) r8 r4 |
+r4 ees'4-> aes2-> |
+\acciaccatura g8 f4. \tuplet 3/2 { d16( c16 bes16-.) } r2 |
+e2.-> a4-> |
 }