diff --git a/.gitignore b/.gitignore
index 8c3f9400544f9150b9934ff278325713ed96f59e..1f055c8f4fff2ac1e1b9492bb3bf2a4feb2c6cb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 *.out
 *.backup
 TeX_*.toc
+Materialien
diff --git a/1061 - Eybler - Dies sanctificatus HV61.def b/1061 - Eybler - Dies sanctificatus HV61.def
new file mode 100644
index 0000000000000000000000000000000000000000..1e6791cef76118ecc244e7f637d782d410970bf5
--- /dev/null
+++ b/1061 - Eybler - Dies sanctificatus HV61.def	
@@ -0,0 +1,42 @@
+{
+  "output_dir": "1061 - Eybler - Dies sanctificatus HV61",
+  "version": "2.14.0",
+  "template": "EK_Full",
+  "language": "deutsch",
+  "additionalscores": [],
+  "options": ["optimal-breaking"],
+
+  "defaults": {
+    "title": "Dies sanctificatus",
+    "subtitle": "Graduale, HV 61",
+    "composer": "Joseph Eybler",
+    "composerdate": "1765-1846",
+
+    "year": "2011",
+    "publisher": "Edition Kainhofer, Vienna",
+    "publisherurl": "http://www.edition-kainhofer.com/",
+    "editor": "Reinhold Kainhofer",
+    "editorurl": "http://reinhold.kainhofer.com/",
+    "editormail": "reinhold@kainhofer.com",
+    "scorenumber": "EK-1061",
+    "scoreinfo": "Urtext",
+    "basename": "Eybler_DiesSanctificatus_HV61",
+
+    "instruments": [
+        "ClI", "ClII", "FagI", "FagII",
+        "CorI", "CorII", "TbeI", "TbeII",
+        "Tim",
+        "VI", "VII", "Va",
+        "S", "A", "T", "B",
+        "Continuo", "VcB"
+    ],
+    "vocalvoices": ["SSolo", "S", "A", "T", "B"],
+    "noscore_instruments": ["SSolo", "S", "A", "T", "B"],
+    "scores": ["Full", "Vocal", "Choral"],
+  },
+
+  "scores": ["DiesSanctificatus"],
+  "latex": {
+    "tex_options": ["nocolortitle"]
+  },
+}
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_A.ly b/Eybler_DiesSanctificatus_HV61_Instrument_A.ly
deleted file mode 100644
index 2fb5a63e0d1f8d4dee337b60d2fb1affd99c3d2d..0000000000000000000000000000000000000000
--- a/Eybler_DiesSanctificatus_HV61_Instrument_A.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.1"
-\include "Eybler_DiesSanctificatus_HV61_Settings_VocalVoice.ily"
-
-\header {
-  instrument = \AInstrumentName
-  scorenumber = \markup{\scoreNumber \ANumber}
-}
-
-\createScore #"DiesSanctificatus" #'("A")
-
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_B.ly b/Eybler_DiesSanctificatus_HV61_Instrument_B.ly
deleted file mode 100644
index 418ebccf5503bd55b8c434cb9044c559ee9f208c..0000000000000000000000000000000000000000
--- a/Eybler_DiesSanctificatus_HV61_Instrument_B.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.1"
-\include "Eybler_DiesSanctificatus_HV61_Settings_VocalVoice.ily"
-
-\header {
-  instrument = \BInstrumentName
-  scorenumber = \markup{\scoreNumber \BNumber}
-}
-
-\createScore #"DiesSanctificatus" #'("B")
-
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_ClI.ly b/Eybler_DiesSanctificatus_HV61_Instrument_ClI.ly
index 28884b09141756defb0440c0dabd9a9cc4b27e95..108f926c82f3d98fbd419eb5c9f5ad37951a26d8 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_ClI.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_ClI.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_ClII.ly b/Eybler_DiesSanctificatus_HV61_Instrument_ClII.ly
index c17270d38b0c951cf5d8730f3e8d8c9c0687d0e7..60f5512f21b3d11ed1feb564997983b415cae4eb 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_ClII.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_ClII.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly b/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly
index 4f78489d8058b7b5480d5e83e3f5483f92282501..67708b3fc7bd6b208e9ef679098a08529b4d7686 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly
@@ -1,10 +1,21 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
   instrument = \ContinuoInstrumentName
   scorenumber = \markup{\scoreNumber \ContinuoNumber}
+  arranger = "Generalbassaussetzung: R. Kainhofer"
 }
 
-\createScore #"DiesSanctificatus" #'("Continuo")
+BCRealizationExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
+ContinuoExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
+\layout {
+  \context {
+    \RemoveEmptyStaffContext
+    % To use the setting globally, uncomment the following line:
+    \override VerticalAxisGroup #'remove-first = ##t
+    \remove "Instrument_name_engraver"
+  }
+}
+\createScore #"DiesSanctificatus" #'("RealizedContinuo")
 
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_CorI.ly b/Eybler_DiesSanctificatus_HV61_Instrument_CorI.ly
index e5e3995c795657792a367713b45056677b661b75..8cc6ce112ef83dc468a5aa604a3112684d68e4aa 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_CorI.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_CorI.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_CorII.ly b/Eybler_DiesSanctificatus_HV61_Instrument_CorII.ly
index 3ef87357f3efed611ca189947cca9c002783fcba..2cacdcff906c7fa9c6c43a778f511f4db5b9bc13 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_CorII.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_CorII.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_FagI.ly b/Eybler_DiesSanctificatus_HV61_Instrument_FagI.ly
index ce472b9b99c13c3b3be87030ca02d53744212700..6168fab753b1add2e4904dd65291c5e58b9292eb 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_FagI.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_FagI.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_FagII.ly b/Eybler_DiesSanctificatus_HV61_Instrument_FagII.ly
index cf88ce714ee040d67bc872a3085f0699bdf630cb..ca866736224a98e8da37a54876182ec5a7ec6b37 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_FagII.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_FagII.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_S.ly b/Eybler_DiesSanctificatus_HV61_Instrument_S.ly
deleted file mode 100644
index c80de33418dfeebb8bfbac2864d1a5533850883a..0000000000000000000000000000000000000000
--- a/Eybler_DiesSanctificatus_HV61_Instrument_S.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.1"
-\include "Eybler_DiesSanctificatus_HV61_Settings_VocalVoice.ily"
-
-\header {
-  instrument = \SInstrumentName
-  scorenumber = \markup{\scoreNumber \SNumber}
-}
-
-\createScore #"DiesSanctificatus" #'("S")
-
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_T.ly b/Eybler_DiesSanctificatus_HV61_Instrument_T.ly
deleted file mode 100644
index 1f80ca8761828028725db78bfa925e06d9bdec57..0000000000000000000000000000000000000000
--- a/Eybler_DiesSanctificatus_HV61_Instrument_T.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.1"
-\include "Eybler_DiesSanctificatus_HV61_Settings_VocalVoice.ily"
-
-\header {
-  instrument = \TInstrumentName
-  scorenumber = \markup{\scoreNumber \TNumber}
-}
-
-\createScore #"DiesSanctificatus" #'("T")
-
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly b/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly
index f2d1d1e2448cb13dfe6454dc22d05554a1066248..d58a0f6af3ec4ad745c6ec782c08439c7959c85e 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly
@@ -1,10 +1,12 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
   instrument = \TbeIInstrumentName
+  arranger = "Von unbekannter Hand"
   scorenumber = \markup{\scoreNumber \TbeINumber}
 }
+DiesSanctificatusTbeIMusic = \XXXDiesSanctificatusTbeIMusic
 
 \createScore #"DiesSanctificatus" #'("TbeI")
 
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly b/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly
index 00fe96e964ab6d8c4d09aeeca3c87075c7aec73f..20245e87c05bd25640e78c21d427588fd5ca7348 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly
@@ -1,10 +1,12 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
   instrument = \TbeIIInstrumentName
+  arranger = "Von unbekannter Hand"
   scorenumber = \markup{\scoreNumber \TbeIINumber}
 }
+DiesSanctificatusTbeIIMusic = \XXXDiesSanctificatusTbeIIMusic
 
 \createScore #"DiesSanctificatus" #'("TbeII")
 
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly b/Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly
index 5037d5a5e8adf774e88b3656e74caf3324aa0413..a528dfeede5fd24c6b4052e386aa40c20a6f2caa 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly
@@ -1,10 +1,12 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
   instrument = \TimInstrumentName
+  arranger = "Von unbekannter Hand"
   scorenumber = \markup{\scoreNumber \TimNumber}
 }
