diff --git a/1190 - Eybler - Streichquartette Op1 HV190-192.def b/1190 - Eybler - Streichquartette Op1 HV190-192.def
index 2d3fd1efcea31b181a66c59681083234a4eff56f..3c2a449ce764e19466ba83fe118338fa95e33560 100644
--- a/1190 - Eybler - Streichquartette Op1 HV190-192.def
+++ b/1190 - Eybler - Streichquartette Op1 HV190-192.def
@@ -35,7 +35,7 @@
"title": "Streichquartett D-Dur",
"subtitle": "Op.I/1, HV 190",
- "basename": "Eybler_Streichquartett_D-Dur_HV190",
+ "basename": "Eybler_Streichquartett_HV190_D-Dur",
"parts": [
{"id": "IAdagio", "piece": "Adagio non molto", "filename": "01_Adagio"},
{"id": "IIMenuetto", "piece": "Menuetto - Trio", "filename": "02_Menuetto"},
@@ -47,7 +47,7 @@
"title": "Streichquartett c-Moll",
"subtitle": "Op.I/2, HV 191",
- "basename": "Eybler_Streichquartett_c-Moll_HV191",
+ "basename": "Eybler_Streichquartett_HV191_c-Moll",
"parts": [
{"id": "IAllegro", "piece": "Allegro", "filename": "01_Allegro"},
{"id": "IIAdagioNonMolto", "piece": "Adagio non molto", "filename": "02_Adagio"},
@@ -59,7 +59,7 @@
"title": "Streichquartett B-Dur",
"subtitle": "Op.I/3, HV 192",
- "basename": "Eybler_Streichquartett_B-Dur_HV192",
+ "basename": "Eybler_Streichquartett_HV192_B-Dur",
"parts": [
{"id": "IAllegro", "piece": "Allegro", "filename": "01_Allegro"},
{"id": "IIAdagio", "piece": "Adagio", "filename": "02_Adagio"},
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
index 57d525c302311cda4b3335e4049887a358fcb335..35deee9f8ed70dd6196c900c6014c148aab592e9 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VI.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily"
\header {
instrument = \VIInstrumentName
@@ -9,7 +9,6 @@
\createScore #"IAdagio" #'("VI")
\createScore #"IIMenuetto" #'("VI")
-\createScore #"IIITrio" #'("VI")
-\createScore #"IVAdagio" #'("VI")
-\createScore #"VThema" #'("VI")
+\createScore #"IIIAdagio" #'("VI")
+\createScore #"IVThema" #'("VI")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
index 86382ed60675de7d5e923028b7d6fafe1ca2b9b7..9267ea3ccabbfb33d670501fc5d93cdc9ec1d065 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_VII.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily"
\header {
instrument = \VIIInstrumentName
@@ -9,7 +9,6 @@
\createScore #"IAdagio" #'("VII")
\createScore #"IIMenuetto" #'("VII")
-\createScore #"IIITrio" #'("VII")
-\createScore #"IVAdagio" #'("VII")
-\createScore #"VThema" #'("VII")
+\createScore #"IIIAdagio" #'("VII")
+\createScore #"IVThema" #'("VII")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
index a99bcae61a88860e88acc552664bb65dd4c59ca6..95311ab7a3066c49753484640708858cb33d56f2 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Va.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily"
\header {
instrument = \VaInstrumentName
@@ -9,7 +9,6 @@
\createScore #"IAdagio" #'("Va")
\createScore #"IIMenuetto" #'("Va")
-\createScore #"IIITrio" #'("Va")
-\createScore #"IVAdagio" #'("Va")
-\createScore #"VThema" #'("Va")
+\createScore #"IIIAdagio" #'("Va")
+\createScore #"IVThema" #'("Va")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
index 47a2f4fe0dcfa0709efc4f1abdc65fe16579ac1a..cb78dc3c98cf87864a6ddd05712ddec8789c49c4 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Instrument_Vc.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily"
\header {
instrument = \VcInstrumentName
@@ -9,7 +9,6 @@
\createScore #"IAdagio" #'("Vc")
\createScore #"IIMenuetto" #'("Vc")
-\createScore #"IIITrio" #'("Vc")
-\createScore #"IVAdagio" #'("Vc")
-\createScore #"VThema" #'("Vc")
+\createScore #"IIIAdagio" #'("Vc")
+\createScore #"IVThema" #'("Vc")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily
index c2f84eeab90862304dbe2e2f4b0730619656ce2d..b75f4fa4ee31ce6bdf5f0cb2982cfc7865b56bf4 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily
@@ -12,6 +12,19 @@ IIMenuettoSettings = \notemode {
\partial 8
}
+IIMenuettoTrioSettings = \notemode {
+ \break
+ \key d \major
+ \tempo "Trio"
+% \partial 4
+}
+
+IIMenuettoEndSettings = \notemode {
+ \mark "Menuetto da capo"
+ \barNumberCheck #68
+}
+
+
IIMenuettoVIMusic = \relative c'' {
\repeat volta 2 {
@@ -62,6 +75,29 @@ IIMenuettoVIMusic = \relative c'' {
\grace fis16 e8[ d cis] | % 44
d4
}
+
+ %% TRIO
+ \IIMenuettoTrioSettings
+ \repeat volta 2 {
+ r8 | % 45
+ R4.*7 | % 52
+ r8 r
+ } \repeat volta 2 {
+ r8 | % 53
+ r4 a8 | \barNumberCheck #54
+ \grace{ gis16[ a h] } a4 r8 | % 55
+ r4 a,8 | % 56
+ \grace{ gis16[ a h] } a4 r8 | % 57
+ r4 a'8 | % 58
+ \grace{ gis16[ a h] } a4 r8 | % 59
+ R4.*5 | \barNumberCheck #64
+ r4 d8-|\f | % 65
+ a4( fis8) | % 66
+ d4 d8 | % 67
+ e8.[( fis16 e8]) | % 68
+ d4
+ }
+ \IIMenuettoEndSettings
}
\addQuote "IIMenuettoVIMusic" { \IIMenuettoVIMusic }
@@ -116,6 +152,39 @@ IIMenuettoVIIMusic = \relative c' {
\slashedGrace a8 g[ fis e] | % 44
fis4
}
+
+ %% TRIO
+ \IIMenuettoTrioSettings
+ \repeat volta 2 {
+ a8\dolce^\solo | % 45
+ a4( fis8) | % 46
+ d4 d8 | % 47
+ e8.[ fis16 e8] | % 48
+ d8[( a) a']-| | % 49
+ a4( fis8) | % 50
+ d4 d8 | % 51
+ e8.[ fis16 e8] | % 52
+ d4
+ } \repeat volta 2 {
+ a8 | % 53
+ e'8.[\trill fis16 g8] | \barNumberCheck #54
+ fis8.[\trill g16 a8] | % 55
+ cis,8.[\trill d16 e8] | % 56
+ d8.[\trill e16 fis8] | % 57
+ e8.[\trill fis16 g8] | % 58
+ fis8.[\trill g16 a8] | % 59
+ cis,8.[\trill d16 e8] | % 60
+ d8[( fis) a]-| | % 61
+ a4 fis8 | % 62
+ d4 d8 | % 63
+ e8.[( fis16 e8]) | \barNumberCheck #64
+ d8[( a) a']-|\f | % 65
+ a4 fis8 | % 66
+ d4 d8 | % 67
+ e8.[ fis16 e8] | % 68
+ d4
+ }
+ \IIMenuettoEndSettings
}
\addQuote "IIMenuettoVIIMusic" { \IIMenuettoVIIMusic }
@@ -167,6 +236,39 @@ IIMenuettoVaMusic = \relative c {
h[-| a-| a]-| | % 44
a4
}
+
+ %% TRIO
+ \IIMenuettoTrioSettings
+ \repeat volta 2 {
+ r8 | % 45
+ R4. | % 46
+ fis4\p fis8 | % 47
+ g4 g8 | % 48
+ fis4 r8 | % 49
+ R4. | % 50
+ fis4 fis8 | % 51
+ g4 g8 | % 52
+ fis4
+ } \repeat volta 2 {
+ r8 | % 53
+ cis'8.[\trill d16 e8] | \barNumberCheck #54
+ d4 fis,8 | % 55
+ e8.[\trill fis16 g8] | % 56
+ fis8.[\trill g16 a8] | % 57
+ cis,8.[\trill d16 e8] | % 58
+ d8.[\trill e16 fis8] | % 59
+ e8.[\trill fis16 g8] | % 60
+ fis4 r8 | % 61
+ R4. | % 62
+ fis4 fis8 | % 63
+ g4 g8 | \barNumberCheck #64
+ fis4 fis'8\f | % 65
+ fis4 d8 | % 66
+ fis,4 fis8 | % 67
+ g4 g8 | % 68
+ fis4
+ }
+ \IIMenuettoEndSettings
}
\addQuote "IIMenuettoVaMusic" { \IIMenuettoVaMusic }
@@ -209,7 +311,38 @@ IIMenuettoVcMusic = \relative c {
g[-| a-| a]-| | % 44
d,[-| d']-|
}
+
+ %% TRIO
+ \IIMenuettoTrioSettings
+ \repeat volta 2 {
+ r8 | % 45
+ R4. | % 46
+ d4\p d8 | % 47
+ a4 a8 | % 48
+ d4 r8 | % 49
+ R4. | % 50
+ d4 d8 | % 51
+ a4 a8 | % 52
+ d4
+ } \repeat volta 2 {
+ r8 | % 53
+ a4.~ | \barNumberCheck #54
+ a4.~ | % 55
+ a4.~ | % 56
+ a4.~ | % 57
+ a4.~ | % 58
+ a4.~ | % 59
+ a4.~ | % 60
+ a4 r8 | % 61
+ R4. | % 62
+ d4 d8 | % 63
+ a4 a8 | \barNumberCheck #64
+ d4 r8 | % 65
+ R4. | % 66
+ d4\f d8 | % 67
+ a4 a8 | % 68
+ d4
+ }
+ \IIMenuettoEndSettings
}
\addQuote "IIMenuettoVcMusic" { \IIMenuettoVcMusic }
-
-
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_03_Trio.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_03_Trio.ily
index 4f2f62c79bfbee9ff9ea043257f78fa33eb5adf5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_03_Trio.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_03_Trio.ily
@@ -1,141 +0,0 @@
-\version "2.14.0"
-
-IIITrioPieceName = "Trio"
-IIITrioPieceNameTacet = "Trio tacet"
-% IIITrioTempo = "TODO"
-
-IIITrioKey = \key d \major
-IIITrioTimeSignature = \time 3/8
-
-IIITrioSettings = \notemode {
-% \tempo \IIITrioTempo
- \partial 8
-}
-
-
-IIITrioVIMusic = \relative c''' {
- \repeat volta 2 {
- r8 | % 1
- R4.*7 | % 8
- r8 r
- } \repeat volta 2 {
- r8 | % 9
- r4 a8 | \barNumberCheck #10
- \grace{ gis16[ a h] } a4 r8 | % 11
- r4 a,8 | % 12
- \grace{ gis16[ a h] } a4 r8 | % 13
- r4 a'8 | % 14
- \grace{ gis16[ a h] } a4 r8 | % 15
- R4.*5 | \barNumberCheck #20
- r4 d8-|\f | % 21
- a4( fis8) | % 22
- d4 d8 | % 23
- e8.[( fis16 e8]) | % 24
- d4
- }
-}
-\addQuote "IIITrioVIMusic" { \IIITrioVIMusic }
-
-
-IIITrioVIIMusic = \relative c'' {
- \repeat volta 2 {
- a8\dolce^\solo | % 1
- a4( fis8) | % 2
- d4 d8 | % 3
- e8.[ fis16 e8] | % 4
- d8[( a) a']-| | % 5
- a4( fis8) | % 6
- d4 d8 | % 7
- e8.[ fis16 e8] | % 8
- d4
- } \repeat volta 2 {
- a8 | % 9
- e'8.[\trill fis16 g8] | \barNumberCheck #10
- fis8.[\trill g16 a8] | % 11
- cis,8.[\trill d16 e8] | % 12
- d8.[\trill e16 fis8] | % 13
- e8.[\trill fis16 g8] | % 14
- fis8.[\trill g16 a8] | % 15
- cis,8.[\trill d16 e8] | % 16
- d8[( fis) a]-| | % 17
- a4 fis8 | % 18
- d4 d8 | % 19
- e8.[( fis16 e8]) | \barNumberCheck #20
- d8[( a) a']-|\f | % 21
- a4 fis8 | % 22
- d4 d8 | % 24
- e8.[ fis16 e8] | % 24
- d4
- }
-}
-\addQuote "IIITrioVIIMusic" { \IIITrioVIIMusic }
-
-
-IIITrioVaMusic = \relative c {
- \repeat volta 2 {
- r8 | % 1
- R4. | % 2
- fis4\p fis8 | % 3
- g4 g8 | % 4
- fis4 r8 | % 5
- R4. | % 6
- fis4 fis8 | % 7
- g4 g8 | % 8
- fis4
- } \repeat volta 2 {
- r8 | % 9
- cis'8.[\trill d16 e8] | \barNumberCheck #10
- d4 fis,8 | % 11
- e8.[\trill fis16 g8] | % 12
- fis8.[\trill g16 a8] | % 13
- cis,8.[\trill d16 e8] | % 14
- d8.[\trill e16 fis8] | % 15
- e8.[\trill fis16 g8] | % 16
- fis4 r8 | % 17
- R4. | % 18
- fis4 fis8 | % 19
- g4 g8 | \barNumberCheck #20
- fis4 fis'8\f | % 21
- fis4 d8 | % 22
- fis,4 fis8 | % 23
- g4 g8 | % 24
- fis4
- }
-}
-\addQuote "IIITrioVaMusic" { \IIITrioVaMusic }
-
-
-IIITrioVcMusic = \relative c {
- \repeat volta 2 {
- r8 | % 1
- R4. | % 2
- d4\p d8 | % 3
- a4 a8 | % 4
- d4 r8 | % 5
- R4. | % 6
- d4 d8 | % 7
- a4 a8 | % 8
- d4
- } \repeat volta 2 {
- r8 | % 9
- a4.~ | \barNumberCheck #10
- a4.~ | % 11
- a4.~ | % 12
- a4.~ | % 13
- a4.~ | % 14
- a4.~ | % 15
- a4.~ | % 16
- a4 r8 | % 17
- R4. | % 18
- d4 d8 | % 19
- a4 a8 | \barNumberCheck #20
- d4 r8 | % 21
- R4. | % 22
- d4\f d8 | % 23
- a4 a8 | % 24
- d4
- }
-}
-\addQuote "IIITrioVcMusic" { \IIITrioVcMusic }
-
-
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_04_Adagio.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_04_Adagio.ily
index c4a3d0e64b576aec66478378a990fb489c7abcd3..a39a7771c0807f56acbc6e757d0fb4c6ad339e17 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_04_Adagio.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_04_Adagio.ily
@@ -1,20 +1,20 @@
\version "2.14.0"
-IVAdagioPieceName = "Adagio"
-IVAdagioPieceNameTacet = "Adagio Cantabile tacet"
-IVAdagioTempo = "Adagio cantabile"
+IIIAdagioPieceName = "Adagio"
+IIIAdagioPieceNameTacet = "Adagio Cantabile tacet"
+IIIAdagioTempo = "Adagio cantabile"
-IVAdagioKey = \key g \major
-IVAdagioTimeSignature = \time 2/4
+IIIAdagioKey = \key g \major
+IIIAdagioTimeSignature = \time 2/4
-IVAdagioSettings = \notemode {
- \tempo \IVAdagioTempo
+IIIAdagioSettings = \notemode {
+ \tempo \IIIAdagioTempo
\mark "Con Sordini"
\partial 8
}
-IVAdagioVIMusic = \relative c'' {
+IIIAdagioVIMusic = \relative c'' {
\repeat volta 2 {
d16.[\p c32] | % 1
c8[ h] r g'16.[ fis32] | % 2
@@ -101,10 +101,10 @@ IVAdagioVIMusic = \relative c'' {
}
\barNumberCheck #84
}
-\addQuote "IVAdagioVIMusic" { \IVAdagioVIMusic }
+\addQuote "IIIAdagioVIMusic" { \IIIAdagioVIMusic }
-IVAdagioVIIMusic = \relative c'' {
+IIIAdagioVIIMusic = \relative c'' {
\repeat volta 2 {
h16.[\p a32] | % 1
a8[( g]) r e'16.[ d32] | % 2
@@ -194,10 +194,10 @@ IVAdagioVIIMusic = \relative c'' {
}
\barNumberCheck #84
}
-\addQuote "IVAdagioVIIMusic" { \IVAdagioVIIMusic }
+\addQuote "IIIAdagioVIIMusic" { \IIIAdagioVIIMusic }
-IVAdagioVaMusic = \relative c' {
+IIIAdagioVaMusic = \relative c' {
\repeat volta 2 {
r8 | % 1
r16. g32[\p h16. d32] g8 r | % 2
@@ -287,10 +287,10 @@ IVAdagioVaMusic = \relative c' {
}
\barNumberCheck #84
}
-\addQuote "IVAdagioVaMusic" { \IVAdagioVaMusic }
+\addQuote "IIIAdagioVaMusic" { \IIIAdagioVaMusic }
-IVAdagioVcMusic = \relative c' {
+IIIAdagioVcMusic = \relative c' {
\repeat volta 2 {
r8 | % 1
r16. g32[\p d16. h32] g8 r | % 2
@@ -380,6 +380,6 @@ IVAdagioVcMusic = \relative c' {
}
\barNumberCheck #84
}
-\addQuote "IVAdagioVcMusic" { \IVAdagioVcMusic }
+\addQuote "IIIAdagioVcMusic" { \IIIAdagioVcMusic }
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_05_Thema.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_05_Thema.ily
index febb255f8bb40470d81e3cd3c72e17d20a629102..da2ea7d31744bf5948badfe485895b0c5ac9cb6e 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Music_05_Thema.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Music_05_Thema.ily
@@ -1,44 +1,44 @@
\version "2.14.0"
-VThemaPieceName = "Thema con Variationi"
-VThemaPieceNameTacet = "Thema con Variationi tacet"
-VThemaTempo = "Moderato"
+IVThemaPieceName = "Thema con Variationi"
+IVThemaPieceNameTacet = "Thema con Variationi tacet"
+IVThemaTempo = "Moderato"
-VThemaKey = \key d \major
-VThemaTimeSignature = \time 2/4
+IVThemaKey = \key d \major
+IVThemaTimeSignature = \time 2/4
-VThemaSettings = \notemode {
- \tempo \VThemaTempo
+IVThemaSettings = \notemode {
+ \tempo \IVThemaTempo
\partial 8
}
-VThemaI = \notemode {
+IVThemaI = \notemode {
\break
\mark "Var.I"
\barNumberCheck #16
}
-VThemaII = \notemode {
+IVThemaII = \notemode {
\break
\mark "Var.II"
\barNumberCheck #32
}
-VThemaIII = \notemode {
+IVThemaIII = \notemode {
\break
\mark "Var.III"
\key d \minor
\barNumberCheck #48
}
-VThemaIV = \notemode {
+IVThemaIV = \notemode {
\break
\mark "Var.IV"
\key d \major
\barNumberCheck #64
}
-VThemaV = \notemode {
+IVThemaV = \notemode {
\break
\mark "Var.V"
\barNumberCheck #80
}
-VThemaVI = \notemode {
+IVThemaVI = \notemode {
\break
\bar "|."
\tempo "Allegro"
@@ -48,7 +48,7 @@ VThemaVI = \notemode {
}
-VThemaVIMusic = \relative c' {
+IVThemaVIMusic = \relative c' {
\repeat volta 2 {
a8(\p | % 1
d16-|) r fis8( a16)-| r a,8( | % 2
@@ -72,7 +72,7 @@ VThemaVIMusic = \relative c' {
} \barNumberCheck #16
\repeat volta 2 {
- \VThemaI
+ \IVThemaI
r8 | % 17
R2*2 | % 19
r4 r8 g8 | \barNumberCheck #20
@@ -94,7 +94,7 @@ VThemaVIMusic = \relative c' {
} \barNumberCheck #32
\repeat volta 2 {
- \VThemaII
+ \IVThemaII
d32[( fis d fis] | % 33
a8)-| d32[( fis d fis] a8)-| fis32[( d fis d] | % 34
g8)-| e32[( cis e cis] g8)-| e32[( g e g]) | % 35
@@ -117,7 +117,7 @@ VThemaVIMusic = \relative c' {
} \barNumberCheck #48
\repeat volta 2 {
- \VThemaIII
+ \IVThemaIII
r8 | % 49
r d,,8[(\pp cis d]) | \barNumberCheck #50
e8.[ fis32 g] fis8[ a] | % 51
@@ -140,7 +140,7 @@ VThemaVIMusic = \relative c' {
} \barNumberCheck #64
\repeat volta 2 {
- \VThemaIV
+ \IVThemaIV
r8 | % 65
r8 fis[(\p a fis]) | % 66
r e[( g e]) | % 67
@@ -161,7 +161,7 @@ VThemaVIMusic = \relative c' {
} \barNumberCheck #80
\repeat volta 2 {
- \VThemaV
+ \IVThemaV
a8( | % 81
d[)-| fis( a)-| a,]( | % 82
cis)-| e[( a])-| a,( | % 83
@@ -198,7 +198,7 @@ VThemaVIMusic = \relative c' {
\grace { dis32[ e fis] } e4.
\barNumberCheck #107
- \VThemaVI
+ \IVThemaVI
fis8\p | % 108
fis4( g8) g4-| e8 | % 109
e4( fis8) fis4-| d8 | \barNumberCheck #110
@@ -224,10 +224,10 @@ VThemaVIMusic = \relative c' {
d4 r8 d4
\bar "|." \barNumberCheck #129
}
-\addQuote "VThemaVIMusic" { \VThemaVIMusic }
+\addQuote "IVThemaVIMusic" { \IVThemaVIMusic }
-VThemaVIIMusic = \relative c' {
+IVThemaVIIMusic = \relative c' {
\repeat volta 2 {
r8 | % 1
a8\p r r4 | % 2
@@ -251,7 +251,7 @@ VThemaVIIMusic = \relative c' {
} \barNumberCheck #16
\repeat volta 2 {
- \VThemaI
+ \IVThemaI
a'8 | % 17
fis16[( a d fis]) a[( fis h a]) | % 18
g[( fis e d] cis[ h a g]) | % 19
@@ -274,7 +274,7 @@ VThemaVIIMusic = \relative c' {
} \barNumberCheck #32
\repeat volta 2 {
- \VThemaII
+ \IVThemaII
r8 | % 33
r a' r d, | % 34
r cis r e | % 35
@@ -297,7 +297,7 @@ VThemaVIIMusic = \relative c' {
} \barNumberCheck #48
\repeat volta 2 {
- \VThemaIII
+ \IVThemaIII
r8 | % 49
r a,4\pp a8 | % 50
a4 r | \barNumberCheck #51
@@ -320,7 +320,7 @@ VThemaVIIMusic = \relative c' {
} \barNumberCheck #64
\repeat volta 2 {
- \VThemaIV
+ \IVThemaIV
r8 | % 65
r d[(\p fis d]) | % 66
r cis[( e cis]) | % 67
@@ -343,7 +343,7 @@ VThemaVIIMusic = \relative c' {
} \barNumberCheck #80
\repeat volta 2 {
- \VThemaV
+ \IVThemaV
r8 | % 81
fis2\mf | % 82
g2 | % 83
@@ -380,7 +380,7 @@ VThemaVIIMusic = \relative c' {
\grace { his16[ cis d] } cis4.\fermata
\barNumberCheck #107
- \VThemaVI
+ \IVThemaVI
a8\p | % 108
a8[( ais) h]-| h4 g8-| | % 109
g[( gis) a] a4 fis8-| | \barNumberCheck #110
@@ -406,10 +406,10 @@ VThemaVIIMusic = \relative c' {
d4 r8 d4
\bar "|." \barNumberCheck #129
}
-\addQuote "VThemaVIIMusic" { \VThemaVIIMusic }
+\addQuote "IVThemaVIIMusic" { \IVThemaVIIMusic }
-VThemaVaMusic = \relative c' {
+IVThemaVaMusic = \relative c' {
\repeat volta 2 {
r8 | % 1
fis,8\p r r4 | % 2
@@ -433,7 +433,7 @@ VThemaVaMusic = \relative c' {
} \barNumberCheck #16
\repeat volta 2 {
- \VThemaI
+ \IVThemaI
r8 | % 17
r fis[-. d-. fis]-. | % 18
g[-. h-. cis-. e]-. | % 19
@@ -456,7 +456,7 @@ VThemaVaMusic = \relative c' {
} \barNumberCheck #32
\repeat volta 2 {
- \VThemaII
+ \IVThemaII
r8 | % 33
fis[ fis' fis, a] | % 34
e[ a e a] | % 35
@@ -479,7 +479,7 @@ VThemaVaMusic = \relative c' {
} \barNumberCheck #48
\repeat volta 2 {
- \VThemaIII
+ \IVThemaIII
r8 | % 49
r a,[(\pp g f]) | \barNumberCheck #50
e[ a a e] | % 51
@@ -502,7 +502,7 @@ VThemaVaMusic = \relative c' {
} \barNumberCheck #64
\repeat volta 2 {
- \VThemaIV
+ \IVThemaIV
a8 | % 65
d16[( fis) a16.-| a32]-| a8-| r16 a, | % 66
e'[( g) a16.-| a32]-| a8 r16 g | % 67
@@ -525,7 +525,7 @@ VThemaVaMusic = \relative c' {
} \barNumberCheck #80
\repeat volta 2 {
- \VThemaV
+ \IVThemaV
r8 | % 81
d2 | % 82
e | % 83
@@ -561,7 +561,7 @@ VThemaVaMusic = \relative c' {
a4.\fermata % TODO: a4 instead of a4. printed
\barNumberCheck #107
- \VThemaVI
+ \IVThemaVI
r8 | % 108
d,8[\p d' d] d,[ d' d] | % 109
d,[ d' d] d,[ d' d] | \barNumberCheck #110
@@ -587,10 +587,10 @@ VThemaVaMusic = \relative c' {
<d d,>4 r8 <d d,>4
\bar "|." \barNumberCheck #129
}
-\addQuote "VThemaVaMusic" { \VThemaVaMusic }
+\addQuote "IVThemaVaMusic" { \IVThemaVaMusic }
-VThemaVcMusic = \relative c {
+IVThemaVcMusic = \relative c {
\repeat volta 2 {
r8 | % 1
d\p r r4 | % 2
@@ -614,7 +614,7 @@ VThemaVcMusic = \relative c {
} \barNumberCheck #16
\repeat volta 2 {
- \VThemaI
+ \IVThemaI
r8 | % 17
r d'[\p-| fis-| d]-| | % 18
e[ g a cis] | % 19
@@ -637,7 +637,7 @@ VThemaVcMusic = \relative c {
} \barNumberCheck #32
\repeat volta 2 {
- \VThemaII
+ \IVThemaII
r8 | % 33
d' r d r | % 34
cis r cis r | % 35
@@ -660,7 +660,7 @@ VThemaVcMusic = \relative c {
} \barNumberCheck #48
\repeat volta 2 {
- \VThemaIII
+ \IVThemaIII
a'8(\p | % 49
d)-|[ fis( e d]) | \barNumberCheck #50
cis[ a d c] | % 51
@@ -683,7 +683,7 @@ VThemaVcMusic = \relative c {
} \barNumberCheck #64
\repeat volta 2 {
- \VThemaIV
+ \IVThemaIV
r8 | % 65
r d'[ d, d'] | % 66
r a'[ a, a'] | % 67
@@ -706,7 +706,7 @@ VThemaVcMusic = \relative c {
} \barNumberCheck #80
\repeat volta 2 {
- \VThemaV
+ \IVThemaV
r8 | % 81
r16_"Staccato" d''16[-| a-| fis]-| d[-| a'-| fis-| d]-| | % 82
a[-| a'-| e-| cis]-| a[-| e'-| cis-| a]-| | % 83
@@ -741,7 +741,7 @@ VThemaVcMusic = \relative c {
a4.\fermata
\barNumberCheck #107
- \VThemaVI
+ \IVThemaVI
r8 | % 108
R2.*3 | \barNumberCheck #111
r4 r8 a16[\f h a g fis e] | % 112
@@ -765,6 +765,6 @@ VThemaVcMusic = \relative c {
d,4 r8 d4
\bar "|." \barNumberCheck #129
}
-\addQuote "VThemaVcMusic" { \VThemaVcMusic }
+\addQuote "IVThemaVcMusic" { \IVThemaVcMusic }
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly b/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
index 65d868ad444679df48e7b9faf4fb64228dd4efbf..08bb9e63bd1f14577719e5a62a998c550ed7ad6d 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
+++ b/Eybler_Streichquartett_HV190_D-Dur_Score_Full.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings_FullScore.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily"
\setCreateMIDI ##t
\setCreatePDF ##t
@@ -10,6 +10,5 @@
\createNoCuesScore #"IAdagio" #'("FullScore")
\createNoCuesScore #"IIMenuetto" #'("FullScore")
-\createNoCuesScore #"IIITrio" #'("FullScore")
-\createNoCuesScore #"IVAdagio" #'("FullScore")
-\createNoCuesScore #"VThema" #'("FullScore")
+\createNoCuesScore #"IIIAdagio" #'("FullScore")
+\createNoCuesScore #"IVThema" #'("FullScore")
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
index 240d4890db16258f1679cd98d8945b226ab7274b..ebb0d2af9a7c104408bed4ed4cbd44c9f17d3c8f 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings.ily
@@ -3,10 +3,9 @@
\include "deutsch.ly"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings_Global.ily"
-\include "Eybler_Streichquartett_D-Dur_HV190_Music_01_Adagio.ily"
-\include "Eybler_Streichquartett_D-Dur_HV190_Music_02_Menuetto.ily"
-\include "Eybler_Streichquartett_D-Dur_HV190_Music_03_Trio.ily"
-\include "Eybler_Streichquartett_D-Dur_HV190_Music_04_Adagio.ily"
-\include "Eybler_Streichquartett_D-Dur_HV190_Music_05_Thema.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings_Global.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_04_Adagio.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Music_05_Thema.ily"
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily
index da4da36718bc4e1f6dfcdbbbc6444b983067adea..2993fa99bd5bd7379e965c772b9121e0361cff98 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings_FullScore.ily
@@ -1,3 +1,3 @@
\version "2.15.30"
\include "orchestrallily/oly_settings_fullscore.ily"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings.ily"
diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily
index c0db60b0a4fe500a8d70fa0daa5c8c880c259a80..5f4cb24e2ce3b8e1d80517a80244eeb1ff6bb6da 100644
--- a/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily
+++ b/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily
@@ -1,6 +1,6 @@
\version "2.15.30"
\include "orchestrallily/oly_settings_instrument.ily"
-\include "Eybler_Streichquartett_D-Dur_HV190_Settings.ily"
+\include "Eybler_Streichquartett_HV190_D-Dur_Settings.ily"
\paper {
#(define page-breaking ly:optimal-breaking)
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
index cbed34208874ca8b85b9160c5159ae454d561e44..b3dfa3729dd7dcdde8fd4d3aadd8b8ede64df453 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VI.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_c-Moll_HV191_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily"
\header {
instrument = \VIInstrumentName
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
index 3874b15fcbab77c2619da174e167d43255ffbfa3..581ecb38c65b38bd52dc08d78dc33616b554964f 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_VII.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_c-Moll_HV191_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily"
\header {
instrument = \VIIInstrumentName
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
index b0ace444bbeefaa1137ded8fbdf049efb5cd1a9f..61df467f9d9816ab19911baa9f7b47256e397c08 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Va.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_c-Moll_HV191_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily"
\header {
instrument = \VaInstrumentName
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
index 0e0b506e0c77fe41e184272699ebaa9c4654c370..93cbdada315cf3cc2399933fbea2a0ece9e76950 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Instrument_Vc.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_c-Moll_HV191_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily"
\header {
instrument = \VcInstrumentName
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily b/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily
index 9fa05945131597e67d86cd8610d23eb957215d45..65e39fae50e80e9fe0183f5f792efbad4fccdb26 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily
@@ -19,8 +19,137 @@ IVFinaleVIMusic = \relative c' {
g'4 r8 h,16[(\cresc c]) | % 3
c'4 r8 h,16[( c]) | % 4
es'4.\f d16[ c] | % 5
- % TODO
+ h8(\sf c) h(\sf c) | % 6
+ d(\sf es) d(\sf es) | % 7
+ \grace { f16[ ges] } as4\sf g16 f es d | % 8
+ c4( h8) r | % 9
+ \addArticulation "staccato" { es,8\p es es es | \barNumberCheck #10
+ es es es es | % 11
+ es es es es | % 12
+ es es es es } | % 13
+ f(\sf es) f(\sf es) | % 14
+ h'(\sf c) h(\sf c) | % 15
+ a8-| a'[( g) h,(] | % 16
+ c4) r8 g'\f | % 17
+ g[ g g g] | % 18
+ es c r g' | % 19
+ g g g g | \barNumberCheck #20
+ es( c) r c\trill | % 21
+ as' as as as | % 22
+ f( d) r b\trill | % 23
+ g' g g g | % 24
+ es( c) r as'-| | % 25
+ f( d) r b'-| | % 26
+ g( es) r c | % 27
+ b16 b, b b b b' b b | % 28
+ b b' b b b d, d d | % 29
+ es b, b b b b' b b | \barNumberCheck #30
+ b b' b b b g g g | % 31
+ as b,, b b b b' b b | % 32
+ b b' b b b as as as | % 33
+ g( b) b-. b-. c(\sf b) b-. b-. | % 34
+ c(\sf b) b-. b-. c(\sf b) b-. b-. | % 35
+ b16( es) es-. es-. es( des) des-. des-. | % 36
+ des( c) c-. c-. h c as f | % 37
+ es4 \grace g16 f16 es f g | % 38
+ es4 r | % 39
+ r8 a16( b) b,4 | \barNumberCheck #40
+ r8 a'16( b) b,4 | % 41
+ r8 a'16( b) b,4 | % 42
+ r8 a'16( b) b,4 | % 43
+ r8 a'16( b) b,4 | % 44
+ r8 d16(\p es) r8 fis16( g) | % 45
+ r8 h16( c) r8 f,16( as) | % 46
+ g8 r b4~\sf | % 47
+ b8 as16 g f g a f | % 48
+ g8 r b4~ | % 49
+ b8( as16 g) f( g as f) | \barNumberCheck #50
+ g8 r b4~\sf | % 51
+ b8 as16 g f g as f | % 52
+ g8 r r4 | % 53
+ f8 r f r | % 54
+ es16\f es, es es d f' f f | % 55
+ g g, g g f as' as as | % 56
+ b8 b4 b8 | % 57
+ b8 b4 b8 | % 58
+ b16 g es es' c as,8 c' 16 | % 59
+ b16 g es es' d f b, as | \barNumberCheck #60
+ g b es, es' c as,8 c'16 | % 61
+ b g es es' d f b, as | % 62
+ g16 b8\sf as16 g16 b8\sf as16 | % 63
+ g16 b8\sf-. es-.\sf b16 g es | % 64
+ b4 f'\trill | % 65
+ es4 r | % 66
+ R2 | % 67
+ r8 a16(\p b) a( b) r8 | % 68
+ R2 | % 69
+ r8 a16( b) a( b) d,( es) | \barNumberCheck #70
+ c4\dolce b16 as g f | % 71
+ es( f g as) b( c d es) | % 72
+ h( c d c) b( as g f) | % 73
+ \addArticulation "staccatissimo" { es8\f es' b' b | % 74
+ g es b' b | % 75
+ g4 } <es es, g,>4 | % 76
+ q4 r8
} \repeat volta 2 {
+ g8\f | % 77
+ g,16 g8 g g g16 | % 78
+ b16 a8 a a a16 | % 79
+ c16 h8 h h h16 | \barNumberCheck #80
+ d16 c8 c c c'16 | % 81
+ c,16 c8 c c c16 | % 82
+ es16 d8 d d d16 | % 83
+ f16 e8 e e e16 | % 84
+ f8-| r4 \fermata b16\p as | % 85
+ c,4 r8 b'16 as | % 86
+ des,4 r8 b'16 as | % 87
+ ges f es des c b as ges | % 88
+ f ges as b as8 r | % 89
+ r f' f r | \barNumberCheck #90
+ r ges ges r | % 91
+ r d d d | % 92
+ es4 r8 es8\f | % 93
+ ces' ces ces ces | % 94
+ as f r des | % 95
+ b' b b b | % 96
+ ges es r ces | % 97
+ as' as as as | % 98
+ f d r b | % 99
+ b es r b' | \barNumberCheck #100
+ ges es r b' | % 101
+ b ges r b | % 102
+ ces as r ces | % 103
+ b \afterGrace es,4 { f32[ es d es] } f16 d | % 104
+ es4 r | % 105
+ r8 es, es r | % 106
+ r es es r | % 107
+ r es es g | % 108
+ as4 r8 g'16 f | % 109
+ a,4 r8 g'16 f | \barNumberCheck #110
+ b,4 r8 g'16 f | % 111
+ e f g as b c d es | % 112
+ f d f d b8 r | % 113
+ r b,, b b | % 114
+ b4 r8 c'16 b | % 115
+ a b c d es f g as | % 116
+ b g es b g8 es'\f | % 117
+ c4. f8 | % 118
+ d4. g8 | % 119
+ es8. g16 f es d c | \barNumberCheck #120
+ h g, g g g g' g g | % 121
+ g g' g g g h, h h | % 122
+ c g, g g g g' g g | % 123
+ g g' g g g es es es | % 124
+ f g,, g g g g' g g | % 125
+ g g' g g g f f f | % 126
+ es g g g as(\sf g) g-| g-| | % 127
+ as(\sf g) g-| g-| as(\sf g) g-| g-| | % 128
+ g( c) c-| c-| c( b) b-| b-| | % 129
+ b( as) as-| a-| g( as) f-| d-| | \barNumberCheck #130
+ c4 \grace es16 d c d es | % 131
+ c4 r | % 132
+
+
s8
% TODO
}}
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly b/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
index 0b292a83810f3bc982113f6dd7b0c525b2f97c22..2dfd064a4db394b6191624cf8d46c3a735edd3b3 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
+++ b/Eybler_Streichquartett_HV191_c-Moll_Score_Full.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_c-Moll_HV191_Settings_FullScore.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily"
\setCreateMIDI ##t
\setCreatePDF ##t
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings.ily
index 61391d97b531d4c90d470d4f3047a321935f853c..e76dd7f7a644d716087ccd6727b3ddf9b73ccccb 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Settings.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Settings.ily
@@ -3,9 +3,9 @@
\include "deutsch.ly"
-\include "Eybler_Streichquartett_c-Moll_HV191_Settings_Global.ily"
-\include "Eybler_Streichquartett_c-Moll_HV191_Music_01_Allegro.ily"
-\include "Eybler_Streichquartett_c-Moll_HV191_Music_02_Adagio.ily"
-\include "Eybler_Streichquartett_c-Moll_HV191_Music_03_Menuetto.ily"
-\include "Eybler_Streichquartett_c-Moll_HV191_Music_04_Finale.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Settings_Global.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Music_04_Finale.ily"
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily
index 98f20b9a28c73b0bb4dd30da1d043252158eaae5..e916f1d5b4a5b1dba83efe1a181d4ab9671212ce 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Settings_FullScore.ily
@@ -1,3 +1,3 @@
\version "2.15.30"
\include "orchestrallily/oly_settings_fullscore.ily"
-\include "EEybler_Streichquartett_c-Moll_HV191_Settings.ily"
+\include "EEybler_Streichquartett_HV191_c-Moll_Settings.ily"
diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily
index 94f66c443d3aef4eb08bcc0175648347888835db..b58acb7718ddfb698ca1532ae23c5b42c26fec90 100644
--- a/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily
+++ b/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily
@@ -1,6 +1,6 @@
\version "2.15.30"
\include "orchestrallily/oly_settings_instrument.ily"
-\include "Eybler_Streichquartett_c-Moll_HV191_Settings.ily"
+\include "Eybler_Streichquartett_HV191_c-Moll_Settings.ily"
\paper {
#(define page-breaking ly:optimal-breaking)
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
index 23823c4e40daf34f5a6b0f16bdc13da9cb4c0a32..d2944e00bd93f0fe3255999386503be0b750bbd0 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VI.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily"
\header {
instrument = \VIInstrumentName
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
index 1b0b35b5de3551aea7ebe0410ae8dd4ff9fb29a9..c295f5239717d59c5551e466404cd0d72544432c 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_VII.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily"
\header {
instrument = \VIIInstrumentName
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
index 9efdeb43f53180fc8cba995c45c5629111b4be50..79c6ffc87f6f44ff5c77a4f74fe93ae7ddea0fcf 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Va.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily"
\header {
instrument = \VaInstrumentName
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
index 15e1596f51767ce0a812357992394ba3bb3aaa84..3fc85e7d4dcbe7f3e1c115f943758d70cdfe7a82 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Instrument_Vc.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings_Instrument.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily"
\header {
instrument = \VcInstrumentName
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly b/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
index 469d34fa0e6a16c2c161985ad3d0601f7e1901a4..e20e9830bced724c8a03d6ea4ebf299ea9204b00 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
+++ b/Eybler_Streichquartett_HV192_B-Dur_Score_Full.ly
@@ -1,5 +1,5 @@
\version "2.15.30"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings_FullScore.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily"
\setCreateMIDI ##t
\setCreatePDF ##t
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings.ily
index 889521fa60b343fc322f4c03744a29f5bff99c51..2f4907550b18296d490d58af574316f41e51f5a4 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Settings.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Settings.ily
@@ -3,10 +3,10 @@
\include "deutsch.ly"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings_Global.ily"
-\include "Eybler_Streichquartett_B-Dur_HV192_Music_01_Allegro.ily"
-\include "Eybler_Streichquartett_B-Dur_HV192_Music_02_Adagio.ily"
-\include "Eybler_Streichquartett_B-Dur_HV192_Music_03_Menuetto.ily"
-\include "Eybler_Streichquartett_B-Dur_HV192_Music_04_Trio.ily"
-\include "Eybler_Streichquartett_B-Dur_HV192_Music_05_Finale.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings_Global.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_04_Trio.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Music_05_Finale.ily"
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily
index c17ad017a69362aff670faf079d5ea736fff7983..577cd61e40ed6e7bb531d54decc37c29c16d37c2 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Settings_FullScore.ily
@@ -1,3 +1,3 @@
\version "2.15.30"
\include "orchestrallily/oly_settings_fullscore.ily"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings.ily"
diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily
index ba0e3b924504bdc710e44d424ecc98c175736f28..4a3cdd62180a9c6bbbbbd50baa8d831070e74fdd 100644
--- a/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily
+++ b/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily
@@ -1,6 +1,6 @@
\version "2.15.30"
\include "orchestrallily/oly_settings_instrument.ily"
-\include "Eybler_Streichquartett_B-Dur_HV192_Settings.ily"
+\include "Eybler_Streichquartett_HV192_B-Dur_Settings.ily"
\paper {
#(define page-breaking ly:optimal-breaking)
diff --git a/Makefile b/Makefile
index 178bf15d6c7a5e4cd6797196a5c5cef28e2c1614..aaac8a6ce5c7c80e2ccdae995cba66f991e18dbe 100644
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,17 @@ OUT=out
instruments = VI VII Va Vc
scores = Full
-base = Eybler_Streichquartett_D-Dur_HV190
+base = Eybler_Streichquartett_HV190_D-Dur
SRCS = $(base)_Music_01_Adagio.ily $(base)_Music_02_Menuetto.ily $(base)_Music_03_Trio.ily $(base)_Music_04_Adagio.ily $(base)_Music_05_Thema.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_Instrument.ily $(base)_Settings_FullScore.ily
pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
$(scores:%=$(OUT)/$(base)_Score_%.pdf)
-base2 = Eybler_Streichquartett_c-Moll_HV191
+base2 = Eybler_Streichquartett_HV191_c-Moll
SRCS2 = $(base2)_Music_01_Allegro.ily $(base2)_Music_02_Adagio.ily $(base2)_Music_03_Menuetto.ily $(base2)_Music_04_Trio.ily $(base2)_Music_05_Finale.ily $(base2)_Settings_Global.ily $(base2)_Settings.ily $(base2)_Settings_Instrument.ily $(base2)_Settings_FullScore.ily
pdfs2 = $(instruments:%=$(OUT)/$(base2)_Instrument_%.pdf) \
$(scores:%=$(OUT)/$(base2)_Score_%.pdf)
-base3 = Eybler_Streichquartett_B-Dur_HV192
+base3 = Eybler_Streichquartett_HV192_B-Dur
SRCS3 = $(base3)_Music_01_Allegro.ily $(base3)_Music_02_Adagio.ily $(base3)_Music_03_Menuetto.ily $(base3)_Music_04_Trio.ily $(base3)_Music_05_Finale.ily $(base3)_Settings_Global.ily $(base3)_Settings.ily $(base3)_Settings_Instrument.ily $(base3)_Settings_FullScore.ily
pdfs3 = $(instruments:%=$(OUT)/$(base3)_Instrument_%.pdf) \
$(scores:%=$(OUT)/$(base3)_Score_%.pdf)
@@ -53,6 +53,7 @@ VI: VI1 VI2 VI3
VII:VII1 VII2 VII3
Va: Va1 Va2 Va3
Vc: Vc1 Vc2 Vc3
+Full: scores scores2 scores3
clean:
diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex
index c09e2109a870db07ed25d047eeb8a5cc36141be8..bf9a226a89d047669400c49af7a47c0fb72e8787 100644
--- a/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex
+++ b/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex
@@ -15,17 +15,17 @@
\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex}
-\basename{Eybler_Streichquartett_D-Dur_HV190}
+\basename{Eybler_Streichquartett_HV190_D-Dur}
\phantomsection
\addcontentsline{toc}{section}{\FullScoreType}
\includescore{Score_Full}
-\basename{Eybler_Streichquartett_c-Moll_HV191}
+\basename{Eybler_Streichquartett_HV191_c-Moll}
\phantomsection
\addcontentsline{toc}{section}{\FullScoreType}
\includescore{Score_Full}
-\basename{Eybler_Streichquartett_B-Dur_HV192}
+\basename{Eybler_Streichquartett_HV192_B-Dur}
\phantomsection
\addcontentsline{toc}{section}{\FullScoreType}
\includescore{Score_Full}
diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_Instruments.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_Instruments.tex
index c2c753767abc4cf8b26f4384de68021a39aed07a..5a0a44ade12da42a3ef8d572f6c2d2967eec05c7 100644
--- a/TeX_Eybler_Streichquartette_HV190-192_Score_Instruments.tex
+++ b/TeX_Eybler_Streichquartette_HV190-192_Score_Instruments.tex
@@ -53,7 +53,7 @@
% Remove the \iffalse if you want all instrumental parts to be included here
\iffalse
-\basename{Eybler_Streichquartett_D-Dur_HV190}
+\basename{Eybler_Streichquartett_HV190_D-Dur}
\phantomsection
\addcontentsline{toc}{chapter}{Streichquartett D-Dur}
@@ -76,7 +76,7 @@
\cleardoublepage
-\basename{Eybler_Streichquartett_c-Moll_HV191}
+\basename{Eybler_Streichquartett_HV191_c-Moll}
\phantomsection
\addcontentsline{toc}{chapter}{Streichquartett c-Moll}
@@ -99,7 +99,7 @@
\cleardoublepage
-\basename{Eybler_Streichquartett_B-Dur_HV192}
+\basename{Eybler_Streichquartett_HV192_B-Dur}
\phantomsection
\addcontentsline{toc}{chapter}{Streichquartett B-Dur}
diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex
index d39092cdbbf7f108f007dcbf7d0506a09596b80a..e447a48686faa99b16cd442a9ffa49b74901d6cc 100644
--- a/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex
+++ b/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex
@@ -15,17 +15,17 @@
\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex}
-\basename{Eybler_Streichquartett_D-Dur_HV190}
+\basename{Eybler_Streichquartett_HV190_D-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VIName}
\includescore{Instrument_VI}
-\basename{Eybler_Streichquartett_c-Moll_HV191}
+\basename{Eybler_Streichquartett_HV191_c-Moll}
\phantomsection
\addcontentsline{toc}{section}{\VIName}
\includescore{Instrument_VI}
-\basename{Eybler_Streichquartett_B-Dur_HV192}
+\basename{Eybler_Streichquartett_HV192_B-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VIName}
\includescore{Instrument_VI}
diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex
index 4032491d641a64d0678942749e0c2c4d737247f2..93b19ec9fe00ae39740a5218fc103ff8a0c52cc6 100644
--- a/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex
+++ b/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex
@@ -15,17 +15,17 @@
\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex}
-\basename{Eybler_Streichquartett_D-Dur_HV190}
+\basename{Eybler_Streichquartett_HV190_D-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VIIName}
\includescore{Instrument_VII}
-\basename{Eybler_Streichquartett_c-Moll_HV191}
+\basename{Eybler_Streichquartett_HV191_c-Moll}
\phantomsection
\addcontentsline{toc}{section}{\VIIName}
\includescore{Instrument_VII}
-\basename{Eybler_Streichquartett_B-Dur_HV192}
+\basename{Eybler_Streichquartett_HV192_B-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VIIName}
\includescore{Instrument_VII}
diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex
index 611499488995871e1c29159683ea19b3eab3a634..0cd869ca1b80b13f3f67d9934ec0cd35567915e7 100644
--- a/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex
+++ b/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex
@@ -15,17 +15,17 @@
\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex}
-\basename{Eybler_Streichquartett_D-Dur_HV190}
+\basename{Eybler_Streichquartett_HV190_D-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VaName}
\includescore{Instrument_Va}
-\basename{Eybler_Streichquartett_c-Moll_HV191}
+\basename{Eybler_Streichquartett_HV191_c-Moll}
\phantomsection
\addcontentsline{toc}{section}{\VaName}
\includescore{Instrument_Va}
-\basename{Eybler_Streichquartett_B-Dur_HV192}
+\basename{Eybler_Streichquartett_HV192_B-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VaName}
\includescore{Instrument_Va}
diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex
index 210bccde76325f2bd33e32d053612bf200b69df9..547a532cb9596dccb8e897b7c9739401a2a2a616 100644
--- a/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex
+++ b/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex
@@ -15,17 +15,17 @@
\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex}
-\basename{Eybler_Streichquartett_D-Dur_HV190}
+\basename{Eybler_Streichquartett_HV190_D-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VcName}
\includescore{Instrument_Vc}
-\basename{Eybler_Streichquartett_c-Moll_HV191}
+\basename{Eybler_Streichquartett_HV191_c-Moll}
\phantomsection
\addcontentsline{toc}{section}{\VcName}
\includescore{Instrument_Vc}
-\basename{Eybler_Streichquartett_B-Dur_HV192}
+\basename{Eybler_Streichquartett_HV192_B-Dur}
\phantomsection
\addcontentsline{toc}{section}{\VcName}
\includescore{Instrument_Vc}