diff --git a/Makefile b/Makefile
index 83e7c1fd0e004156584ed3c25bbb022c4455685b..adb897ccd8309073615cab2bab05a8d87326b6e5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ OUT=out
instruments =
scores = Choral Original
-texscores = Choral
+texscores = Choral
pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(scores:%=$(OUT)/$(base)_Score_%.pdf)
texs = $(scores:%=TeX_$(base)_Score_%.tex)
@@ -16,10 +16,12 @@ all: $(OUT) $(instruments) $(scores) tex
instruments: $(instruments)
scores: $(scores)
-clean:
+clean:
rm -rf $(OUT)
-$(OUT) :
+lily: $(pdfs) $(additionalscores)
+
+$(OUT) :
mkdir -p $(OUT)
$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
diff --git a/Reutter_EcceQuomodo_Settings_Global.ily b/Reutter_EcceQuomodo_Settings_Global.ily
index 04a2d5f009f6d4a58560a1a6c505645de4e3d3ad..181419bdba4160434011a6b30b4d8c6bd40b8405 100644
--- a/Reutter_EcceQuomodo_Settings_Global.ily
+++ b/Reutter_EcceQuomodo_Settings_Global.ily
@@ -5,21 +5,16 @@
scorenumber="EK-0055"
-\header {
+\header {
title = "Ecce quomodo"
subtitle = "Responsorium für den Karfreitag / Responsory for Good Friday"
composer = "Georg Reutter (1708-1772)"
copyright = \markup \abs-fontsize #9 \column{
- \line {2009, \concat{\with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer},} \concat{\scorenumber,} Vienna, Austria.
- Lizensiert unter / Licensed under: Creative Commons BY \with-url #"http://creativecommons.org/licenses/by/3.0/at/" {\translate #'(0 . -0.7) \epsfile #Y #3 #"cc-by-2.eps" }}
- \line {Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction.}
+ \line {2009, \concat{\with-url #"http://www.edition-kainhofer.com/" {"Edition Kainhofer, Vienna, Austria"}.} \concat{\scorenumber.} \LicenseCCBY }
+ \LicenseNoRestrictions
}
}
-% Add custom keys here, e.g.
-% CorKey = \key g \major
-% CorIKey = \CorKey
-% CorIIKey = \CorKey
SShortInstrumentName = ##f
AShortInstrumentName = ##f
TShortInstrumentName = ##f
@@ -46,7 +41,7 @@ BShortInstrumentName = ##f
}
\context {
- \Score
+ \Score
\override StaffGrouper #'between-staff-spacing = #'((stretchability . 6) (padding . 1 ))
}
}
diff --git a/TeX_Reutter_EcceQuomodo_Include_Text.itex b/TeX_Reutter_EcceQuomodo_Include_Text.itex
index 22da8b19d11aadfe90c962d70529bb16d0c5c129..3eb4c4b3e4b80785577693dd07fb261a1654e986 100644
--- a/TeX_Reutter_EcceQuomodo_Include_Text.itex
+++ b/TeX_Reutter_EcceQuomodo_Include_Text.itex
@@ -1,6 +1,6 @@
\subsubsection*{Text des \q{Ecce quomodo}}
-\begin{small}
+\begin{lyricstext}
\renewenvironment{lyricstable}{\begin{tabular}{p{0.30\textwidth}p{0.31\textwidth}p{0.31\textwidth}}}{\end{tabular}}
\nopagebreak
@@ -12,8 +12,8 @@ Et nemo considerat, & Und niemand beachtet es. & And no on
A facie iniquitatis & Durch die Ungerechtigkeit & The righteous man has been taken \\
Sublatus est justus. & Wurde der Gerechte beseitigt. & away from present iniquity \\
Et erit in pace memoria eius. & Man gedenke seiner in Frieden. & And his memory shall be in peace.\\
-{\footnotesize\em\qquad(Jacob Handl ?)} & {\footnotesize\em\qquad(Reinhold Kainhofer)} &
+{\footnotesize\em\qquad(Jacob Handl ?)} & {\footnotesize\em\qquad(Reinhold Kainhofer)} &
\end{lyricstable}
-\end{small}
+\end{lyricstext}
diff --git a/cc-by-2.eps b/cc-by-2.eps
deleted file mode 100644
index 51d2d255b90ce41ddc95e17e6e401f657fab6325..0000000000000000000000000000000000000000
--- a/cc-by-2.eps
+++ /dev/null
@@ -1,187 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%BoundingBox: 360 291 441 307
-%%HiResBoundingBox: 360.4727 291.9463 440.5146 306.9878
-%.................................
-%%Creator: GPL Ghostscript 864 (epswrite)
-%%CreationDate: 2009/08/25 17:46:41
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%EndComments
-%%BeginProlog
-% This copyright applies to everything between here and the %%EndProlog:
-% Copyright (C) 2009 Artifex Software, Inc. All rights reserved.
-%%BeginResource: procset GS_epswrite_2_0_1001 1.001 0
-/GS_epswrite_2_0_1001 80 dict dup begin
-/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch
-4 index eq and{ pop pop pop}{ PageSize dup 1
-5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec}
-{ pop/setpagedevice where
-{ pop 1 dict dup /PageSize PageSize put setpagedevice}
-{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat
-setpage}if}ifelse}ifelse}ifelse} bind def
-/!{bind def}bind def/#{load def}!/N/counttomark #
-/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}!
-/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}!
-/w/setlinewidth #/J/setlinecap #
-/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat #
-/m/moveto #/l/lineto #/c/rcurveto #
-/p{N 2 idiv{N -2 roll rlineto}repeat}!
-/P{N 0 gt{N -2 roll moveto p}if}!
-/h{p closepath}!/H{P closepath}!
-/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}!
-/re{4 -2 roll m exch dup lx exch ly neg lx h}!
-/^{3 index neg 3 index neg}!
-/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}!
-/q/gsave #/Q/grestore #/rf{re fill}!
-/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}!
-/|={pop exch 4 1 roll 1 array astore cvx 3 array astore cvx exch 1 index def exec}!
-/|{exch string readstring |=}!
-/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}!
-/@/currentfile #/${+ @ |}!
-/B{{2 copy string{readstring pop}aload pop 4 array astore cvx
-3 1 roll}repeat pop pop true}!
-/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}!
-/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}!
-/Ic{exch Ix false 3 colorimage}!
-/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>>
-/CCITTFaxDecode filter}!/FX{<</EndOfBlock false F}!
-/X{/ASCII85Decode filter}!/@X{@ X}!/&2{2 index 2 index}!
-/@F{@ &2<<F}!/@C{@X &2 FX}!
-/$X{+ @X |}!/&4{4 index 4 index}!/$F{+ @ &4<<F |}!/$C{+ @X &4 FX |}!
-/IC{3 1 roll 10 dict begin 1{/ImageType/Interpolate/Decode/DataSource
-/ImageMatrix/BitsPerComponent/Height/Width}{exch def}forall
-currentdict end image}!
-/~{@ read {pop} if}!
-end def
-%%EndResource
-/pagesave null def
-%%EndProlog
-%%Page: 1 1
-%%%%BeginPageSetup
-GS_epswrite_2_0_1001 begin
-/pagesave save store 197 dict begin
-% % 360 291 translate
-0.1 0.1 scale
-%%EndPageSetup
-gsave mark
-Q q
-0 0 250000 250000 re
-Y
-255 G
-3609.94 2924.67 790.004 140 re
-f
-10.4162 w
-4 M
-K
-3609.94 2924.67 790.004 140 re
-S
-3624.75 2938.67 760.379 111.996 re
-f
-167 194 176 rG
-3624.75 3050.55 0 -112 200.81 0 P
-12.92 16.34 21.64 35.32 21.64 56 c
-0 20.54 -8.57 39.73 -21.33 56 c
--201.11 0 p f
-Q q
-3626.41 2938.67 195.676 111.996 re
-Y
-255 G
-3797.9 2994.67 m
-0.02 -34.92 -29.91 -63.24 -66.85 -63.26 c
--36.94 -0.02 -66.91 28.26 -66.93 63.18 c
-0 0.02 0 0.05 0 0.08 c
--0.02 34.92 29.91 63.24 66.85 63.26 c
-36.94 0.02 66.91 -28.27 66.93 -63.19 c
-0 -0.02 0 -0.05 0 -0.07 c
-f
-K
-3785.39 3046.16 m
-14.83 -14.02 22.25 -31.19 22.25 -51.5 c
-0 -20.31 -7.29 -37.29 -21.87 -50.96 c
--15.47 -14.39 -33.75 -21.58 -54.85 -21.58 c
--20.85 0 -38.81 7.14 -53.9 21.41 c
--15.09 14.26 -22.64 31.31 -22.64 51.13 c
-0 19.82 7.54 36.99 22.64 51.5 c
-14.7 14.03 32.67 21.04 53.9 21.04 c
-21.48 0 39.64 -7.01 54.47 -21.04 c
-h
-3687 3036.73 m
--12.54 -11.97 -18.81 -26 -18.81 -42.09 c
-0 -16.09 6.21 -29.99 18.61 -41.72 c
-12.41 -11.73 27.2 -17.6 44.34 -17.6 c
-17.14 0 32.05 5.93 44.71 17.77 c
-12.02 11.02 18.04 24.86 18.04 41.54 c
-0 16.56 -6.11 30.63 -18.33 42.17 c
--12.22 11.55 -27.03 17.32 -44.43 17.32 c
--17.4 0 -32.12 -5.8 -44.14 -17.41 c
-h
-3720 3001.72 m
--1.92 3.95 -4.79 5.92 -8.61 5.92 c
--6.76 0 -10.14 -4.3 -10.14 -12.9 c
-0 -8.61 3.38 -12.91 10.14 -12.91 c
-4.47 0 7.66 2.09 9.57 6.29 c
-9.38 -4.72 p
--4.47 -7.51 -11.17 -11.26 -20.11 -11.26 c
--6.89 0 -12.41 2 -16.56 6 c
--4.15 4 -6.22 9.5 -6.22 16.52 c
-0 6.9 2.14 12.38 6.41 16.43 c
-4.28 4.06 9.61 6.09 15.99 6.09 c
-9.45 0 16.21 -3.52 20.3 -10.55 c
--10.14 -4.91 h
-3764.1 3001.72 m
--1.92 3.95 -4.73 5.92 -8.43 5.92 c
--6.9 0 -10.35 -4.3 -10.35 -12.9 c
-0 -8.61 3.45 -12.91 10.35 -12.91 c
-4.47 0 7.6 2.09 9.39 6.29 c
-9.59 -4.72 p
--4.46 -7.51 -11.15 -11.26 -20.08 -11.26 c
--6.89 0 -12.39 2 -16.54 6 c
--4.14 4 -6.21 9.5 -6.21 16.52 c
-0 6.9 2.11 12.38 6.31 16.43 c
-4.2 4.06 9.55 6.09 16.06 6.09 c
-9.43 0 16.19 -3.52 20.27 -10.55 c
--10.35 -4.91 p f
-Q q
-0 0 250000 250000 re
-Y
-255 G
-3895.52 3000.98 m
-2.43 0 4.26 0.5 5.52 1.5 c
-1.25 1 1.88 2.48 1.88 4.43 c
-0 1.93 -0.62 3.39 -1.87 4.39 c
--1.25 1.02 -3.09 1.54 -5.52 1.54 c
--8.51 0 0 -11.86 ^ p
-3896.04 2976.5 m
-3.09 0 5.41 0.61 6.95 1.84 c
-1.57 1.22 2.36 3.07 2.36 5.55 c
-0 2.42 -0.78 4.24 -2.32 5.43 c
--1.54 1.23 -3.87 1.85 -6.99 1.85 c
--9.03 0 0 -14.67 ^ p
-3910.35 2996.64 m
-3.3 -0.9 5.86 -2.57 7.67 -4.99 c
-1.81 -2.43 2.71 -5.39 2.71 -8.93 c
-0 -5.39 -1.94 -9.42 -5.83 -12.07 c
--3.89 -2.66 -9.8 -3.98 -17.74 -3.98 c
--25.53 0 0 56.01 23.1 0 p
-8.29 0 14.28 -1.17 17.98 -3.53 c
-3.73 -2.35 5.6 -6.11 5.6 -11.29 c
-0 -2.72 -0.68 -5.05 -2.04 -6.98 c
--1.36 -1.9 -3.33 -3.32 -5.91 -4.24 c
-3919.39 3022.67 16.82 0 13.59 -19.95 13.59 19.95 16.86 0 -22.73 -32.41 0 -23.6 -15.39 0
-^ -22.73 32.41 f
-5 w
-4 M
-K
-3515 2920 -270 0 S
-3605 2830 0 -270 S
-3515 3070 -270 0 S
-3605 3160 0 270 S
-4495 3070 270 0 S
-4405 3160 0 270 S
-4495 2920 270 0 S
-4405 2830 0 -270 S
-cleartomark end end pagesave restore
- showpage
-%%PageTrailer
-%%Trailer
-%%Pages: 1
diff --git a/out/Reutter_EcceQuomodo_Score_Choral.midi b/out/Reutter_EcceQuomodo_Score_Choral.midi
index ae55cdbbcdc17fb093a713b6099d9d7144818b4a..73bc4e275e89d369b86e0a427d0cd043e2feda55 100644
Binary files a/out/Reutter_EcceQuomodo_Score_Choral.midi and b/out/Reutter_EcceQuomodo_Score_Choral.midi differ
diff --git a/out/Reutter_EcceQuomodo_Score_Choral.pdf b/out/Reutter_EcceQuomodo_Score_Choral.pdf
index 378bb51ac63417f0f4d09015c70a742354cf0785..812492c43d1498b3660f9d628db255b04da4e527 100644
Binary files a/out/Reutter_EcceQuomodo_Score_Choral.pdf and b/out/Reutter_EcceQuomodo_Score_Choral.pdf differ
diff --git a/out/Reutter_EcceQuomodo_Score_Original.pdf b/out/Reutter_EcceQuomodo_Score_Original.pdf
index 9c1643b6668e6c032155063e22de38f971c91539..5c3c4f0754bb6c0b7760f6206895cbe2945c78ce 100644
Binary files a/out/Reutter_EcceQuomodo_Score_Original.pdf and b/out/Reutter_EcceQuomodo_Score_Original.pdf differ
diff --git a/out/TeX_Reutter_EcceQuomodo_Score_Choral.pdf b/out/TeX_Reutter_EcceQuomodo_Score_Choral.pdf
index f86e6139f9cd4efac5858192c103ebc0f630cd34..b94f32f531524ed0c498bab8b9a4de1151bd9016 100644
Binary files a/out/TeX_Reutter_EcceQuomodo_Score_Choral.pdf and b/out/TeX_Reutter_EcceQuomodo_Score_Choral.pdf differ