organize

diff --git a/general/scoreLayout.ly b/general/scoreLayout.ly
index a7a50b731f1f403738b7b838adcfcb0a4af2c038..0a86efd2002a7d8790df49912eb8355b29feb13e 100644 (file)
--- a/general/scoreLayout.ly
+++ b/general/scoreLayout.ly
@@ -31,13 +31,13 @@
     \romanStringNumbers
     \override TupletNumber.layer = 4
     \override TupletNumber.font-shape = #'upright
     \romanStringNumbers
     \override TupletNumber.layer = 4
     \override TupletNumber.font-shape = #'upright

-    centerBarNumbers = ##t
-    barNumberVisibility = #all-bar-numbers-visible
+    %centerBarNumbers = ##t
+    %barNumberVisibility = #all-bar-numbers-visible

     rehearsalMarkFormatter = #rounded-measure-number-mark
     \override RehearsalMark.break-visibility = #(vector #f #t #t)
     \override SectionLabel.break-visibility = #(vector #f #t #t)
     rehearsalMarkFormatter = #rounded-measure-number-mark
     \override RehearsalMark.break-visibility = #(vector #f #t #t)
     \override SectionLabel.break-visibility = #(vector #f #t #t)

-    \override CenteredBarNumber.stencil = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print)
-    \override CenteredBarNumberLineSpanner.direction = #DOWN
+    %\override CenteredBarNumber.stencil = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print)
+    %\override CenteredBarNumberLineSpanner.direction = #DOWN

     \remove Text_mark_engraver
     \remove Mark_engraver
     \remove Metronome_mark_engraver
     \remove Text_mark_engraver
     \remove Mark_engraver
     \remove Metronome_mark_engraver