+DiesSanctificatusTimMusic = \XXXDiesSanctificatusTimMusic
 
 \createScore #"DiesSanctificatus" #'("Tim")
 
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_VI.ly b/Eybler_DiesSanctificatus_HV61_Instrument_VI.ly
index c6440d01b7455139ed82e3290183a20f9c9e6647..1233fea65afdf9b02702fd605b2c45f49d1bcb8e 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_VI.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_VI.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_VII.ly b/Eybler_DiesSanctificatus_HV61_Instrument_VII.ly
index d0b77a9556d097a24b82486ba4ce21e147dcd6b0..d9f0fbb39ddd58920c8d7dabe3a88d32ab13cbd6 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_VII.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_VII.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_Va.ly b/Eybler_DiesSanctificatus_HV61_Instrument_Va.ly
index 520fe71cfa7095ab96ea3be1a8a61515ef7ab7cd..2b916af02cd9dce33caeded5d994a04fff8eeb43 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_Va.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_Va.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Instrument_VcB.ly b/Eybler_DiesSanctificatus_HV61_Instrument_VcB.ly
index 6970e4aa93b57d090fe57c602a7cf1798d68905d..7e4395a4557da8e9a0eed4e379a22730c872af46 100644
--- a/Eybler_DiesSanctificatus_HV61_Instrument_VcB.ly
+++ b/Eybler_DiesSanctificatus_HV61_Instrument_VcB.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily"
 
 \header {
diff --git a/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily b/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily
index eecaf81ba769248ca8662dcaf2f1f8be87da984c..f1aa737fd11d105cc36298646ef9b491eb556b6f 100644
--- a/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily
+++ b/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 
 DiesSanctificatusTempo = "Andante comodo"
 
@@ -15,13 +15,13 @@ DiesSanctificatusClIMusic = \relative c'' {
   r2 r4 r8 h16[( d]) | % 4
   g8.[(\fz fis16] e[ d c h]) a8 r r4 | % 5
   d4 h g h8[ d] | % 6
-  g4\fz d8[ h] a[ h h \slashedGrace {d8} c] | % 7
+  g4-\tag #'cued \fz d8[ h] a[ h h \slashedGrace {d8} c] | % 7
   h8 h4 h8 c d4 e8 | % 8
   d8 d4 g8 fis[ e d c] | % 9
   h8.[ c16 d8 g,] fis c'4 h8 | \barNumberCheck #10
   a8 a4 a8 h2 | % 11
-  cis2 << {d4} {s8 s\cresc} >> e8[ fis] | % 12
-  g8.[\fz e16] cis8 r r2 | % 13
+  cis2 << {d4} {s8 s-\tag #'cued \cresc} >> e8[ fis] | % 12
+  g8.[-\tag #'cued \fz e16] cis8 r r2 | % 13
   R1 | % 14
   r8 a4\f a8 a2 | % 15
   a a4. g8 | % 16
@@ -31,19 +31,19 @@ DiesSanctificatusClIMusic = \relative c'' {
   e fis g8 g,4 g8 | % 22
   fis8.[ g16 a8 h] c!4 a8[ e'] | % 23
   d4. c8 h d4 d8 | % 24
-  e4 fis g4.\fz d8 | % 25
-  h4 g a r | % 26
+  e4 fis g4.\fz \partcombineApart d8 | % 25
+  h4 g \partcombineAutomatic a r | % 26
   d4. c8 c[ h] a4 | % 27
   e'4. d8 d[ c h g] | % 28
   a[ h c d] e[ fis g] g,16[( h]) | % 29
   d4. c8 h[ a] r4 | \barNumberCheck #30
   a2 h8[ g h d] | % 31
-  g4.\fz f8 e[ d] c r | % 32
+  g4.-\tag #'cued \fz f8 e[ d] \partcombineApartOnce c r | % 32
   R1*3 | % 35
   r2 r8 fis,4\f gis8 | % 36
   a4 h c8.[ h16 a8 c] | % 37
   h4 c d8[ g, h d] | % 38
-  g2~\fz g8[ e c a] | % 39
+  g2~-\tag #'cued \fz g8[ e c a] | % 39
   fis2 g8[( d g h]) | \barNumberCheck #40
   d1~ | % 41
   d2~ d8[ g, h d] | % 42
@@ -57,8 +57,8 @@ DiesSanctificatusClIMusic = \relative c'' {
   R1 | \barNumberCheck #50
   r2 c4_\dolce \slashedGrace {c8} h16[( a h c]) | % 51
   a4 r d \slashedGrace {d8} c16[( h c d]) | % 52
-  h8.[\f d16] cis16[( d e d]) g4\fz d8 r | % 53
-  h\p r a r g8..[ h32] g16[( h d, h']) | % 54
+  h8.[\f d16] cis16[( d e d]) g4-\tag #'cued \fz d8 r | % 53
+  h\p r a r g8..[ h32] \partcombineSoloI g16[( h d, h']) | % 54
   g[( h d h]) g[( h d, h']) g8[( d16])-| r32 h'32 g16[( h d, h']) | % 55
   g[( h d h]) g[( h d, h']) g8([ d16])-| r32_\perd h' g8[( d16])-| r32 h' | % 56
   g2~ g4 r \bar"|."
@@ -76,7 +76,7 @@ DiesSanctificatusClIIMusic = \relative c'' {
   h8 h4 d8 c[ h a fis] | % 9
   g8.[ a16 h8 d,] c a'4 g8 | \barNumberCheck #10
   fis fis4 fis8 g2 | % 11
-  a2 << {h4.} {s4 s8\cresc}>> dis8 | % 12
+  a2 << {h4.} {s8 s8\cresc}>> dis8 | % 12
   e4\fz g,8 r r2 | % 13
   R1 | % 14
   r8 fis4\f fis8 e2 | % 15
@@ -128,11 +128,11 @@ DiesSanctificatusFagIMusic = \relative c' {
   g4 g g d'8[ d] | % 6
   h4.\fz d8~ d[ d a d] | % 7
   d d4 d8 g,[ d'] c4 | % 8
-  d8 d4 h8 c[ e a, d] | % 9
+  d8 d4 \partcombineApartOnce h8 c[ e a, d] | % 9
   d2~ d8 d4 e8 | \barNumberCheck #10
   a,8 d4 d8 d4 e~ | % 11
-  e << {fis2} {s4 s8 s\cresc} >> h,8[ h] | % 12
-  h8[\fz e] e r r2 | % 13
+  e << {fis2} \tag #'cued {s4 s8 s\cresc} >> h,8[ h] | % 12
+  h8[-\tag #'cued \fz e] e r r2 | % 13
   R1 | % 14
   r8 a,4\f a8 a2 | % 15
   a a~ | % 16
@@ -149,16 +149,16 @@ DiesSanctificatusFagIMusic = \relative c' {
   d g,4 a d d8~ | % 29
   d d4 e8 d4 r | \barNumberCheck #30
   d2 d | % 31
-  d4\fz c8[ g'] g[ f] e r | % 32
+  d4-\tag #'cued \fz c8[ g'] g[ f] e r | % 32
   R1*3 | % 35
   r2 r8 a,4\f d8 | % 36
   e4 d c8[ d e d] | % 37
   d4 c h8 d4 d8 | % 38
-  d2\fz e8[ c e c] | % 39
+  d2-\tag #'cued \fz e8[ c e c] | % 39
   a4. c8 h[( d, g h]) | \barNumberCheck #40
   d1~ | % 41
   d2~ d4 r | % 42
-  d2\ff c4 r | % 43
+  d2-\tag #'cued \ff c4 r | % 43
   e2 d4 r | % 44
   fis2 g8[ h, c e] | % 45
   d r d, r g r r4 | % 46
@@ -170,7 +170,7 @@ DiesSanctificatusFagIMusic = \relative c' {
   d'4 cis16[( d e d]) g,4 r | % 52
   d'\f cis16[( d e d]) d4\fz h8 r | % 53
   \clef "bass" d\p r d r h r r4 | % 54
-  r2 g8..[\solo h32] g16[( h d, h']) | % 55
+  \partcombineSoloI r2 g8..[\solo h32] g16[( h d, h']) | % 55
   g[( h d h]) g[( h d, h'])  g8[( d16])-| r32_\perd h'32 g8[( d16])-| r32 h'32 | % 56
   g2~ g4 r \bar"|."
 }
@@ -242,12 +242,12 @@ DiesSanctificatusCorIMusic = \relative c'' {
   R1 | % 12
   c4.\fz r8 r2 | % 13
   R1 | % 14
-  r2 d2\f | % 15
-  d d4 r | % 16
+  r2 \partcombineApartOnce d2-\tag #'cued \f | % 15
+  d \partcombineApartOnce d4 r | % 16
   R1*4 | \barNumberCheck #20
   g,4\f r r2 | % 21
   R1*3 | % 24
-  r2 c4.\fz g8 | % 25
+  r2 c4.\fz \partcombineApartOnce g8 | % 25
   e[ g c e] d4 r | % 26
   c r r2 | % 27
   R1*2 | % 29
@@ -322,7 +322,7 @@ DiesSanctificatusCorIIMusic = \relative c' {
 \addQuote "DiesSanctificatusCorIIMusic" { \DiesSanctificatusCorIIMusic }
 
 
-DiesSanctificatusTbeIMusic = \relative c' {
+XXXDiesSanctificatusTbeIMusic = \relative c' {
   \transposition f
   fis4\f fis8[ fis] fis4 r | % 2
   fis8[ fis fis g] g4 fis8 r8 | % 3
@@ -368,10 +368,10 @@ DiesSanctificatusTbeIMusic = \relative c' {
   d1~ | % 56
   d2~ d4 r4 \bar"|."
 }
-\addQuote "DiesSanctificatusTbeIMusic" { \DiesSanctificatusTbeIMusic }
+\addQuote "DiesSanctificatusTbeIMusic" { \XXXDiesSanctificatusTbeIMusic }
 
 
-DiesSanctificatusTbeIIMusic = \relative c' {
+XXXDiesSanctificatusTbeIIMusic = \relative c' {
   \transposition f
   d4\f d8[ d] d4 r | % 2
   d8[ d d d] d4. r8 | % 3
@@ -417,9 +417,9 @@ DiesSanctificatusTbeIIMusic = \relative c' {
   fis1~ | % 56
   fis2~ fis4 r4 \bar"|."
 }
-\addQuote "DiesSanctificatusTbeIIMusic" { \DiesSanctificatusTbeIIMusic }
+\addQuote "DiesSanctificatusTbeIIMusic" { \XXXDiesSanctificatusTbeIIMusic }
 
-DiesSanctificatusTimMusic = \relative c {
+XXXDiesSanctificatusTimMusic = \relative c {
   g4\f g8[ g] g4 r | % 2
   R1*2 | % 4
   g4 r r2 | % 5
@@ -452,7 +452,7 @@ DiesSanctificatusTimMusic = \relative c {
   g1~ | % 56
   g2~ g4\stopTrillSpan r4 \bar"|."
 }
-\addQuote "DiesSanctificatusTimMusic" { \DiesSanctificatusTimMusic }
+\addQuote "DiesSanctificatusTimMusic" { \XXXDiesSanctificatusTimMusic }
 
 DiesSanctificatusVIMusic = \relative c'' {
   d4\f h16[( g d h']) g8.[ d16] h'[( g) d'( h]) | % 2
@@ -757,7 +757,7 @@ DiesSanctificatusAMusic = \relative c'' {
   g4 g8\cresc g g h a16[(\p g]) fis[( g]) | % 49
   d8 d fis g g8.[( a16]) fis8 r | \barNumberCheck #50
   r2 c'4^\dolce \slashedGrace{c8} h16[( a]) h[( c]) | % 51
-  a4 r c4 \slashedGrace {d8} c16[( h]) c[( d]) | % 52
+  a4 r d4 \slashedGrace {d8} c16[( h]) c[( d]) | % 52
   h4\f g8 g h4\fz g8 r | % 53
   g4\p d8 c h4 r | % 54
   r h8 h h4 h8 h8 | % 55
@@ -1006,7 +1006,7 @@ DiesSanctificatusVcBMusic = \relative c {
   r2 \once \override ParenthesesItem #'stencils = #bracket-stencils fis8-\parenthesize^\pizz r g r |
   d r r4 h8 r d r |
   g,8[\f^\arco g' g g] g,[\fz h d g] |
-  d r r4 << { \once \override InstrumentSwitch #'direction = #DOWN \voiceTwo \cueText "Basso / Organo" g,2~\p |
+  d r r4 << { \once \override InstrumentSwitch #'direction = #DOWN \voiceTwo \cueText "Basso / Organo" \dynamicsX #-3 g,2~\p |
   g1~ |
   << {g1~} {s2 s_\perd} >> |
   g2~ g4 } \new Voice { \voiceOne \cueText "Cello"  <g d'>2~ | <g d'>1~ | <g d'>1~ | <g d'>2~ <g d'>4}>> \oneVoice r \bar"|."
@@ -1014,7 +1014,7 @@ DiesSanctificatusVcBMusic = \relative c {
 \addQuote "DiesSanctificatusVcBMusic" { \DiesSanctificatusVcBMusic }
 
 
-DiesSanctificatusBCFbMusic = \figuremode {
+DiesSanctificatusBCFbMusic = \figuremode {\bassFigureStaffAlignmentDown
   s1\solo | % 2
   s1*3 | % 5
   s1\tutti | % 6
@@ -1056,6 +1056,11 @@ DiesSanctificatusBCFbMusic = \figuremode {
   s1*10 \bar"|."
 }
 
+DiesSanctificatusBCRealizationMusic = \relative c'' {
+  % TODO
+  \repeat unfold 56 { s1 }  \barNumberCheck #57
+}
+
 DiesSanctificatusBCMusic = \DiesSanctificatusVcBMusic
 \addQuote "DiesSanctificatusBCMusic" { \DiesSanctificatusBCMusic }
 
diff --git a/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus_Piano.ily b/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus_Piano.ily
new file mode 100644
index 0000000000000000000000000000000000000000..f396cf180f25f5c3979777c6e7f9f99acc44f308
--- /dev/null
+++ b/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus_Piano.ily
@@ -0,0 +1,20 @@
+\version "2.14.0"
+
+DiesSanctificatusTempo = "Andante comodo"
+
+DiesSanctificatusKey = \key g \major
+DiesSanctificatusTimeSignature = \time 4/4
+
+DiesSanctificatusSettings = \notemode {
+  \tempo \DiesSanctificatusTempo
+}
+
+
+DiesSanctificatusPIMusic = \relative c'' {
+  % TODO
+  \repeat unfold 56 { s1 }  \barNumberCheck #57
+}
+DiesSanctificatusPIIMusic = \relative c {
+  % TODO
+  \repeat unfold 56 { s1 }  \barNumberCheck #57
+}
diff --git a/Eybler_DiesSanctificatus_HV61_Score_Choral.ly b/Eybler_DiesSanctificatus_HV61_Score_Choral.ly
index 3ff63255dbeaee49dc16e56aa780a37d7c26173d..30031db745668822c33ab33420543a4a65240a04 100644
--- a/Eybler_DiesSanctificatus_HV61_Score_Choral.ly
+++ b/Eybler_DiesSanctificatus_HV61_Score_Choral.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_ChoralScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
diff --git a/Eybler_DiesSanctificatus_HV61_Score_Full.ly b/Eybler_DiesSanctificatus_HV61_Score_Full.ly
index b88408684b2aeeb12f5fad3ef3ed0fa1312a83b7..2d165ba06b8acfccddbc68de079965f7de6c3657 100644
--- a/Eybler_DiesSanctificatus_HV61_Score_Full.ly
+++ b/Eybler_DiesSanctificatus_HV61_Score_Full.ly
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
@@ -8,4 +8,34 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
+\paper {
+    top-markup-spacing #'minimum-distance = #5
+%   top-markup-spacing #'space = #4
+%   top-markup-spacing #'padding = #2
+  top-markup-spacing #'stretchability = #15
+
+  top-system-spacing #'minimum-distance = #0
+%   top-system-spacing #'space = #3
+  top-system-spacing #'padding = #1
+  top-system-spacing #'stretchability = #13
+  
+  markup-system-spacing #'minimum-distance = #5
+%   markup-system-spacing #'space = #4
+  markup-system-spacing #'padding = #1
+  markup-system-spacing #'stretchability = #25
+  
+  system-system-spacing #'minimum-distance = #0
+%   system-system-spacing #'space = #5
+  system-system-spacing #'padding = #1
+  system-system-spacing #'stretchability = #15
+  
+  last-bottom-spacing #'basic-distance = #3
+%   last-bottom-spacing #'space = #7
+  last-bottom-spacing #'padding = #1
+  last-bottom-spacing #'stretchability = #14
+
+%   score-markup-spacing #'space = #5
+%   score-markup-spacing #'stretchability = #15
+
+}
 \createNoCuesScore #"DiesSanctificatus" #'("FullScore")
diff --git a/Eybler_DiesSanctificatus_HV61_Score_Original.ly b/Eybler_DiesSanctificatus_HV61_Score_Original.ly
index fba546b67fa5703cb7a17178da574b27dd273d7a..78de8ef781c864e19166834842a0912bfb77f4f3 100644
--- a/Eybler_DiesSanctificatus_HV61_Score_Original.ly
+++ b/Eybler_DiesSanctificatus_HV61_Score_Original.ly
@@ -1,14 +1,10 @@
 \version "2.13.1"
+#(ly:set-option 'ancient-style #t)
 \include "Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily"
-\setCreateMIDI ##t
-\setCreatePDF ##t
 
 \header {
   scoretype = \OriginalScoreTitle
   scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
 }
-SClef = \clef "soprano"
-AClef = \clef "alto"
-TClef = \clef "tenor"
 
 \createNoCuesScore #"DiesSanctificatus" #'("BrLong" "WdLong" "Tim" "Str" "Ch" "Continuo")
diff --git a/Eybler_DiesSanctificatus_HV61_Score_Vocal.ly b/Eybler_DiesSanctificatus_HV61_Score_Vocal.ly
index 175f664ef4bc4071cdd7e2719d78b25b6d9891b3..b1fe0f7ca9432a5a0979eb47f1b61c93c166e13e 100644
--- a/Eybler_DiesSanctificatus_HV61_Score_Vocal.ly
+++ b/Eybler_DiesSanctificatus_HV61_Score_Vocal.ly
@@ -1,5 +1,6 @@
-\version "2.13.1"
+\version "2.14.0"
 \include "Eybler_DiesSanctificatus_HV61_Settings_VocalScore.ily"
+\include "Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus_Piano.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
@@ -8,4 +9,15 @@
   scorenumber = \markup{\scoreNumber \VocalScoreNumber}
 }
 
+PIExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
+PIIExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
+
+\layout {
+  \context {
+    \Score
+    \override SpacingSpanner
+              #'base-shortest-duration = #(ly:make-moment 1 64)
+  }
+}
+
 \createScore #"DiesSanctificatus" #'("VocalScore")
diff --git a/Eybler_DiesSanctificatus_HV61_Settings.ily b/Eybler_DiesSanctificatus_HV61_Settings.ily
index ca45106c8c3469373adc90736dd55915306ad403..ba7a2363482585fe1cab215470ab86380d369bca 100644
--- a/Eybler_DiesSanctificatus_HV61_Settings.ily
+++ b/Eybler_DiesSanctificatus_HV61_Settings.ily
@@ -1,3 +1,4 @@
+\version "2.14.0"
 #(ly:set-option 'point-and-click #f)
 
 \include "deutsch.ly"
diff --git a/Eybler_DiesSanctificatus_HV61_Settings_ChoralScore.ily b/Eybler_DiesSanctificatus_HV61_Settings_ChoralScore.ily
index 654b6f91124f7d7f91d7948ed88a410c129b2e50..548971a4ddc8fdd52571d00170503be86ab89777 100644
--- a/Eybler_DiesSanctificatus_HV61_Settings_ChoralScore.ily
+++ b/Eybler_DiesSanctificatus_HV61_Settings_ChoralScore.ily
@@ -1,2 +1,3 @@
+\version "2.14.0"
 \include "orchestrallily/oly_settings_choralscore.ily"
 \include "Eybler_DiesSanctificatus_HV61_Settings.ily"
diff --git a/Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily b/Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily
index eb32a56c6a5d412c79528bd07d9ec4ae4dec0e70..92184b9a253c6dd1e4c652eaf00e10c1f4e4f542 100644
--- a/Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily
+++ b/Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily
@@ -1,18 +1,4 @@
+\version "2.14.0"
 \include "orchestrallily/oly_settings_fullscore.ily"
 \include "Eybler_DiesSanctificatus_HV61_Settings.ily"
-
-DiesSanctificatusTbeISettings = {
-    \set Staff.fontSize = #-4
-    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-    \DiesSanctificatusSettings
-}
-DiesSanctificatusTbeIISettings = {
-    \set Staff.fontSize = #-4
-    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-    \DiesSanctificatusSettings
-}
-DiesSanctificatusTimSettings = {
-    \set Staff.fontSize = #-4
-    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-    \DiesSanctificatusSettings
-}
+#(set-global-staff-size 15)
diff --git a/Eybler_DiesSanctificatus_HV61_Settings_Global.ily b/Eybler_DiesSanctificatus_HV61_Settings_Global.ily
index 0aace7f791fdcdb89f880d3a7f84c82b2314b23e..11ddd996be9c0833d09d3879ba0ada78781a2738 100644
--- a/Eybler_DiesSanctificatus_HV61_Settings_Global.ily
+++ b/Eybler_DiesSanctificatus_HV61_Settings_Global.ily
@@ -1,4 +1,4 @@
-\version "2.13.1"
+\version "2.14.0"
 
 \include "orchestrallily/oly_settings_names.ily"
 
@@ -6,21 +6,20 @@ scorenumber="EK-1061"
 
 \header {
   title = "Dies sanctificatus"
+  titlepagetitle = "Dies sanctificatus"
   subtitle = "Graduale, HV 61"
+  titlepagesubtitle = "Graduale, HV 61"
   composer = "Joseph Eybler (1765-1846)"
   copyright = \markup \abs-fontsize #9 \column{
-      \line { "2009, " \concat{\with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna},} \concat{\scorenumber.} "Alle Rechte vorbehalten / All rights reserved / Printed in Austria."}
-      \line {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
+      \line { 2011, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\fromproperty #'header:scorenumber .} Alle Rechte vorbehalten / All rights reserved / Printed in Austria. }
+%       \line {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
   }
 }
 
 %% Possibly adjust the \orchestralScoreStructure here...
 
-\layout {
-  \context { \Lyrics
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
-  }
-}
+% #(oly:modify_score_structure '("BassGroup" "StaffGroup" ("RealizedContinuo")))
+#(oly:modify_score_structure '("BassGroup" "StaffGroup" ("Continuo")))
 
 %% Add custom keys here, e.g.
 CorKey = \key c \major
@@ -35,13 +34,14 @@ CorInstrumentName = \markup\center-column{"Corni" "in G"}
 CorIInstrumentName = \markup\center-column{"Corno I" "in G"}
 CorIIInstrumentName = \markup\center-column{"Corno II" "in G"}
 
-TbeInstrumentName = \markup\center-column{"Trombe" "in F"}
-TbeIInstrumentName = \markup\center-column{"Tromba I" "in F"}
-TbeIIInstrumentName = \markup\center-column{"Tromba II" "in F"}
+TbeInstrumentName = \markup\center-column{"Trombe in F" "(ad lib.)"}
+TbeIInstrumentName = \markup\center-column{"Tromba I in F" "(ad lib.)"}
+TbeIIInstrumentName = \markup\center-column{"Tromba II in F" "(ad lib.)"}
 
-TimInstrumentName = \markup\center-column{"Timpani" "in G,D"}
+TimInstrumentName = \markup\center-column{"Timpani in G,D"  "(ad lib.)"}
 
+SClef = \clef "soprano/treble"
+AClef = \clef "alto/treble"
+TClef = \clef "tenor/treble_8"
 
-SClef = \clef "soprano"
-AClef = \clef "alto"
-TClef = \clef "tenor"
+VaInstrumentName = "Viole"
diff --git a/Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily b/Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily
index a6b6b1be262b013fda55ff8632562e0982ce6032..2eba6904347fe8b67a1a14b7456427fc98714aeb 100644
--- a/Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily
+++ b/Eybler_DiesSanctificatus_HV61_Settings_Instrument.ily
@@ -1,3 +1,4 @@
+\version "2.14.0"
 \include "orchestrallily/oly_settings_instrument.ily"
 \include "Eybler_DiesSanctificatus_HV61_Settings.ily"
 
diff --git a/Eybler_DiesSanctificatus_HV61_Settings_VocalScore.ily b/Eybler_DiesSanctificatus_HV61_Settings_VocalScore.ily
index a4b7cacad5f52a0e311370d747c0ad5c1e8e5638..2f45a15e8e02bb3f3771e719a33b371a0d2efc1f 100644
--- a/Eybler_DiesSanctificatus_HV61_Settings_VocalScore.ily
+++ b/Eybler_DiesSanctificatus_HV61_Settings_VocalScore.ily
@@ -1,2 +1,7 @@
+\version "2.14.0"
 \include "orchestrallily/oly_settings_vocalscore.ily"
 \include "Eybler_DiesSanctificatus_HV61_Settings.ily"
+
+#(oly:modify_score_structure  '("P" "PianoStaff" ("PIa" "PDynamics" "PII")))
+#(oly:modify_score_structure '("PIa" "ParallelVoicesStaff" ("PI" "PCues")))
+#(oly:modify_score_structure '("PDynamics" "Dynamics" ()))
diff --git a/Makefile b/Makefile
index debbccb62ce5b22e03609351c543615ebf6a0457..9a7e581ec11eaeb04d446545c5ae68210f3d45f2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,22 @@ OUT=out
 
 base = Eybler_DiesSanctificatus_HV61
 SRCS = $(base)_Music_DiesSanctificatus.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
-instruments = ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Continuo VcB
-scores = Long Full Vocal Choral Original
+instruments = ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va Continuo VcB
+scores = Full Vocal Choral
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
 
 
 texbase = Eybler_DiesSanctificatus_HV61
-texscores = Long Full Vocal Choral Original
+texscores = Full Vocal
+# Choral
 texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
 texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
+distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(OUT)/$(base)_Score_Choral.pdf $(texpdfs)
 
-additionalscores = 
+additionalscores =
 
 .PHONY: all clean
 all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
@@ -48,6 +50,20 @@ tex: $(additionalscores) latex
 latex: $(pdfs) $(texpdfs)
 latexpdf: $(texpdfs)
 
-$(OUT)/TeX_%.pdf : TeX_%.tex
-	TEXINPUTS=$(OUT):orchestrallily/:.//: latex --output-directory=$(OUT)/ $<
+VocalScore: $(OUT)/$(base)_Score_Vocal.pdf $(OUT)/TeX_$(base)_Score_Vocal.pdf $(SRCS)
+
 
+$(OUT)/TeX_%.pdf : TeX_%.tex
+	TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex --output-directory=$(OUT)/ $<
+
+zipdir = $(base)_Final
+dist: $(distfiles)
+	mkdir -p $(zipdir)
+	cp -r $(distfiles) $(zipdir)
+	rename 's/TeX_//' $(zipdir)/*
+	rename 's/Score_(Full|Long)\./Score./' $(zipdir)/*
+	zip -jr $(base).zip $(zipdir)
+	rm -rf $(zipdir)
+
+webshop: $(distfiles)
+	python ../../Diverses/Webshop/EditionKainhofer_CSVI_Generate.py "1061 - Eybler - Dies sanctificatus HV6.def" $(distfiles)
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_About.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_About.itex
index 4f6cf69999345257f69fbb4366c76891ad98f100..2d199ed49c35931b12af910dce94b1915ae9527b 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Include_About.itex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_About.itex
@@ -1,6 +1,6 @@
 \addcontentsline{toc}{section}{Vorwort / Preface}
 
-\begin{multicols}{2}
+\begin{multicols}{2}\raggedcolumns
 \prefacesection{Vorwort}
 TODO
 \columnbreak
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex
index e6b294027ed18e4efe1317e48eb6d3036042bedd..d78c1d85cb602658869b46baec95ff517c0ecf27 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex
@@ -1,60 +1,6 @@
-\begin{center}
-
-\begin{minipage}{0.5\textwidth}
-\tableofcontents
-\end{minipage}
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_TOC.itex}
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex}
 \vfill
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex}
 \vfill
-
-\end{center}
-
-
-
-\begin{center}
-
-\scorelistbox{
-Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
-
-\FullScoreName{} (-\FullScoreNumber),
-\ParticellScoreName{} (-\ParticellScoreNumber);
-
-\ChoralScoreName{} (-\ChoralScoreNumber);
-\SName{} (-\SNumber),
-\AName{} (-\ANumber),
-\TName{} (-\TNumber),
-\BName{} (-\BNumber);
-
-\InstrumentsName{} (-\InstrumentsNumber),
-\ContinuoName{} (-\ContinuoNumber),
-\VIName{} (-\VINumber),
-\VIIName{} (-\VIINumber),
-\VaName{} (-\VaNumber),
-\VcBName{} (-\VcBNumber),
-\ClIName{} (-\ClINumber),
-\ClIIName{} (-\ClIINumber),
-\FagIName{} (-\FagINumber),
-\FagIIName{} (-\FagIINumber),
-\CorIName{} (-\CorINumber),
-\CorIIName{} (-\CorIINumber),
-\TbeIName{} (-\TbeINumber),
-\TbeIIName{} (-\TbeIINumber),
-\TimName{} (-\TimNumber).
-}
-\end{center}
-
-\vfill
-\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
-\begin{hauptquellen}
-\item Autographe Partitur, Archiv des Schottenstifts, Wien, Signatur: TODO.
-\item Handschriftlicher Stimmensatz des ehemaligen k.k. Hofmusikkapellen-Archivs, Musiksammlung der Österr. Nationalbibliothek, Wien, Signatur: HK.2511 Mus, 1827.
-\item Graduale \textnumero4 (\q{Dies sanctificatus illuxit nobis}), Originalausgabe, Tobias Haslinger, Wien, 1829. Partitur (T.H.5244) und Stimmensatz (T.H.5247).
-\end{hauptquellen}
-
-\vfill
-
-\makeatletter
-\copyrightbox{© \@year, \@publisher\newline
-1. Auflage / 1st Printing \@year\newline
-Computersatz mit \@software\newline
-Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
-
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Copyrightbox.itex}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_Copyrightbox.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_Copyrightbox.itex
new file mode 100644
index 0000000000000000000000000000000000000000..035cd31d89121d019af1284162c973a3cf624bda
--- /dev/null
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_Copyrightbox.itex
@@ -0,0 +1,7 @@
+\makeatletter
+\copyrightbox{© \@year, \@publisher. 1. Auflage / 1st Printing \@year\newline
+\ifx\@scorenumber\@empty\else\@scorenumber\ifx\@ismn\@empty\else, \fi\fi\ifx\@ismn\@empty\else%
+ISMN \@ismn\fi\newline
+Computersatz mit \@software\newline
+Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
+\makeatother
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex
index 4ea84e623dd4ab5723bb8d48891a4a860ba4b748..2b63b0c2c06be148b1103a5b51d45da09e43cf4a 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex
@@ -8,8 +8,39 @@
 \begin{thebibliography}{AA}
 
 \bibitem[A]{Aut}
-Autographe Partitur, im Besitz des Musikarchiv des Schottenstiftes, Wien. Signatur: TODO
-\newblock TODO
+Autographe Partitur, im Besitz des Archiv des Schottenstiftes, Wien. Archivkodex: A-Ws Codex 571(440)/15.
+
+6 fol. (32,5 $\times$ 23 cm, Querformat), je 2 Blätter auf einem Bogen gefaltet, mit Faden-Rückenstichen geheftet. Fol. 6 (6r und 6v) leer, nur Notenzeilen.
+Paginierung sowohl nach Zahl der Blätter als auch Zahl der Bögen.
+Aufbewahrt in einem Kartonumschlag mit 21 weiteren Graduale von Eybler.
+
+Wasserzeichen: Schwertlilie.
+
+Titel: \q{\underline{Graduale de Tempore}}, rechts oberhalb davon klein \q{\sout{IMS.}}
+Auf erster Seite unten mittig mit heller brauner Tinte die Plattennummer \q{5244.} des Drucks bei Haslinger eingetragen.
+
+Eine Akkolade pro Seite, Anordnung der Stimmen (nur auf der Titelseite bezeichnet, keine weitere Klammersetzung):
+\begin{sourcetitle}
+Corni in G\sbreak
+Clarinetti in C\sbreak
+Fagotti\sbreak
+V.1\textsuperscript{mo}\sbreak
+V.2\textsuperscript{do}\sbreak
+Viole\sbreak
+Soprano (im Sopranschlüssel)\sbreak
+Alto (im Altschlüssel)\sbreak
+Tenore (im Tenorschlüssel)\sbreak
+Basso\sbreak
+Organo con Bassi
+\end{sourcetitle}
+
+Bei mehreren Instrumenten pro Notenzeile ist am Beginn des Systems für jedes Instrument ein eigener Schlüssel notiert.
+
+Signiert am Ende des Stückes (6v, rechts unten):
+\begin{sourcetitle}
+da me Giuseppe Eybler mpia\sbreak
+$\overline{827}$.
+\end{sourcetitle}
 
 \bibitem[B]{HS1}
 Handschriftlicher Stimmensatz (aus dem Hofmusikkapellenarchiv) im Besitz der
@@ -275,6 +306,10 @@ jedoch nur \q{6} in allen anderen Quellen.
 % entweder die Bezifferung \q{6} wie in der Partitur oder besser \q{4-3}. Die
 % vorliegende Ausgabe hält sich jedoch dennoch an die Stimme und setzt \q{6}.
 
+10 Continuo: Extender Linie in \cite{Aut,HS1} korrekt auf der zweiten bis
+vierten Achtelnote, in der gedruckten Partitur \cite{TH5244} nur bis zur dritten
+Achtelnote, in den gedruckten Stimmen \cite{TH5247} bereits ab der ersten Achtelnote.
+
 11: \q{cres.} in vielen Fällen auf oder knapp vor den vierten Schlag, in \cite{Aut}
 in B/Cl/Fag/V1/V2/Va/VcB jedoch bereits eine Achtel oder Sechzehntel vor
 dem vierten Schlag, in \cite{TH5244} tw. nur sehr knapp vor dem vierten Schlag oder
@@ -282,6 +317,8 @@ auf den vierten Schlag, in \cite{TH5247} tw. (durch das Layout bedingt) bereits
 auf den zweiten (Cl2) oder dritten (Fag2) Schlag. In der vorliegenden Ausgabe vereinheitlicht
 auf die zweite Achtel des dritten Schlags.
 
+16 S: In \cite{TH5247} pp, in allen anderen Quellen \cite{Aut,TH5244} nur p.
+
 17 S/T: Erster Bogen in den Partituren \cite{Aut,TH5244} als Legatobogen über
 die gesamten ersten beiden Schläge, korrigiert auf Melismabogen nur über die
 Achtel- und die Viertelnote wie in den Stimme \cite{HS1,TH5247}.
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex
new file mode 100644
index 0000000000000000000000000000000000000000..d684847cea5de83c207396b5810a4de8156b301b
--- /dev/null
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex
@@ -0,0 +1,30 @@
+\begin{center}
+
+\scorelistbox{
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+\FullScoreName{} (-\FullScoreNumber),
+\VocalScoreName{} (-\VocalScoreNumber),
+\ChoralScoreName{} (-\ChoralScoreNumber);
+
+\InstrumentsName{} (-\InstrumentsNumber),
+\ContinuoName{} (-\ContinuoNumber),
+\VIName{} (-\VINumber),
+\VIIName{} (-\VIINumber),
+\VaName{} (-\VaNumber),
+\VcBName{} (-\VcBNumber),
+\ClIName{} (-\ClINumber),
+\ClIIName{} (-\ClIINumber),
+\FagIName{} (-\FagINumber),
+\FagIIName{} (-\FagIINumber),
+\CorIName{} (-\CorINumber),
+\CorIIName{} (-\CorIINumber).
+
+\begin{small}
+Von unbekannter Hand: 
+\TbeIName{} (-\TbeINumber),
+\TbeIIName{} (-\TbeIINumber),
+\TimName{} (-\TimNumber).
+\end{small}
+}
+\end{center}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex
new file mode 100644
index 0000000000000000000000000000000000000000..a5a5faa3e335429c2fa6732ebe226dc788b3586e
--- /dev/null
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex
@@ -0,0 +1,6 @@
+\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+\begin{hauptquellen}
+\item Autographe Partitur, Archiv des Schottenstifts, Wien. A-Ws Codex 571(440)/15.
+\item Handschriftlicher Stimmensatz des ehemaligen k.k. Hofmusikkapellen-Archivs, Musiksammlung der Österr. Nationalbibliothek, Wien. A-Whk HK.2511 Mus, 1827.
+\item Graduale \textnumero4 (\q{Dies sanctificatus illuxit nobis}), Originalausgabe, Tobias Haslinger, Wien, 1829. Partitur (T.H.5244) und Stimmensatz (T.H.5247).
+\end{hauptquellen}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_TOC.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_TOC.itex
new file mode 100644
index 0000000000000000000000000000000000000000..df458609ccc173f6d6e3073fd2d2e5a904f71a4f
--- /dev/null
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_TOC.itex
@@ -0,0 +1,7 @@
+\begin{center}
+\begin{minipage}{0.5\textwidth}
+\tableofcontents
+\end{minipage}
+\vfill
+\vfill
+\end{center}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex b/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex
index 9614bda7f72654a50b502a04c013843674ce68c9..1d7afd68dc5809a7d44a4c846b357542a17b40be 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex
@@ -1,9 +1,8 @@
-\todos{
-\chapter*{Offene Fragen}
-
-\begin{itemize}
-\item 7 FB: Extender nur auf letzte Achtel!
-\item 10 FB: Extender auf 2.-4. Achtel.
-\end{itemize}
-
-}
+% \todos{
+% \chapter*{Offene Fragen}
+% 
+% \begin{itemize}
+% \item 
+% \end{itemize}
+% 
+% }
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Score_Choral.tex b/TeX_Eybler_DiesSanctificatus_HV61_Score_Choral.tex
index 4ca61735f364f117534e2df825689f8aa060db5d..a54c6c0acc5de1437906cc109237e12923d26e20 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Score_Choral.tex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Score_Choral.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{editionkainhofer}
+\usepackage[nocolortitle,choralscore]{editionkainhofer}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,7 @@
 
 \scoretype{\ChoralScoreType}
 \scorenumber{\scoreNumber\ChoralScoreNumber}
-\ChoralScoreSettings
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Coverpage.itex}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.tex b/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.tex
index 6933847c826074539253a49723ab9fc952a025a6..b5dd7bf660362418e59fcc6f161d7049bb7ccfa8 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.tex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{editionkainhofer}
+\usepackage[nocolortitle,fullscore]{editionkainhofer}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,7 @@
 
 \scoretype{\FullScoreType}
 \scorenumber{\scoreNumber\FullScoreNumber}
-\FullScoreSettings
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Coverpage.itex}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex b/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex
index 07ff49f4653204276f10da7c79c9e6a6b0116d0f..c5f8bb462922c63d1345023c6f3d43dcab4dde2a 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex
@@ -1,38 +1,68 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{editionkainhofer}
+\usepackage[nocolortitle,instrumentalparts]{editionkainhofer}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \InstrumentalPartsType},
 }
 
+\makeatletter
+\frontpageinstrumentation{\@instrumentation}
+\frontpageeditor{\@editor}
+\makeatother
+
 \scoretype{\InstrumentalPartsType}
 \scorenumber{\scoreNumber\InstrumentalPartsNumber}
-\InstrumentalPartsSettings
+% \ismn{XXXXXXXX}
+
+\todos{
+\begin{center}
+\null
+\vfill
+\section*{\Huge Inhalt / Contents}
+\begin{Large}
+
+\ContinuoName\\
+4 $\times$ \VIName\\
+3 $\times$ \VIIName\\
+3 $\times$ \VaName\\
+3 $\times$ \VcBName\\
+\ClIName\\
+\ClIIName\\
+\FagIName\\
+\FagIIName\\
+\CorIName\\
+\CorIIName\\[1em]
+
+\begin{small}
+Von unbekannter Hand:\\
+\TbeIName\\
+\TbeIIName\\
+\TimName\\
+\end{small}
+
+\end{Large}
+\end{center}
+\vfill
+\vfill
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex}
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex}
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Copyrightbox.itex}
+}
+
+\pagestyle{empty}
 
 \begin{document}
-\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Coverpage.itex}
-\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Preface_Long.itex}
+\makefrontpage
 
+% Remove the \iffalse if you want all instrumental parts to be included here
+\iffalse
 
 
 \phantomsection
 \addcontentsline{toc}{section}{\ContinuoName}
 \includescore{Instrument_Continuo}
 
-\phantomsection
-\addcontentsline{toc}{section}{\SName}
-\includescore{Instrument_S}
-\phantomsection
-\addcontentsline{toc}{section}{\AName}
-\includescore{Instrument_A}
-\phantomsection
-\addcontentsline{toc}{section}{\TName}
-\includescore{Instrument_T}
-\phantomsection
-\addcontentsline{toc}{section}{\BName}
-\includescore{Instrument_B}
-
 \phantomsection
 \addcontentsline{toc}{section}{\VIName}
 \includescore{Instrument_VI}
@@ -74,10 +104,21 @@
 \addcontentsline{toc}{section}{\TimName}
 \includescore{Instrument_Tim}
 
-\cleardoublepage
-\backmatter
-\appendix
-\input{TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex}
+\fi
+
+\pagebreak
+\pagestyle{empty}
+\thispagestyle{empty}
+
+
+\begin{preface}
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_About.itex}
+% \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex}
+\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex}
+\end{preface}
 
-\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Backpage.itex}
+\thispagestyle{empty}
+\pagebreak
+\thispagestyle{empty}
+\backpage
 \end{document}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Score_Long.tex b/TeX_Eybler_DiesSanctificatus_HV61_Score_Long.tex
index c9ce0765f44c3e7622217b21e43bdf1630534607..e965dbdfe679b92b10aa699d03e603a6fa3303c8 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Score_Long.tex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Score_Long.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{editionkainhofer}
+\usepackage[fullscore,nocolortitle]{editionkainhofer}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,6 @@
 
 \scoretype{\LongScoreType}
 \scorenumber{\scoreNumber\LongScoreNumber}
-\LongScoreSettings
 
 \begin{document}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Coverpage.itex}
@@ -20,9 +19,9 @@
 \includescore{Score_Long}
 
 
-\cleardoublepage
-\backmatter
-\appendix
+% \cleardoublepage
+% \backmatter
+% \appendix
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex}
 
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Backpage.itex}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Score_Original.tex b/TeX_Eybler_DiesSanctificatus_HV61_Score_Original.tex
index eee1cb2ab682b290b3b6aa75d9249af1c031c5db..45929958c54249779e621ea7eb3c0b6d9c806238 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Score_Original.tex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Score_Original.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{editionkainhofer}
+\usepackage[fullscore,nocolortitle]{editionkainhofer}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,6 @@
 
 \scoretype{\OriginalScoreType}
 \scorenumber{\scoreNumber\OriginalScoreNumber}
-\OriginalScoreSettings
 
 \begin{document}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Coverpage.itex}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.tex b/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.tex
index 77ede63a52fb0bfe1b4d5312740a094a93c1fe91..96f873f2e1f92a91804b672aa9fc41457d9867c7 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.tex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[vocalscore]{editionkainhofer}
+\usepackage[nocolortitle,vocalscore]{editionkainhofer}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Settings.itex}
 
 \hypersetup{
@@ -8,7 +8,7 @@
 
 \scoretype{\VocalScoreType}
 \scorenumber{\scoreNumber\VocalScoreNumber}
-\VocalScoreSettings
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Coverpage.itex}
diff --git a/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex b/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex
index 4564d0153ad0eeed91c49511b115c2723a2dd514..63ce235ab90af0caff7f66a181b2ba39b39e64be 100644
--- a/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex
+++ b/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex
@@ -3,10 +3,12 @@
 \composer{Joseph Eybler}
 \composerdate{(1765-1846)}
 \description{Per Coro (SATB) e Orchestra}
-\instrumentation{2 Clarinetti, 2 Fagotti\\2 Corni, (2 Trombe), (Timpani)\\2 Violini, Viola, Violoncello\\Contrabasso ed Organo}
+\instrumentation{2 Clarinetti, 2 Fagotti\\2 Corni\\2 Violini, Viole, Violoncello\\Contrabbasso ed Organo}
 \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
-\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
-\year{2009}
+\publisherurl{http://www.edition-kainhofer.com/}
+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna, http://www.edition-kainhofer.com/}}
+\shortpublisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
+\year{2011}
 \scoreinfo{Urtext}
 
 \basename{Eybler_DiesSanctificatus_HV61}
@@ -20,3 +22,4 @@
 }
 
 \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex}
+\renewcommand{\VaName}{Viole}
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_A.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_A.pdf
deleted file mode 100644
index 203a822e10398919f73466c08db81366013f5a52..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_A.pdf and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_B.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_B.pdf
deleted file mode 100644
index 0240808d4d9a7813c1389bfdb0e1d291a75db207..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_B.pdf and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_ClI.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_ClI.pdf
index 84d01596a8331f573b84228c91542863e3050df0..3ca1d7fb499cb167d9a3515b8034c2788bf16d56 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_ClI.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_ClI.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_ClII.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_ClII.pdf
index 975174ac43dd9b90080c27c5798ed5b5ac1aecb5..8b5241d885351404dde9be5f0792253f819b5ad0 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_ClII.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_ClII.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.pdf
index 7ce43f4bbac47b58734b78543ebe9c2d62b822d3..b3f7d175878c57e8c3a0fe4152923425df6141b8 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_CorI.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_CorI.pdf
index 3eb12be2a9b39888fc1ac38678fe0807602f931c..d25c5567abc9b98eca87af3005672810044fac48 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_CorI.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_CorI.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_CorII.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_CorII.pdf
index 30039fc42942593fd58b76636a5d7949d53b3d69..ffee9f48fa9cb1f3fdc620f330245a8127d8737a 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_CorII.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_CorII.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_FagI.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_FagI.pdf
index bee52cce305def90489aa13d7d9f6dd44d1e0722..7143f1b0a0620f01a7eb1a0096d7379aafbc8c2c 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_FagI.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_FagI.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_FagII.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_FagII.pdf
index c3de26a0aee3932b38ce8450a083a065763195fd..261a3ee43c20f7e51b5f2ce60f558afb16217f27 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_FagII.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_FagII.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_S.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_S.pdf
deleted file mode 100644
index ee91d6a2d6793d9c1a8e1eab86b73d51f39be9de..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_S.pdf and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_T.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_T.pdf
deleted file mode 100644
index 3d9953b188be8b97dbc5d669c32cb02a7cf3a106..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_T.pdf and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.pdf
index 2aa1b91790fec6da7c10f4c6937a4f6755e90ae1..71e8ed1b17b56184a5ca1ebed34ff4cfee9618fc 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.pdf
index 7a3b346d332d3667901399c25cae2097efcacd7f..b08b2badfb6896a0aa0b145764ca8907632dc1e7 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_Tim.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_Tim.pdf
index ae3cf5ddc0d87ee180aa40a6014c0a0ac10ff257..e7b439c583e627a35d0ae59550793014bdfba109 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_Tim.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_Tim.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_VI.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_VI.pdf
index 015ec03d21d676e73e32f3cbcbeb66cb0e167d86..9ed392666707b5d5d3d7a80a41ba874454afc034 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_VI.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_VI.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_VII.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_VII.pdf
index 31941a229abdf51c6887a9e6d26f502c487c1eea..018eb8df9bb794d7bbdcda292c0d50ed0a02fa2d 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_VII.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_VII.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_Va.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_Va.pdf
index 3d69f406d403313cf15c330d87664cd5f024bb3b..d8238fc34876b8607a2e5076fde22d54d201abbf 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_Va.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_Va.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Instrument_VcB.pdf b/out/Eybler_DiesSanctificatus_HV61_Instrument_VcB.pdf
index aae02db0378b416b2e9f213b153aad5a87fe7397..46e112dd815d4f2a0d8571e1287a709ba35041e8 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Instrument_VcB.pdf and b/out/Eybler_DiesSanctificatus_HV61_Instrument_VcB.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Score_Choral.pdf b/out/Eybler_DiesSanctificatus_HV61_Score_Choral.pdf
index a4f042cafb0a41f6f75bf69f35ceeb7ecbecaf05..cc64406e9b20ae026e9d08f74e65707cce350b3f 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Score_Choral.pdf and b/out/Eybler_DiesSanctificatus_HV61_Score_Choral.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Score_Full.pdf b/out/Eybler_DiesSanctificatus_HV61_Score_Full.pdf
index 3c396dc17fa68af0d0acd4825e679c6715c83a77..8e0ebf05e3997a1f97e211d32d2b80def531de1e 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Score_Full.pdf and b/out/Eybler_DiesSanctificatus_HV61_Score_Full.pdf differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Score_Long.midi b/out/Eybler_DiesSanctificatus_HV61_Score_Long.midi
deleted file mode 100644
index 3bb3c8b32ea8336c59ac4f4e8825017d033ea6d8..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Score_Long.midi and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Score_Long.pdf b/out/Eybler_DiesSanctificatus_HV61_Score_Long.pdf
deleted file mode 100644
index 9a781e559da600d919df80009366c2ebae53ff02..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Score_Long.pdf and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Score_Original.midi b/out/Eybler_DiesSanctificatus_HV61_Score_Original.midi
deleted file mode 100644
index 6fe2405440630715f6bb76ce6f62bf11839d77e5..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Score_Original.midi and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Score_Original.pdf b/out/Eybler_DiesSanctificatus_HV61_Score_Original.pdf
deleted file mode 100644
index 38f1d8391fd400906e1f5d011c7f03d4ddd97fb6..0000000000000000000000000000000000000000
Binary files a/out/Eybler_DiesSanctificatus_HV61_Score_Original.pdf and /dev/null differ
diff --git a/out/Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf b/out/Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf
index 82094ee3d3e3248c764c53a779c1bfdb3990649a..556abf758f8f258851a9d8ea273a45c409f90071 100644
Binary files a/out/Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf and b/out/Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf differ
diff --git a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Choral.pdf b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Choral.pdf
deleted file mode 100644
index bc5a31204ee1e7234d5115270b3be1c9d7ba5842..0000000000000000000000000000000000000000
Binary files a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Choral.pdf and /dev/null differ
diff --git a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.pdf b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.pdf
index 960f3f8d95eac4a9f26df79fe617a4d498be0e96..460a31669712ac8eb98837b97ebb6663e821932a 100644
Binary files a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.pdf and b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Full.pdf differ
diff --git a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.pdf b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.pdf
index 8ec360818c295063327421370900c0394d589a79..873779cecdc842d91fbba1dd238bc5366ee89c97 100644
Binary files a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.pdf and b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.pdf differ
diff --git a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Long.pdf b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Long.pdf
deleted file mode 100644
index ffb3909c53d072bc5b100691c0317b9454b0c41e..0000000000000000000000000000000000000000
Binary files a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Long.pdf and /dev/null differ
diff --git a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Original.pdf b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Original.pdf
deleted file mode 100644
index 93d2ea3fc01b5ce316ba771aa8c58896efe33f7b..0000000000000000000000000000000000000000
Binary files a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Original.pdf and /dev/null differ
diff --git a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf
index 899a843925962cd10c42ff5bf9fe333ec0a0b315..5fe60738a2f886f7603006ce11f0722f643a1284 100644
Binary files a/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf and b/out/TeX_Eybler_DiesSanctificatus_HV61_Score_Vocal.pdf differ
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly.patch b/patches/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cec76ac53b5d83e032baaf6b53456d4c573c12eb
--- /dev/null
+++ b/patches/Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly.patch
@@ -0,0 +1,22 @@
+--- Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly.new	2011-06-22 14:16:34.000000000 +0200
++++ Eybler_DiesSanctificatus_HV61_Instrument_Continuo.ly	2011-06-22 13:59:24.000000000 +0200
+@@ -4,7 +4,18 @@
+ \header {
+   instrument = \ContinuoInstrumentName
+   scorenumber = \markup{\scoreNumber \ContinuoNumber}
++  arranger = "Generalbassaussetzung: R. Kainhofer"
+ }
+ 
+-\createScore #"DiesSanctificatus" #'("Continuo")
++BCRealizationExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
++ContinuoExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
++\layout {
++  \context {
++    \RemoveEmptyStaffContext
++    % To use the setting globally, uncomment the following line:
++    \override VerticalAxisGroup #'remove-first = ##t
++    \remove "Instrument_name_engraver"
++  }
++}
++\createScore #"DiesSanctificatus" #'("RealizedContinuo")
+ 
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly.patch b/patches/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..73fda3b3b93f064847221178604322012f34a5d0
--- /dev/null
+++ b/patches/Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly.patch
@@ -0,0 +1,13 @@
+--- Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly.new	2011-06-22 14:16:34.000000000 +0200
++++ Eybler_DiesSanctificatus_HV61_Instrument_TbeI.ly	2011-06-22 14:11:39.000000000 +0200
+@@ -3,8 +3,10 @@
+ 
+ \header {
+   instrument = \TbeIInstrumentName
++  arranger = "Von unbekannter Hand"
+   scorenumber = \markup{\scoreNumber \TbeINumber}
+ }
++DiesSanctificatusTbeIMusic = \XXXDiesSanctificatusTbeIMusic
+ 
+ \createScore #"DiesSanctificatus" #'("TbeI")
+ 
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly.patch b/patches/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..32070142f63d694fe1f48cb938e704f97620a56d
--- /dev/null
+++ b/patches/Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly.patch
@@ -0,0 +1,13 @@
+--- Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly.new	2011-06-22 14:16:34.000000000 +0200
++++ Eybler_DiesSanctificatus_HV61_Instrument_TbeII.ly	2011-06-22 14:11:39.000000000 +0200
+@@ -3,8 +3,10 @@
+ 
+ \header {
+   instrument = \TbeIIInstrumentName
++  arranger = "Von unbekannter Hand"
+   scorenumber = \markup{\scoreNumber \TbeIINumber}
+ }
++DiesSanctificatusTbeIIMusic = \XXXDiesSanctificatusTbeIIMusic
+ 
+ \createScore #"DiesSanctificatus" #'("TbeII")
+ 
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly.patch b/patches/Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e668a4edf91fb3259f0156630261ed261ffb8b64
--- /dev/null
+++ b/patches/Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly.patch
@@ -0,0 +1,13 @@
+--- Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly.new	2011-06-22 14:16:34.000000000 +0200
++++ Eybler_DiesSanctificatus_HV61_Instrument_Tim.ly	2011-06-22 14:11:37.000000000 +0200
+@@ -3,8 +3,10 @@
+ 
+ \header {
+   instrument = \TimInstrumentName
++  arranger = "Von unbekannter Hand"
+   scorenumber = \markup{\scoreNumber \TimNumber}
+ }
++DiesSanctificatusTimMusic = \XXXDiesSanctificatusTimMusic
+ 
+ \createScore #"DiesSanctificatus" #'("Tim")
+ 
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily.patch b/patches/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily.patch
index fee32bb30d5b6475e4137b351630d69c4c48d5cd..8d4bf22c1281ec89bba5100060f23de069e9c10b 100644
--- a/patches/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily.patch
+++ b/patches/Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily.patch
@@ -1,7 +1,7 @@
---- Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily.new	2009-10-01 13:39:49.000000000 +0200
-+++ Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily	2009-10-01 13:35:33.000000000 +0200
-@@ -1,156 +1,1061 @@
- \version "2.13.1"
+--- Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily.new	2011-06-22 14:16:34.000000000 +0200
++++ Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus.ily	2011-06-22 14:11:39.000000000 +0200
+@@ -1,156 +1,1066 @@
+ \version "2.14.0"
  
 -DiesSanctificatusPieceName = "DiesSanctificatus"
 -DiesSanctificatusPieceNameTacet = "DiesSanctificatus tacet"
@@ -349,9 +349,10 @@
  \addQuote "DiesSanctificatusCorIIMusic" { \DiesSanctificatusCorIIMusic }
  
  
- DiesSanctificatusTbeIMusic = \relative c' {
+-DiesSanctificatusTbeIMusic = \relative c' {
 -  s8
 -  % TODO
++XXXDiesSanctificatusTbeIMusic = \relative c' {
 +  \transposition f
 +  fis4\f fis8[ fis] fis4 r | % 2
 +  fis8[ fis fis g] g4 fis8 r8 | % 3
@@ -400,9 +401,10 @@
  \addQuote "DiesSanctificatusTbeIMusic" { \DiesSanctificatusTbeIMusic }
  
  
- DiesSanctificatusTbeIIMusic = \relative c' {
+-DiesSanctificatusTbeIIMusic = \relative c' {
 -  s8
 -  % TODO
++XXXDiesSanctificatusTbeIIMusic = \relative c' {
 +  \transposition f
 +  d4\f d8[ d] d4 r | % 2
 +  d8[ d d d] d4. r8 | % 3
@@ -454,7 +456,7 @@
 -DiesSanctificatusTimMusic = \relative c' {
 -  s8
 -  % TODO
-+DiesSanctificatusTimMusic = \relative c {
++XXXDiesSanctificatusTimMusic = \relative c {
 +  g4\f g8[ g] g4 r | % 2
 +  R1*2 | % 4
 +  g4 r r2 | % 5
@@ -812,7 +814,7 @@
 +  g4 g8\cresc g g h a16[(\p g]) fis[( g]) | % 49
 +  d8 d fis g g8.[( a16]) fis8 r | \barNumberCheck #50
 +  r2 c'4^\dolce \slashedGrace{c8} h16[( a]) h[( c]) | % 51
-+  a4 r c4 \slashedGrace {d8} c16[( h]) c[( d]) | % 52
++  a4 r d4 \slashedGrace {d8} c16[( h]) c[( d]) | % 52
 +  h4\f g8 g h4\fz g8 r | % 53
 +  g4\p d8 c h4 r | % 54
 +  r h8 h h4 h8 h8 | % 55
@@ -1072,7 +1074,7 @@
 +  r2 \once \override ParenthesesItem #'stencils = #bracket-stencils fis8-\parenthesize^\pizz r g r |
 +  d r r4 h8 r d r |
 +  g,8[\f^\arco g' g g] g,[\fz h d g] |
-+  d r r4 << { \once \override InstrumentSwitch #'direction = #DOWN \voiceTwo \cueText "Basso / Organo" g,2~\p |
++  d r r4 << { \once \override InstrumentSwitch #'direction = #DOWN \voiceTwo \cueText "Basso / Organo" \dynamicsX #-3 g,2~\p |
 +  g1~ |
 +  << {g1~} {s2 s_\perd} >> |
 +  g2~ g4 } \new Voice { \voiceOne \cueText "Cello"  <g d'>2~ | <g d'>1~ | <g d'>1~ | <g d'>2~ <g d'>4}>> \oneVoice r \bar"|."
@@ -1083,13 +1085,6 @@
 -DiesSanctificatusContinuoMusic = \relative c' {
 -  s8
 -  % TODO
--}
--\addQuote "DiesSanctificatusContinuoMusic" { \DiesSanctificatusContinuoMusic }
--
--
--DiesSanctificatusVcBMusic = \relative c' {
--  s8
--  % TODO
 +DiesSanctificatusBCFbMusic = \figuremode {
 +  s1\solo | % 2
 +  s1*3 | % 5
@@ -1131,6 +1126,15 @@
 +  s1\solo | \barNumberCheck #47
 +  s1*10 \bar"|."
  }
+-\addQuote "DiesSanctificatusContinuoMusic" { \DiesSanctificatusContinuoMusic }
+ 
+-
+-DiesSanctificatusVcBMusic = \relative c' {
+-  s8
++DiesSanctificatusBCRealizationMusic = \relative c'' {
+   % TODO
++  \repeat unfold 56 { s1 }  \barNumberCheck #57
+ }
 -\addQuote "DiesSanctificatusVcBMusic" { \DiesSanctificatusVcBMusic }
  
 +DiesSanctificatusBCMusic = \DiesSanctificatusVcBMusic
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Score_Original.ly.patch b/patches/Eybler_DiesSanctificatus_HV61_Score_Original.ly.patch
deleted file mode 100644
index 4f6793cfebb9d8224a5f0617a4336cb36a8b9e10..0000000000000000000000000000000000000000
--- a/patches/Eybler_DiesSanctificatus_HV61_Score_Original.ly.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- Eybler_DiesSanctificatus_HV61_Score_Original.ly.new	2009-10-01 13:39:49.000000000 +0200
-+++ Eybler_DiesSanctificatus_HV61_Score_Original.ly	2009-10-01 13:36:05.000000000 +0200
-@@ -8,4 +8,4 @@
-   scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
- }
- 
--\createNoCuesScore #"DiesSanctificatus" #'("OriginalScore")
-+\createNoCuesScore #"DiesSanctificatus" #'("BrLong" "WdLong" "Tim" "Str" "Ch" "Continuo")
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Score_Vocal.ly.patch b/patches/Eybler_DiesSanctificatus_HV61_Score_Vocal.ly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1658cae38657e9f7b459e06eddf1daef0efb1009
--- /dev/null
+++ b/patches/Eybler_DiesSanctificatus_HV61_Score_Vocal.ly.patch
@@ -0,0 +1,25 @@
+--- Eybler_DiesSanctificatus_HV61_Score_Vocal.ly.new	2011-06-22 14:16:34.000000000 +0200
++++ Eybler_DiesSanctificatus_HV61_Score_Vocal.ly	2011-06-22 14:10:07.000000000 +0200
+@@ -1,5 +1,6 @@
+ \version "2.14.0"
+ \include "Eybler_DiesSanctificatus_HV61_Settings_VocalScore.ily"
++\include "Eybler_DiesSanctificatus_HV61_Music_DiesSanctificatus_Piano.ily"
+ \setCreateMIDI ##t
+ \setCreatePDF ##t
+ 
+@@ -8,4 +9,15 @@
+   scorenumber = \markup{\scoreNumber \VocalScoreNumber}
+ }
+ 
++PIExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
++PIIExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
++
++\layout {
++  \context {
++    \Score
++    \override SpacingSpanner
++              #'base-shortest-duration = #(ly:make-moment 1 64)
++  }
++}
++
+ \createScore #"DiesSanctificatus" #'("VocalScore")
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily.patch b/patches/Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily.patch
deleted file mode 100644
index 381ae3aec3648c7474d1793cd240cc9af062e4d3..0000000000000000000000000000000000000000
--- a/patches/Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily.new	2009-10-01 13:39:49.000000000 +0200
-+++ Eybler_DiesSanctificatus_HV61_Settings_FullScore.ily	2009-10-01 13:36:44.000000000 +0200
-@@ -1,2 +1,18 @@
- \include "orchestrallily/oly_settings_fullscore.ily"
- \include "Eybler_DiesSanctificatus_HV61_Settings.ily"
-+
-+DiesSanctificatusTbeISettings = {
-+    \set Staff.fontSize = #-4
-+    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-+    \DiesSanctificatusSettings
-+}
-+DiesSanctificatusTbeIISettings = {
-+    \set Staff.fontSize = #-4
-+    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-+    \DiesSanctificatusSettings
-+}
-+DiesSanctificatusTimSettings = {
-+    \set Staff.fontSize = #-4
-+    \override Staff.StaffSymbol #'staff-space = #(magstep -4)
-+    \DiesSanctificatusSettings
-+}
diff --git a/patches/Eybler_DiesSanctificatus_HV61_Settings_Global.ily.patch b/patches/Eybler_DiesSanctificatus_HV61_Settings_Global.ily.patch
index 9a2eb180884bf2a40aa92c4209207861f2f733e8..dff7733da426386cf08dddf2e7f328827292d126 100644
--- a/patches/Eybler_DiesSanctificatus_HV61_Settings_Global.ily.patch
+++ b/patches/Eybler_DiesSanctificatus_HV61_Settings_Global.ily.patch
@@ -1,15 +1,8 @@
---- Eybler_DiesSanctificatus_HV61_Settings_Global.ily.new	2009-10-01 13:39:49.000000000 +0200
-+++ Eybler_DiesSanctificatus_HV61_Settings_Global.ily	2009-10-01 13:37:05.000000000 +0200
-@@ -16,7 +16,32 @@
- 
+--- Eybler_DiesSanctificatus_HV61_Settings_Global.ily.new	2011-06-22 14:16:34.000000000 +0200
++++ Eybler_DiesSanctificatus_HV61_Settings_Global.ily	2011-06-22 14:12:12.000000000 +0200
+@@ -19,6 +19,26 @@
  %% Possibly adjust the \orchestralScoreStructure here...
  
-+\layout {
-+  \context { \Lyrics
-+    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
-+  }
-+}
-+
  %% Add custom keys here, e.g.
 -%% CorKey = \key g \major
 -%% CorIKey = \CorKey
@@ -26,13 +19,14 @@
 +CorIInstrumentName = \markup\center-column{"Corno I" "in G"}
 +CorIIInstrumentName = \markup\center-column{"Corno II" "in G"}
 +
-+TbeInstrumentName = \markup\center-column{"Trombe" "in F"}
-+TbeIInstrumentName = \markup\center-column{"Tromba I" "in F"}
-+TbeIIInstrumentName = \markup\center-column{"Tromba II" "in F"}
++TbeInstrumentName = \markup\center-column{"Trombe in F" "(ad lib.)"}
++TbeIInstrumentName = \markup\center-column{"Tromba I in F" "(ad lib.)"}
++TbeIIInstrumentName = \markup\center-column{"Tromba II in F" "(ad lib.)"}
 +
-+TimInstrumentName = \markup\center-column{"Timpani" "in G,D"}
++TimInstrumentName = \markup\center-column{"Timpani in G,D"  "(ad lib.)"}
 +
++SClef = \clef "soprano/treble"
++AClef = \clef "alto/treble"
++TClef = \clef "tenor/treble_8"
 +
-+SClef = \clef "soprano"
-+AClef = \clef "alto"
-+TClef = \clef "tenor"
++VaInstrumentName = "Viole"
diff --git a/patches/Makefile.patch b/patches/Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a02e5f22418932c7a68b44b1ad5c30619af88e20
--- /dev/null
+++ b/patches/Makefile.patch
@@ -0,0 +1,53 @@
+--- Makefile.new	2011-06-22 14:16:34.000000000 +0200
++++ Makefile	2011-06-22 14:13:11.000000000 +0200
+@@ -1,20 +1,21 @@
+ OUT=out
+ 
+ base = Eybler_DiesSanctificatus_HV61
+-SRCS = $(base)_Music_DiesSanctificatus.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
+-instruments = ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Continuo VcB
++SRCS = $(base)_Music_DiesSanctificatus.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
++instruments = ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va Continuo VcB
+ scores = Full Vocal Choral
+ pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
+ 
+ 
+ texbase = Eybler_DiesSanctificatus_HV61
+-texscores = Full Vocal Choral
++texscores = Full Vocal
++# Choral
+ texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
+ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
+      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
+ 
+-distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(texpdfs)
++distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(OUT)/$(base)_Score_Choral.pdf $(texpdfs)
+ 
+ additionalscores =
+ 
+@@ -49,14 +50,20 @@
+ latex: $(pdfs) $(texpdfs)
+ latexpdf: $(texpdfs)
+ 
++VocalScore: $(OUT)/$(base)_Score_Vocal.pdf $(OUT)/TeX_$(base)_Score_Vocal.pdf $(SRCS)
++
++
+ $(OUT)/TeX_%.pdf : TeX_%.tex
+-	TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex --output-directory=$(OUT)/ $<
++        TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex --output-directory=$(OUT)/ $<
+ 
+ zipdir = $(base)_Final
+ dist: $(distfiles)
+ 	mkdir -p $(zipdir)
+ 	cp -r $(distfiles) $(zipdir)
+ 	rename 's/TeX_//' $(zipdir)/*
+-	rename 's/Score_(Full|Long)\./Score./' $(zipdir)/*
+-	zip -jr $(base).zip $(zipdir)
+-	rm -rf $(zipdir)
++        rename 's/Score_(Full|Long)\./Score./' $(zipdir)/*
++        zip -jr $(base).zip $(zipdir)
++        rm -rf $(zipdir)
++
++webshop: $(distfiles)
++        python ../../Diverses/Webshop/EditionKainhofer_CSVI_Generate.py "1061 - Eybler - Dies sanctificatus HV6.def" $(distfiles)
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex.patch
index 8be3d83886c2ecec9ccdac3658224259efd27f77..b58f64a707e38b1db36f5fd8c08397627b228d52 100644
--- a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex.patch
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex.new	2009-10-01 13:39:49.000000000 +0200
-+++ TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex	2009-07-24 00:46:46.000000000 +0200
+--- TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex	2009-10-01 14:52:50.000000000 +0200
 @@ -1,14 +1 @@
 -\section*{Das Leben von Joseph Eybler}
 -
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex.patch
deleted file mode 100644
index c4ffcb27e4ea4a3fb86c8a7ceeabed6b4ea4b3d5..0000000000000000000000000000000000000000
--- a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex.new	2009-10-01 13:39:49.000000000 +0200
-+++ TeX_Eybler_DiesSanctificatus_HV61_Include_ContentsMaterial.itex	2009-09-17 22:15:39.000000000 +0200
-@@ -15,12 +15,21 @@
- \scorelistbox{
- Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
- 
--\LongScoreName{} (-\LongScoreNumber),
- \FullScoreName{} (-\FullScoreNumber),
--\VocalScoreName{} (-\VocalScoreNumber),
--\ChoralScoreName{} (-\ChoralScoreNumber),
--\OriginalScoreName{} (-\OriginalScoreNumber);
-+\ParticellScoreName{} (-\ParticellScoreNumber);
- 
-+\ChoralScoreName{} (-\ChoralScoreNumber);
-+\SName{} (-\SNumber),
-+\AName{} (-\ANumber),
-+\TName{} (-\TNumber),
-+\BName{} (-\BNumber);
-+
-+\InstrumentsName{} (-\InstrumentsNumber),
-+\ContinuoName{} (-\ContinuoNumber),
-+\VIName{} (-\VINumber),
-+\VIIName{} (-\VIINumber),
-+\VaName{} (-\VaNumber),
-+\VcBName{} (-\VcBNumber),
- \ClIName{} (-\ClINumber),
- \ClIIName{} (-\ClIINumber),
- \FagIName{} (-\FagINumber),
-@@ -29,25 +38,16 @@
- \CorIIName{} (-\CorIINumber),
- \TbeIName{} (-\TbeINumber),
- \TbeIIName{} (-\TbeIINumber),
--\TimName{} (-\TimNumber),
--\VIName{} (-\VINumber),
--\VIIName{} (-\VIINumber),
--\VaName{} (-\VaNumber),
--\SName{} (-\SNumber),
--\AName{} (-\ANumber),
--\TName{} (-\TNumber),
--\BName{} (-\BNumber),
--\ContinuoName{} (-\ContinuoNumber),
--\VcBName{} (-\VcBNumber).
--
-+\TimName{} (-\TimNumber).
- }
- \end{center}
- 
- \vfill
- \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
- \begin{hauptquellen}
--\item TODO: Dies sanctificatus, Autograph. TODO.
--\item TODO: Dies sanctificatus, Originalausgabe (Partitur), Verlag, Ort, Jahr.
-+\item Autographe Partitur, Archiv des Schottenstifts, Wien, Signatur: TODO.
-+\item Handschriftlicher Stimmensatz des ehemaligen k.k. Hofmusikkapellen-Archivs, Musiksammlung der Österr. Nationalbibliothek, Wien, Signatur: HK.2511 Mus, 1827.
-+\item Graduale \textnumero4 (\q{Dies sanctificatus illuxit nobis}), Originalausgabe, Tobias Haslinger, Wien, 1829. Partitur (T.H.5244) und Stimmensatz (T.H.5247).
- \end{hauptquellen}
- 
- \vfill
-@@ -58,4 +58,3 @@
- Computersatz mit \@software\newline
- Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
- 
--
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex.patch
index 0d370ee4a2011dedc6ce1f9ce9d1229dedc0bbbb..d66c1e98f4317e7e29818e8dd0c2a4961989bf7d 100644
--- a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex.patch
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex.patch
@@ -1,6 +1,44 @@
---- TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex.new	2009-10-01 13:39:49.000000000 +0200
-+++ TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex	2009-10-01 13:38:04.000000000 +0200
-@@ -13,13 +13,12 @@
+--- TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Include_KritBericht.itex	2010-01-10 13:37:01.000000000 +0100
+@@ -8,18 +8,48 @@
+ \begin{thebibliography}{AA}
+ 
+ \bibitem[A]{Aut}
+-Autographe Partitur, im Besitz des Musikarchiv des Schottenstiftes, Wien. Signatur: TODO
+-\newblock TODO
++Autographe Partitur, im Besitz des Archiv des Schottenstiftes, Wien. Archivkodex: A-Ws Codex 571(440)/15.
++
++6 fol. (32,5 $\times$ 23 cm, Querformat), je 2 Blätter auf einem Bogen gefaltet, mit Faden-Rückenstichen geheftet. Fol. 6 (6r und 6v) leer, nur Notenzeilen.
++Paginierung sowohl nach Zahl der Blätter als auch Zahl der Bögen.
++Aufbewahrt in einem Kartonumschlag mit 21 weiteren Graduale von Eybler.
++
++Wasserzeichen: Schwertlilie.
++
++Titel: \q{\underline{Graduale de Tempore}}, rechts oberhalb davon klein \q{\sout{IMS.}}
++Auf erster Seite unten mittig mit heller brauner Tinte die Plattennummer \q{5244.} des Drucks bei Haslinger eingetragen.
++
++Eine Akkolade pro Seite, Anordnung der Stimmen (nur auf der Titelseite bezeichnet, keine weitere Klammersetzung):
++\begin{sourcetitle}
++Corni in G\sbreak
++Clarinetti in C\sbreak
++Fagotti\sbreak
++V.1\textsuperscript{mo}\sbreak
++V.2\textsuperscript{do}\sbreak
++Viole\sbreak
++Soprano (im Sopranschlüssel)\sbreak
++Alto (im Altschlüssel)\sbreak
++Tenore (im Tenorschlüssel)\sbreak
++Basso\sbreak
++Organo con Bassi
++\end{sourcetitle}
++
++Bei mehreren Instrumenten pro Notenzeile ist am Beginn des Systems für jedes Instrument ein eigener Schlüssel notiert.
++
++Signiert am Ende des Stückes (6v, rechts unten):
++\begin{sourcetitle}
++da me Giuseppe Eybler mpia\sbreak
++$\overline{827}$.
++\end{sourcetitle}
  
  \bibitem[B]{HS1}
  Handschriftlicher Stimmensatz (aus dem Hofmusikkapellenarchiv) im Besitz der
@@ -18,7 +56,7 @@
  a\sbreak
  4 Voci\sbreak
  2 Violini\sbreak
-@@ -27,36 +26,34 @@
+@@ -27,36 +57,34 @@
  2 Clarinetti\sbreak
  2 Corni\sbreak
  2 Fagotti\sbreak
@@ -49,11 +87,11 @@
  Alle Stimmen mit \q{K.k.Hofmusikkapellen=\textbar{}Archiv}
 -gestempelt und großteils am Ende des Stückes versehen mit \q{Jos. Eybler comp. 1827}.
 +gestempelt und teilweise am Ende des Stückes versehen mit \q{Jos. Eybler comp. 1827}.
++
  
  
 -\bibitem[C]{THPart}
 -Originalausgabe (Partitur), Wien, Tobias Haslinger, T.H.TODO, TODO S., Reihe Musica Sacra, erschienen TODO.
-+
 +\bibitem[C]{TH5244}
 +Originalausgabe (Partitur), Wien, Tobias Haslinger, T.H.5244, 14 S., Reihe Musica Sacra, erschienen 1829.
  \newblock Titel:
@@ -69,7 +107,7 @@
  Partitur\sbreak
  WIEN, BEI TOBIAS HASLINGER,\sbreak
  Musikverleger,\sbreak
-@@ -64,33 +61,34 @@
+@@ -64,33 +92,34 @@
  Warsow Scrips. Pfoehl sculps.
  \end{sourcetitle}
  \newblock Benutzte Exemplare: Wien, Österreichische Nationalbibliothek, Musiksammlung,
@@ -120,7 +158,7 @@
  
  \end{thebibliography}
  
-@@ -101,29 +99,42 @@
+@@ -101,29 +130,42 @@
  Aufführungsdaten dürfte die Uraufführung mit diesem Material stattgefunden
  haben und der Stimmensatz von Eybler selbst in der Hofkapelle benutzt
  worden sein) sowie die von Eybler autorisierten und korrigierten Drucke
@@ -171,7 +209,7 @@
  gekennzeichnete) Melismabögen in allen Vokalstimmen ergänzt, wenn eine Silbe
  auf mehrere Noten zu singen ist. Ergänzte Dynamikangaben und sonstige
  Ergänzungen (abgesehen von Warnakzidenzien) des Herausgebers sind
-@@ -145,26 +156,25 @@
+@@ -145,26 +187,25 @@
  vorliegende Ausgabe setzt (ohne weitere Kennzeichnung) Beistriche und Punkte
  dort, wo sie grammatikalisch korrekt sind.
  
@@ -210,7 +248,7 @@
  
  \end{enumerate}
  
-@@ -184,19 +194,13 @@
+@@ -184,19 +225,13 @@
  \item In den Quellen sind tw. Akzidenzien nicht
  gesetzt, wenn im selben Takt bereits in einer anderen Oktav vorhanden:
  \begin{itemize}
@@ -233,7 +271,7 @@
  \end{enumerate}
  
  
-@@ -212,34 +216,205 @@
+@@ -212,34 +247,211 @@
  Bogen im Autograph vorkommt, wird ohne weitere Kennzeichnung ein Bogen über
  die gesamte Gruppe gesetzt.
  
@@ -314,6 +352,10 @@
 +% entweder die Bezifferung \q{6} wie in der Partitur oder besser \q{4-3}. Die
 +% vorliegende Ausgabe hält sich jedoch dennoch an die Stimme und setzt \q{6}.
 +
++10 Continuo: Extender Linie in \cite{Aut,HS1} korrekt auf der zweiten bis
++vierten Achtelnote, in der gedruckten Partitur \cite{TH5244} nur bis zur dritten
++Achtelnote, in den gedruckten Stimmen \cite{TH5247} bereits ab der ersten Achtelnote.
++
 +11: \q{cres.} in vielen Fällen auf oder knapp vor den vierten Schlag, in \cite{Aut}
 +in B/Cl/Fag/V1/V2/Va/VcB jedoch bereits eine Achtel oder Sechzehntel vor
 +dem vierten Schlag, in \cite{TH5244} tw. nur sehr knapp vor dem vierten Schlag oder
@@ -321,6 +363,8 @@
 +auf den zweiten (Cl2) oder dritten (Fag2) Schlag. In der vorliegenden Ausgabe vereinheitlicht
 +auf die zweite Achtel des dritten Schlags.
 +
++16 S: In \cite{TH5247} pp, in allen anderen Quellen \cite{Aut,TH5244} nur p.
++
 +17 S/T: Erster Bogen in den Partituren \cite{Aut,TH5244} als Legatobogen über
 +die gesamten ersten beiden Schläge, korrigiert auf Melismabogen nur über die
 +Achtel- und die Viertelnote wie in den Stimme \cite{HS1,TH5247}.
@@ -328,10 +372,10 @@
 +18 B: In allen Quellen außer \cite{TH5247} Crescendo-Pfeil über zweiten und
 +dritten Schlag, um die Bass-Phrase gegenüber den später einsetzenden
 +restlichen Chorstimmen hervorzuheben (in \cite{HS1} nur in 3 der 5 Einzelstimmen).
-+
+ 
 +21 Chorstimmen: Im Autograph \cite{Aut} kein f trotz des p in der vorhergehenden
 +Phrase und des f im Orchester.
-+
+ 
 +23/24 Va: Im Autograph \cite{Aut} kein Bindebogen über den Taktstrich.
 +
 +28 V2: In Stimme \cite{TH5247} undeutlich, ob Bogen auf dritt- oder
@@ -350,11 +394,11 @@
 +29 Cor1/Cor2: f nur in den Einzelstimmen \cite{HS1,TH5247}, nicht in den
 +Partituren \cite{Aut,TH5244}. Aufgrund der Pause vor dem Einsatz dennoch
 +übernommen.
- 
++
 +31 V1/V2: In den Partituren \cite{Aut,TH5244} Bogen über den gesamten letzten
 +Schlag, in den Einzelstimmen \cite{HS1,TH5247} Staccato-Keil auf viertletzte
 +Sechzehntel, Bogen nur über die letzten drei Sechzehntel.
- 
++
 +31 Cl1: Die drei Achtelnoten in der zweiten Takthälfte in den Einzelstimmen
 +\cite{HS1,TH5247} durch einen Balken verbunden, in den Partituren \cite{Aut,TH5244}
 +und in allen anderen Instrumenten mit demselben Rhythmus jedoch nur die ersten beiden.
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d7dafa58ac5b6ae800639fedb11593a2dafd2f4d
--- /dev/null
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex.patch
@@ -0,0 +1,39 @@
+--- TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Include_Material.itex	2011-06-22 14:04:23.000000000 +0200
+@@ -7,24 +7,24 @@
+ \VocalScoreName{} (-\VocalScoreNumber),
+ \ChoralScoreName{} (-\ChoralScoreNumber);
+ 
++\InstrumentsName{} (-\InstrumentsNumber),
++\ContinuoName{} (-\ContinuoNumber),
++\VIName{} (-\VINumber),
++\VIIName{} (-\VIINumber),
++\VaName{} (-\VaNumber),
++\VcBName{} (-\VcBNumber),
+ \ClIName{} (-\ClINumber),
+ \ClIIName{} (-\ClIINumber),
+ \FagIName{} (-\FagINumber),
+ \FagIIName{} (-\FagIINumber),
+ \CorIName{} (-\CorINumber),
+-\CorIIName{} (-\CorIINumber),
++\CorIIName{} (-\CorIINumber).
++
++\begin{small}
++Von unbekannter Hand: 
+ \TbeIName{} (-\TbeINumber),
+ \TbeIIName{} (-\TbeIINumber),
+-\TimName{} (-\TimNumber),
+-\VIName{} (-\VINumber),
+-\VIIName{} (-\VIINumber),
+-\VaName{} (-\VaNumber),
+-\SName{} (-\SNumber),
+-\AName{} (-\ANumber),
+-\TName{} (-\TNumber),
+-\BName{} (-\BNumber),
+-\ContinuoName{} (-\ContinuoNumber),
+-\VcBName{} (-\VcBNumber).
+-
++\TimName{} (-\TimNumber).
++\end{small}
+ }
+ \end{center}
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cb7c254d94016633a49461c4fee21fb260d439d9
--- /dev/null
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex.patch
@@ -0,0 +1,11 @@
+--- TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Include_Sources.itex	2011-06-22 14:04:44.000000000 +0200
+@@ -1,5 +1,6 @@
+ \section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+ \begin{hauptquellen}
+-\item TODO: Dies sanctificatus, Autograph. TODO.
+-\item TODO: Dies sanctificatus, Originalausgabe (Partitur), Verlag, Ort, Jahr.
++\item Autographe Partitur, Archiv des Schottenstifts, Wien. A-Ws Codex 571(440)/15.
++\item Handschriftlicher Stimmensatz des ehemaligen k.k. Hofmusikkapellen-Archivs, Musiksammlung der Österr. Nationalbibliothek, Wien. A-Whk HK.2511 Mus, 1827.
++\item Graduale \textnumero4 (\q{Dies sanctificatus illuxit nobis}), Originalausgabe, Tobias Haslinger, Wien, 1829. Partitur (T.H.5244) und Stimmensatz (T.H.5247).
+ \end{hauptquellen}
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex.patch
index c8623b751ad120d7cb8db42af435fc30192b21c3..50a44d3ef8ecff0baba55517fa099e9ff83a971b 100644
--- a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex.patch
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex.new	2009-10-01 13:39:49.000000000 +0200
-+++ TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex	2009-10-01 12:15:39.000000000 +0200
+--- TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex	2009-10-01 14:52:51.000000000 +0200
 @@ -1,11 +1,19 @@
 -\subsection*{Text des \q{Dies sanctificatus}: TODO}
 +\subsection*{Text des \q{Dies sanctificatus}: Hallelujavers der 3. Messe
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex.patch
index 04d1176eddb89f23e7a0c1bc99da0b9f91f96c2c..2f868c59711b90bb347d192380ffaf1b1aa7f47b 100644
--- a/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex.patch
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex.new	2009-10-01 13:39:49.000000000 +0200
-+++ TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex	2009-09-16 22:05:14.000000000 +0200
+--- TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex	2010-01-10 14:03:25.000000000 +0100
 @@ -1,8 +1,9 @@
 -% \todos{
 -% \chapter*{Offene Fragen}
@@ -14,7 +14,7 @@
 +
 +\begin{itemize}
 +\item 7 FB: Extender nur auf letzte Achtel!
-+\item 10 FB: Extender auf 2.-4. Achtel.
++\item Tbe, Tim Notenzeilen enger
 +\end{itemize}
 +
 +}
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex.patch
index 680ea6dca85449bfe9c550b1b8e0bab01d19e1e0..685d3ee7ac0c37b5c2dcf6d2295d21e2cb6e5903 100644
--- a/patches/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex.patch
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex.patch
@@ -1,6 +1,41 @@
---- TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex.new	2009-10-05 19:24:35.000000000 +0200
-+++ TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex	2009-10-05 19:24:12.000000000 +0200
-@@ -17,6 +17,36 @@
+--- TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Score_Instruments.tex	2011-06-22 14:16:14.000000000 +0200
+@@ -22,24 +22,24 @@
+ \section*{\Huge Inhalt / Contents}
+ \begin{Large}
+ 
++\ContinuoName\\
++4 $\times$ \VIName\\
++3 $\times$ \VIIName\\
++3 $\times$ \VaName\\
++3 $\times$ \VcBName\\
+ \ClIName\\
+ \ClIIName\\
+ \FagIName\\
+ \FagIIName\\
+ \CorIName\\
+-\CorIIName\\
++\CorIIName\\[1em]
++
++\begin{small}
++Von unbekannter Hand:\\
+ \TbeIName\\
+ \TbeIIName\\
+ \TimName\\
+-\VIName\\
+-\VIIName\\
+-\VaName\\
+-\SName\\
+-\AName\\
+-\TName\\
+-\BName\\
+-\ContinuoName\\
+-\VcBName\\
++\end{small}
+ 
+ \end{Large}
+ \end{center}
+@@ -60,6 +60,23 @@
  
  
  \phantomsection
@@ -8,19 +43,6 @@
 +\includescore{Instrument_Continuo}
 +
 +\phantomsection
-+\addcontentsline{toc}{section}{\SName}
-+\includescore{Instrument_S}
-+\phantomsection
-+\addcontentsline{toc}{section}{\AName}
-+\includescore{Instrument_A}
-+\phantomsection
-+\addcontentsline{toc}{section}{\TName}
-+\includescore{Instrument_T}
-+\phantomsection
-+\addcontentsline{toc}{section}{\BName}
-+\includescore{Instrument_B}
-+
-+\phantomsection
 +\addcontentsline{toc}{section}{\VIName}
 +\includescore{Instrument_VI}
 +\phantomsection
@@ -37,7 +59,7 @@
  \addcontentsline{toc}{section}{\ClIName}
  \includescore{Instrument_ClI}
  \phantomsection
-@@ -43,35 +73,6 @@
+@@ -86,33 +103,6 @@
  \phantomsection
  \addcontentsline{toc}{section}{\TimName}
  \includescore{Instrument_Tim}
@@ -68,8 +90,15 @@
 -\phantomsection
 -\addcontentsline{toc}{section}{\VcBName}
 -\includescore{Instrument_VcB}
--
--
  
- \cleardoublepage
- \backmatter
+ \fi
+ 
+@@ -123,7 +113,7 @@
+ 
+ \begin{preface}
+ \input{TeX_Eybler_DiesSanctificatus_HV61_Include_About.itex}
+-\input{TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex}
++% \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Bio.itex}
+ \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Text.itex}
+ \end{preface}
+ 
diff --git a/patches/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex.patch b/patches/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex.patch
index 602bfad47986423c366f7e059ccd2e820583ed21..686916048a80c2f0603260637bdfe732eccc0ec2 100644
--- a/patches/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex.patch
+++ b/patches/TeX_Eybler_DiesSanctificatus_HV61_Settings.itex.patch
@@ -1,5 +1,5 @@
---- TeX_Eybler_DiesSanctificatus_HV61_Settings.itex.new	2009-10-01 13:39:49.000000000 +0200
-+++ TeX_Eybler_DiesSanctificatus_HV61_Settings.itex	2009-10-01 13:39:33.000000000 +0200
+--- TeX_Eybler_DiesSanctificatus_HV61_Settings.itex.new	2011-06-22 14:16:34.000000000 +0200
++++ TeX_Eybler_DiesSanctificatus_HV61_Settings.itex	2011-06-22 14:07:53.000000000 +0200
 @@ -2,8 +2,8 @@
  \subtitle{Graduale, HV 61}
  \composer{Joseph Eybler}
@@ -7,7 +7,12 @@
 -% \description{Per Coro (SATB) ed Organo o Orchestra}
 -% \instrumentation{2 Oboi, 2 Corni\\2 Violini, Viola, Violoncello\\e Basso Continuo (Organo e Bassi)}
 +\description{Per Coro (SATB) e Orchestra}
-+\instrumentation{2 Clarinetti, 2 Fagotti\\2 Corni, (2 Trombe), (Timpani)\\2 Violini, Viola, Violoncello\\Contrabasso ed Organo}
++\instrumentation{2 Clarinetti, 2 Fagotti\\2 Corni\\2 Violini, Viole, Violoncello\\Contrabbasso ed Organo}
  \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
- \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
- \year{2009}
+ \publisherurl{http://www.edition-kainhofer.com/}
+ \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna, http://www.edition-kainhofer.com/}}
+@@ -22,3 +22,4 @@
+ }
+ 
+ \input{TeX_Eybler_DiesSanctificatus_HV61_Include_Todo.itex}
++\renewcommand{\VaName}{Viole}