diff --git a/manuscripts/cello.ly b/manuscripts/cello.ly
index 8be9129f7034c4495e3a695d44ceac2528cbdfb9..fa1364ff3c74e61caece6249f7e87d8490cb8f54 100644 (file)
--- a/manuscripts/cello.ly
+++ b/manuscripts/cello.ly
@@ -1,6 +1,9 @@
 % root = ../string-quartet.ly
 celloMusic =
 \relative {
 % root = ../string-quartet.ly
 celloMusic =
 \relative {

+  \override Staff.TrillPitchHead.stencil = #(lambda (grob)
+    (grob-interpret-markup grob
+      #{ \markup \musicglyph #"noteheads.s0harmonic" #}))

   \set harmonicDots = ##t
   \tag #'part { \compressEmptyMeasures }
   \clef bass
   \set harmonicDots = ##t
   \tag #'part { \compressEmptyMeasures }
   \clef bass


@@ -44,7 +47,26 @@ celloMusic =
   d8\harmonic <gis, cis\harmonic>4.\stopTrillSpan e'2\1\harmonic r8 e8(
   gis,8.) g16~->\mf\< g4~ g16 d'8.~-> d4~ |
   d16 ees8.~ ees2~ ees16 bes'8.(->\f |
   d8\harmonic <gis, cis\harmonic>4.\stopTrillSpan e'2\1\harmonic r8 e8(
   gis,8.) g16~->\mf\< g4~ g16 d'8.~-> d4~ |
   d16 ees8.~ ees2~ ees16 bes'8.(->\f |

-  g8.)
+  g16) g16 g8~ g2~ g8. bes,16 |
+  bes16 bes8.~ bes8. b16 b16 b8.~ b16 c16 c16 c16~ |
+  c8. dis16~ dis4~ dis8. \pitchedTrill ais16~\startTrillSpan dis! ais4~ |
+  ais16 b8.~\stopTrillSpan b2~ b16 fis'8. |
+  r16 <b, e\harmonic>8. \pitchedTrill b4~\startTrillSpan fis' b8 <g c\harmonic>8~\stopTrillSpan <g c\harmonic>4~ |
+  <g c\harmonic>8 \pitchedTrill d'8~\startTrillSpan g d2 |
+  r8.\stopTrillSpan cis16 cis16 cis8.~ cis16 gis'16 gis16 gis16 \tuplet 3/2 { gis8 gis8 gis8~ }
+  gis4~ gis16 a16 a16 a16 \tuplet 3/2 { a8 a8 a8 } r16 e16\harmonic e16\harmonic e16~\harmonic |
+  e16\harmonic d8.\harmonic \pitchedTrill a2.\startTrillSpan e' |
+  <f bes\harmonic>4.\stopTrillSpan \pitchedTrill c'8~\startTrillSpan f c2 |
+  r8.\stopTrillSpan <fis, b\harmonic>16~ <fis b\harmonic>2~ <fis b\harmonic>8. <fis cis'\harmonic>16~ |
+  <fis cis'\harmonic>4~ <fis cis'\harmonic>8. <g d'\harmonic>16~ <g d'\harmonic>4~ <g d'\harmonic>16 \pitchedTrill d'8.\startTrillSpan a' r4\stopTrillSpan
+  r8. g,16~\harmonic g8~\harmonic <g\harmonic d'\harmonic>8~ <g\harmonic d'\harmonic>4~ <g\harmonic d'\harmonic>8 \clef tenor <ees' bes'\harmonic>8~ |
+  <ees bes'\harmonic>2~ <ees bes'\harmonic>8 \pitchedTrill bes'4.\startTrillSpan f' \clef bass |
+  r8\stopTrillSpan cis,8( d16 bes a bes |
+  a f8) aes16-. aes16-. aes16-. aes8-. r8. e'16-. e16-. e16-. e16-. e16-. |
+  r16 <gis, dis'\harmonic>8.~ <gis dis'\harmonic>2~ <gis dis'\harmonic>16 <b e\harmonic>8.~ |
+  <b e\harmonic>2. |
+  r8. <gis des'\harmonic>16~ <gis des'\harmonic>4~ <gis des'\harmonic>8. <b e\harmonic>16~ <b e\harmonic>4~ |
+  <b e\harmonic>16 \pitchedTrill c8.\startTrillSpan f <c g'\harmonic>2.\stopTrillSpan |

 }
 \addQuote "cello" { \removeWithTag #'score \celloMusic }
 
 }
 \addQuote "cello" { \removeWithTag #'score \celloMusic }
 

diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly
index a2dab6e159be159d9f4022caccc18059b0ea97d2..b5b6ba1c130f41dba08e5c4dc35053ccca66e427 100644 (file)
--- a/manuscripts/tempoMap.ly
+++ b/manuscripts/tempoMap.ly
@@ -5,7 +5,7 @@ tempoMap =
   \remove Clef_engraver
 }
 {
   \remove Clef_engraver
 }
 {

-  \tempo "Lontano" 4=64
+  \tempo "Lontano" 4=72

   \time 4/4 s1*5 |
   \time 5/4 s1*5/4 |
   \time 4/4 s1*2 |
   \time 4/4 s1*5 |
   \time 5/4 s1*5/4 |
   \time 4/4 s1*2 |


@@ -22,6 +22,17 @@ tempoMap =
   \time 2/4 s1*2/4 |
   \time 4/4 s1 |
   \time 5/4 s1*5/4 |
   \time 2/4 s1*2/4 |
   \time 4/4 s1 |
   \time 5/4 s1*5/4 |

+  \time 4/4 s1*6 |
+  \timeSpanner "accel." s1\startTextSpan |
+  \time 3/4 s1*3/4 |

   \time 4/4 s1*3 |
   \time 4/4 s1*3 |

-
+  s2 s4 s8 s8\stopTextSpan \bar "||"
+  \tempo "Piu Mosso" 4=108
+  s1 |
+  \time 5/4 s1*5/4 |
+  \time 4/4 s1*2 |
+  \time 2/4 s1*2/4 |
+  \time 4/4 s1*2 |
+  \time 3/4 s1*3/4 |
+  \time 4/4 s1*2 |

 }
 }

diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly
index 18076165ebf5051d15248571add6d7e3a40355f7..c62146d5153e253a35bb327fdd369c3dad7fc0fd 100644 (file)
--- a/manuscripts/viola.ly
+++ b/manuscripts/viola.ly
@@ -1,6 +1,9 @@
 % root = ../string-quartet.ly
 violaMusic =
 \relative {
 % root = ../string-quartet.ly
 violaMusic =
 \relative {

+  \override Staff.TrillPitchHead.stencil = #(lambda (grob)
+    (grob-interpret-markup grob
+      #{ \markup \musicglyph #"noteheads.s0harmonic" #}))

   \set harmonicDots = ##t
   \tag #'part { \compressEmptyMeasures }
   \clef alto
   \set harmonicDots = ##t
   \tag #'part { \compressEmptyMeasures }
   \clef alto


@@ -42,8 +45,30 @@ violaMusic =
   <g c\harmonic>8 <gis cis\harmonic>8~\stopTrillSpan
   <gis cis\harmonic>4 d''2~\harmonic\1 d2\harmonic |
   r8. c,16~\harmonic\3 c2~\harmonic c8.\harmonic g'16~\harmonic\2 |
   <g c\harmonic>8 <gis cis\harmonic>8~\stopTrillSpan
   <gis cis\harmonic>4 d''2~\harmonic\1 d2\harmonic |
   r8. c,16~\harmonic\3 c2~\harmonic c8.\harmonic g'16~\harmonic\2 |

-  g4~\harmonic g16\harmonic <ees aes\harmonic>8.\startTrillSpan <ees bes'\harmonic>2~\stopTrillSpan |
-  <ees bes'\harmonic>8.
+  g4~\harmonic g16\harmonic <ees aes\harmonic>8.\startTrillSpan <ees bes'\harmonic>2\stopTrillSpan |
+  r8. <ees aes\harmonic>16~ <ees aes\harmonic>4~ <ees aes\harmonic>16 \pitchedTrill ees8.~\startTrillSpan bes' ees4~ |
+  ees16 b8.~\stopTrillSpan b2~ b16 c8. |
+  ees,16 ees16 ees8~ ees4~ ees16 bes'16 bes16 bes16~ bes4~ |
+  bes4~ bes16 b16 b16 b16 fis'16 fis16 fis8~ fis4 |
+  r16 <b, e\harmonic>8.~ <b e\harmonic>2~ <b e\harmonic>16 <b fis'\harmonic>8. |
+  c4.\harmonic\3 a'4.~\harmonic\2 |
+  16 cis,16 cis16 cis16 \tuplet 3/2 { cis8 cis8 cis8~ } cis4~ cis8. gis'16 |
+  gis16 gis8.~ gis8. a16 a16 a16 e'16 e16 \tuplet 3/2 { e8 e8 e8 } |
+  r16 <a,, d\harmonic>8. <a d\harmonic>4~ <a d\harmonic>16 <a e'\harmonic>8. <bes f'\harmonic>4~ |
+  <bes f'\harmonic>2 \pitchedTrill f'2\startTrillSpan c' |
+  r8\stopTrillSpan <b, fis'\harmonic>16 <b fis'\harmonic>16 \tuplet 3/2 { <b fis'\harmonic>8 <b fis'\harmonic>8 <b fis'\harmonic>8~ }
+  <b fis'\harmonic>8. <fis' cis'\harmonic>16 <fis cis'\harmonic>16 <fis cis'\harmonic>16 <fis cis'\harmonic>8~ |
+  <fis cis'\harmonic>16 <g d'\harmonic>16 <g d'\harmonic>16 <g d'\harmonic>16 \tuplet 3/2 { <d' a'\harmonic>8 <d a'\harmonic>8 <d a'\harmonic>8~ }
+  <d a'\harmonic>2 <d,~ cis'>4 |
+  <d a'>8. g16\harmonic~ g4~\harmonic g16\harmonic g8.\harmonic <bes, ees\harmonic>4~ |
+  <bes ees\harmonic>4 <f' bes\harmonic>2.~ |
+  <f bes\harmonic>4~ <f bes\harmonic>8 r8
+  r8. <gis cis\harmonic>16-. <gis cis\harmonic>16-. <gis cis\harmonic>16-. <gis cis\harmonic>8~ <gis cis\harmonic>4
+  <gis cis\harmonic>16-. <gis cis\harmonic>16-. <gis cis\harmonic>16-. e'16~\harmonic |
+  e4~\harmonic e16\harmonic <gis, dis'\harmonic>8.~ <gis dis'\harmonic>4~ <gis dis'\harmonic>16 <e b'\harmonic>8.~ |
+  <e b'\harmonic>4 r4 r4 |
+  r8. <gis, dis'\harmonic>16~ <gis dis'\harmonic>8 <b e\harmonic>8~ <b e\harmonic>4 <c f\harmonic>4~ |
+  <c f\harmonic>2 <g' c\harmonic>2 |

 }
 
 violaStaff =
 }
 
 violaStaff =

diff --git a/manuscripts/violin1.ly b/manuscripts/violin1.ly
index 86098be0d1579be04f7753dde742e7d88ac39787..d8b040f4c8f13f854a98d9587fb6ae883a1e6e60 100644 (file)
--- a/manuscripts/violin1.ly
+++ b/manuscripts/violin1.ly
@@ -43,9 +43,32 @@ violinOneMusic =
   <d a'\harmonic>2~\startTrillSpan
   <d a'\harmonic>2\stopTrillSpan
   r8. <g c\harmonic>16~\mf <g c\harmonic>2~ <g c\harmonic>8. <d g\harmonic>16~\startTrillSpan |
   <d a'\harmonic>2~\startTrillSpan
   <d a'\harmonic>2\stopTrillSpan
   r8. <g c\harmonic>16~\mf <g c\harmonic>2~ <g c\harmonic>8. <d g\harmonic>16~\startTrillSpan |

-  <d g\harmonic>4~ <d g\harmonic>8.\stopTrillSpan <ees aes\harmonic>16~ <ees aes\harmonic>4~ <ees aes\harmonic>16 <ees bes'\harmonic>8.~ |
-  8.
-
+  <d g\harmonic>4~ <d g\harmonic>8.\stopTrillSpan <ees aes\harmonic>16~ <ees aes\harmonic>4~ <ees aes\harmonic>16 <ees bes'\harmonic>8. |
+  r8. <ees aes\harmonic>16~ <ees aes\harmonic>4~ <ees aes\harmonic>16 <ees bes'\harmonic>8.~ <ees bes'\harmonic>4~ |
+  \override Staff.TrillPitchHead.stencil = #(lambda (grob)
+    (grob-interpret-markup grob
+      #{ \markup \musicglyph #"noteheads.s0harmonic" #}))
+  <ees bes'\harmonic>4~ <ees bes'\harmonic>16 \pitchedTrill b8.\startTrillSpan fis' <c f\harmonic>2\stopTrillSpan |
+  r8. ees16~ 4~ 8. bes16~ bes4~ |
+  4~ 8. b16~ 4~ 16 fis'8. |
+  b,16 b16 b8 fis'16 fis16 fis8~ fis4 g16 g16 g8~ |
+  g8 d'16 d16 d2 |
+  r8. <cis, fis\harmonic>16~ <cis fis\harmonic>4~  <cis fis\harmonic>16 \pitchedTrill cis8.~\startTrillSpan gis' cis4~ |
+  cis16 a'8.~\harmonic\stopTrillSpan\3  a2~\harmonic a16\harmonic \pitchedTrill a8.\startTrillSpan e' |
+  a16\stopTrillSpan a16 a8 e'16 e16 \tuplet 3/2 { e8 e16~ e16 e8 } f16 f16 \tuplet 3/2 { f8 f8 f8~ } |
+  f4. c'16 c16 \tuplet 3/2 { c8 c8 c8~ } c8 fis,8~ |
+  fis8. <b,, fis'\harmonic>16 <b fis'\harmonic>16 <b fis'\harmonic>16 <b fis'\harmonic>8 \tuplet 3/2 { <b fis'\harmonic>8 <b fis'\harmonic>8 <b fis'\harmonic>8~ } <b fis'\harmonic>8.
+  \pitchedTrill fis'16\startTrillSpan cis' |
+  fis16 fis16 fis8~ fis16 <g d'\harmonic>16\stopTrillSpan <g d'\harmonic>16 <g d'\harmonic>16 \tuplet 3/2 { <g d'\harmonic>8 <g d'\harmonic>8 <g d'\harmonic>8~ }
+  <g d'\harmonic>16 <d' a'\harmonic>16 <d a'\harmonic>16 <d a'\harmonic>16 r4 |
+  r8. g,16~\harmonic\3 g8\harmonic \pitchedTrill d8~\startTrillSpan a' d2~ |
+  d8 <bes ees\harmonic>8~\stopTrillSpan <bes ees\harmonic>4~  <bes ees\harmonic>8 <f' bes\harmonic>8~ <f bes\harmonic>8 r8 |
+  d'8( cis8) d16( bes a bes |
+  a16 f8) aes,16-. aes16-. aes16-. aes8-. r8. <gis e'>16-. <gis e'>8-. <dis' gis\harmonic>16-. <dis gis\harmonic>16~ |
+  <dis gis\harmonic>2~ <dis gis\harmonic>8 <e b'\harmonic>8~ <e b'\harmonic>4~ |
+  <e b'\harmonic>2 r4 |
+  r8. <dis gis\harmonic>16~ <dis gis\harmonic>4~  <dis gis\harmonic>16 <b e\harmonic>8.~ <b e\harmonic>4~ |
+  <b e\harmonic>16 c8.~\harmonic c2~\harmonic c16 <c f\harmonic>8. |

 }
 \addQuote "violin1" { \removeWithTag #'score \violinOneMusic }
 
 }
 \addQuote "violin1" { \removeWithTag #'score \violinOneMusic }
 

diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly
index 34d71d93532a8f8498ee62919d7e8b70751a0a5f..aed7f2ab0294d7dfbbe949c7befba00ea207e9b7 100644 (file)
--- a/manuscripts/violin2.ly
+++ b/manuscripts/violin2.ly
@@ -38,10 +38,33 @@ violinTwoMusic =
   bes8.\glissando f16~\mp f8 fis8~ fis4\glissando cis'4~ |
   cis4 a2.\harmonic\3 |
   R1*2/4
   bes8.\glissando f16~\mp f8 fis8~ fis4\glissando cis'4~ |
   cis4 a2.\harmonic\3 |
   R1*2/4

+  \override Staff.TrillPitchHead.stencil = #(lambda (grob)
+    (grob-interpret-markup grob
+      #{ \markup \musicglyph #"noteheads.s0harmonic" #}))

   r8. <cis, fis\harmonic>16~\mp <cis fis\harmonic>4~ <cis fis\harmonic>8. a'16~\harmonic\3 a8\harmonic <gis, cis\harmonic>8~ |
   <gis cis\harmonic>2 r8 <e' a\harmonic>8~ <e a\harmonic>2
   r8. <c g'\harmonic>16~\mf <c g'\harmonic>4~ <c g'\harmonic>16 <d g\harmonic>8.~\startTrillSpan <d g\harmonic>4~ |
   r8. <cis, fis\harmonic>16~\mp <cis fis\harmonic>4~ <cis fis\harmonic>8. a'16~\harmonic\3 a8\harmonic <gis, cis\harmonic>8~ |
   <gis cis\harmonic>2 r8 <e' a\harmonic>8~ <e a\harmonic>2
   r8. <c g'\harmonic>16~\mf <c g'\harmonic>4~ <c g'\harmonic>16 <d g\harmonic>8.~\startTrillSpan <d g\harmonic>4~ |

-  <d g\harmonic>4~ <d g\harmonic>16\stopTrillSpan <ees aes\harmonic>8. <bes ees\harmonic>2~ | <bes ees\harmonic>8.
+  <d g\harmonic>4~ <d g\harmonic>16\stopTrillSpan <ees aes\harmonic>8. \pitchedTrill ees2\startTrillSpan bes' |
+  r8.\stopTrillSpan <ees aes\harmonic>16~ <ees aes\harmonic>2~ <ees aes\harmonic>8. \pitchedTrill ees16~\startTrillSpan bes' |
+  ees4~ ees16 b8.\stopTrillSpan \pitchedTrill c2\startTrillSpan f |
+  r8.\stopTrillSpan ees16~ ees2~ ees8. bes16~ |
+  bes8 b8~ b4~ b8 \pitchedTrill fis'4.\startTrillSpan b |
+  b,16\stopTrillSpan b b8~ b4~ b16 fis'16 fis16 fis16~ fis4~ |
+  fis4~ fis16 g16 g16 g16 d'16 d16 d8~ |
+  d8. <cis, fis\harmonic>16~ <cis fis\harmonic>4~ <cis fis\harmonic>8. <cis gis'\harmonic>16~ <cis gis'\harmonic>8 a'8~\harmonic\3 |
+  a4\harmonic e'2.\harmonic\2 |
+  r16 a,16 a16 a16 \tuplet 3/2 { a8 a8 a8~ } a4~ a16 e'16 e16 e16 |
+  \tuplet 3/2 { e8 e8 e8~ } e16 f16 f16 f16 c'16 c16 c8~ c8 r8 |
+  fis,,8. <fis b\harmonic>16~ <fis b\harmonic>4~ <fis b\harmonic>16 <fis cis'\harmonic>8. <g d'\harmonic>4~ |
+  <g d'\harmonic>2 \pitchedTrill d'2\startTrillSpan a' <cis d,~>4\stopTrillSpan |
+  <d, a'>8. d16~\harmonic\4 d2~\harmonic d8.\harmonic \pitchedTrill d16~\startTrillSpan a' |
+  d4~ d16 <ees bes'\harmonic>8.\stopTrillSpan \pitchedTrill bes'2~\startTrillSpan f' |
+  bes8 r8\stopTrillSpan r4 |
+  r8. <gis' cis\harmonic>16-. <gis cis\harmonic>8-. a8~\harmonic a4\harmonic a16-.\harmonic a16-.\harmonic <d, a'\harmonic>16-. <d a'\harmonic>16~
+  <d a'\harmonic>4 b'2.~\harmonic |
+  b2~\harmonic b8\harmonic r8 |
+  r8. <gis, dis'\harmonic>16~ <gis dis'\harmonic>8 \pitchedTrill b8~\startTrillSpan e b2~ |
+  b8 <c f\harmonic>8~\stopTrillSpan <c f\harmonic>4~ <c f\harmonic>8 <g' c\harmonic>4. |

 }
 
 violinTwoStaff =
 }
 
 violinTwoStaff =