From cbe9d610e4a286366fbc51e5530e522ce55f162e Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer <reinhold@kainhofer.com> Date: Mon, 23 Jul 2012 00:20:42 +0200 Subject: [PATCH] Layout fixes of the final TeX output files --- ...chquartett_HV190_D-Dur_Music_01_Adagio.ily | 2 +- ...quartett_HV190_D-Dur_Music_02_Menuetto.ily | 3 +- ...chquartett_HV190_D-Dur_Music_03_Adagio.ily | 3 +- ...ichquartett_HV190_D-Dur_Music_04_Thema.ily | 3 +- ...artett_HV190_D-Dur_Settings_Instrument.ily | 3 +- ...rtett_HV191_c-Moll_Settings_Instrument.ily | 3 +- ...hquartett_HV192_B-Dur_Music_01_Allegro.ily | 5 +- ...chquartett_HV192_B-Dur_Music_02_Adagio.ily | 5 +- ...quartett_HV192_B-Dur_Music_03_Menuetto.ily | 3 +- ...chquartett_HV192_B-Dur_Music_04_Finale.ily | 5 +- ...artett_HV192_B-Dur_Settings_Instrument.ily | 3 +- ...treichquartette_HV190-192_Include_Bio.itex | 15 +-- ...artette_HV190-192_Include_KritBericht.itex | 2 +- ...tette_HV190-192_Include_Preface_Short.itex | 2 + ...reichquartette_HV190-192_Include_Text.itex | 106 ------------------ ..._Streichquartette_HV190-192_Score_Full.tex | 6 +- ...er_Streichquartette_HV190-192_Score_VI.tex | 10 +- ...r_Streichquartette_HV190-192_Score_VII.tex | 10 +- ...er_Streichquartette_HV190-192_Score_Va.tex | 10 +- ...er_Streichquartette_HV190-192_Score_Vc.tex | 10 +- 20 files changed, 44 insertions(+), 165 deletions(-) diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily index 49339ca..9f70522 100644 --- a/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily +++ b/Eybler_Streichquartett_HV190_D-Dur_Music_01_Adagio.ily @@ -1,6 +1,6 @@ \version "2.14.0" -IAdagioPieceName = "Adagio non molto" +IAdagioPieceName = "1. Adagio non molto" IAdagioTempo = "Adagio non molto" IAdagioKey = \key d \major diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily index b75f4fa..3e63afa 100644 --- a/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily +++ b/Eybler_Streichquartett_HV190_D-Dur_Music_02_Menuetto.ily @@ -1,7 +1,6 @@ \version "2.14.0" -IIMenuettoPieceName = "Menuetto" -IIMenuettoPieceNameTacet = "Menuetto tacet" +IIMenuettoPieceName = "2. Menuetto - Trio" IIMenuettoTempo = "Allegretto" IIMenuettoKey = \key d \major diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily index a39a777..f2ad0df 100644 --- a/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily +++ b/Eybler_Streichquartett_HV190_D-Dur_Music_03_Adagio.ily @@ -1,7 +1,6 @@ \version "2.14.0" -IIIAdagioPieceName = "Adagio" -IIIAdagioPieceNameTacet = "Adagio Cantabile tacet" +IIIAdagioPieceName = "3. Adagio" IIIAdagioTempo = "Adagio cantabile" IIIAdagioKey = \key g \major diff --git a/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily b/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily index da2ea7d..1125263 100644 --- a/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily +++ b/Eybler_Streichquartett_HV190_D-Dur_Music_04_Thema.ily @@ -1,7 +1,6 @@ \version "2.14.0" -IVThemaPieceName = "Thema con Variationi" -IVThemaPieceNameTacet = "Thema con Variationi tacet" +IVThemaPieceName = "4. Thema con Variationi" IVThemaTempo = "Moderato" IVThemaKey = \key d \major diff --git a/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily b/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily index 5f4cb24..2116679 100644 --- a/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily +++ b/Eybler_Streichquartett_HV190_D-Dur_Settings_Instrument.ily @@ -3,5 +3,6 @@ \include "Eybler_Streichquartett_HV190_D-Dur_Settings.ily" \paper { - #(define page-breaking ly:optimal-breaking) +% #(define page-breaking ly:optimal-breaking) + #(define (page-post-process layout pages) (oly:create-toc-file layout pages)) } diff --git a/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily b/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily index b58acb7..5738e33 100644 --- a/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily +++ b/Eybler_Streichquartett_HV191_c-Moll_Settings_Instrument.ily @@ -3,5 +3,6 @@ \include "Eybler_Streichquartett_HV191_c-Moll_Settings.ily" \paper { - #(define page-breaking ly:optimal-breaking) +% #(define page-breaking ly:optimal-breaking) + #(define (page-post-process layout pages) (oly:create-toc-file layout pages)) } diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily index 0e4b9a2..2f0b803 100644 --- a/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily +++ b/Eybler_Streichquartett_HV192_B-Dur_Music_01_Allegro.ily @@ -1,8 +1,7 @@ \version "2.15.30" -IAllegroPieceName = "Allegro" -IAllegroPieceNameTacet = "Allegro tacet" -IAllegroTempo = "TODO" +IAllegroPieceName = "1. Allegro" +IAllegroTempo = "Allegro" IAllegroKey = \key c \major IAllegroTimeSignature = \time 4/4 diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily index dbdbc9d..5998ce4 100644 --- a/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily +++ b/Eybler_Streichquartett_HV192_B-Dur_Music_02_Adagio.ily @@ -1,8 +1,7 @@ \version "2.15.30" -IIAdagioPieceName = "Adagio" -IIAdagioPieceNameTacet = "Adagio tacet" -IIAdagioTempo = "TODO" +IIAdagioPieceName = "2.Adagio" +IIAdagioTempo = "Adagio" IIAdagioKey = \key c \major IIAdagioTimeSignature = \time 4/4 diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily index dcd4bc6..add96f3 100644 --- a/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily +++ b/Eybler_Streichquartett_HV192_B-Dur_Music_03_Menuetto.ily @@ -1,7 +1,6 @@ \version "2.15.30" -IIIMenuettoPieceName = "Menuetto" -IIIMenuettoPieceNameTacet = "Menuetto tacet" +IIIMenuettoPieceName = "3. Menuetto - Trio" IIIMenuettoTempo = "TODO" IIIMenuettoKey = \key c \major diff --git a/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily b/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily index f2e04d6..86af41e 100644 --- a/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily +++ b/Eybler_Streichquartett_HV192_B-Dur_Music_04_Finale.ily @@ -1,8 +1,7 @@ \version "2.15.30" -VFinalePieceName = "Finale - Vivace" -VFinalePieceNameTacet = "Finale - Vivace tacet" -VFinaleTempo = "TODO" +VFinalePieceName = "4. Finale - Vivace" +VFinaleTempo = "Vivace" VFinaleKey = \key c \major VFinaleTimeSignature = \time 4/4 diff --git a/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily b/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily index 4a3cdd6..319fb8f 100644 --- a/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily +++ b/Eybler_Streichquartett_HV192_B-Dur_Settings_Instrument.ily @@ -3,5 +3,6 @@ \include "Eybler_Streichquartett_HV192_B-Dur_Settings.ily" \paper { - #(define page-breaking ly:optimal-breaking) +% #(define page-breaking ly:optimal-breaking) + #(define (page-post-process layout pages) (oly:create-toc-file layout pages)) } diff --git a/TeX_Eybler_Streichquartette_HV190-192_Include_Bio.itex b/TeX_Eybler_Streichquartette_HV190-192_Include_Bio.itex index 5fa3129..da44ec8 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Include_Bio.itex +++ b/TeX_Eybler_Streichquartette_HV190-192_Include_Bio.itex @@ -1,14 +1 @@ -\section*{Das Leben von Joseph Eybler} - -\begin{multicols}{2} -TODO -\end{multicols} - -\section*{The life of Joseph Eybler} - -\begin{multicols}{2} -TODO -\end{multicols} - -Quellen / Sources:\\[0em] -TODO +\input{../../Komponisten/Eybler/TeX_Eybler_Include_Biografie.itex} diff --git a/TeX_Eybler_Streichquartette_HV190-192_Include_KritBericht.itex b/TeX_Eybler_Streichquartette_HV190-192_Include_KritBericht.itex index 7065019..ecacaed 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Include_KritBericht.itex +++ b/TeX_Eybler_Streichquartette_HV190-192_Include_KritBericht.itex @@ -1,6 +1,6 @@ \footnotesize \chapter*{Quellen und Lesarten} -\addcontentsline{toc}{section}{Quellen und Lesarten} +\addcontentsline{toc}{chapter}{Quellen und Lesarten} \section*{Joseph Eybler: Streichquartett D-Dur} \begin{multicols}{2} diff --git a/TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex b/TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex index f526512..0498a96 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex +++ b/TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex @@ -1,5 +1,7 @@ \frontmatter \maketitle +\input{TeX_Eybler_Streichquartette_HV190-192_Include_ContentsMaterial.itex} + \mainmatter \cleardoublepage diff --git a/TeX_Eybler_Streichquartette_HV190-192_Include_Text.itex b/TeX_Eybler_Streichquartette_HV190-192_Include_Text.itex index 63d363a..e69de29 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Include_Text.itex +++ b/TeX_Eybler_Streichquartette_HV190-192_Include_Text.itex @@ -1,106 +0,0 @@ -\subsection*{Text des \q{Streichquartett D-Dur}: TODO} - -\begin{lyricstext} - -\subsection*{Adagio non molto} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Menuetto - Allegretto} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Trio} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Adagio Cantabile} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Thema con Variationi - Moderato} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\end{lyricstext} -\subsection*{Text des \q{Streichquartett c-Moll}: TODO} - -\begin{lyricstext} - -\subsection*{Allegro} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Adagio non molto} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Menuetto - Allegretto} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Trio} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Finale - Allegro} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\end{lyricstext} -\subsection*{Text des \q{Streichquartett B-Dur}: TODO} - -\begin{lyricstext} - -\subsection*{Allegro} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Adagio} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Menuetto} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Trio} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\subsection*{Finale - Vivace} -\begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} -\end{lyricstable} - -\end{lyricstext} - diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex index bf9a226..b93ff2c 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex +++ b/TeX_Eybler_Streichquartette_HV190-192_Score_Full.tex @@ -17,17 +17,17 @@ \basename{Eybler_Streichquartett_HV190_D-Dur} \phantomsection -\addcontentsline{toc}{section}{\FullScoreType} +\addcontentsline{toc}{chapter}{Streichtrio D-Dur, Op.I/1, HV 190} \includescore{Score_Full} \basename{Eybler_Streichquartett_HV191_c-Moll} \phantomsection -\addcontentsline{toc}{section}{\FullScoreType} +\addcontentsline{toc}{chapter}{Streichtrio c-Moll, Op.I/2, HV 191} \includescore{Score_Full} \basename{Eybler_Streichquartett_HV192_B-Dur} \phantomsection -\addcontentsline{toc}{section}{\FullScoreType} +\addcontentsline{toc}{chapter}{Streichtrio B-Dur, Op.I/3, HV 192} \includescore{Score_Full} diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex index e447a48..7139b4f 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex +++ b/TeX_Eybler_Streichquartette_HV190-192_Score_VI.tex @@ -11,23 +11,23 @@ % \ismn{......} \begin{document} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex} +% \input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} +\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex} \basename{Eybler_Streichquartett_HV190_D-Dur} \phantomsection -\addcontentsline{toc}{section}{\VIName} +\addcontentsline{toc}{chapter}{Streichtrio D-Dur, Op.I/1, HV 190} \includescore{Instrument_VI} \basename{Eybler_Streichquartett_HV191_c-Moll} \phantomsection -\addcontentsline{toc}{section}{\VIName} +\addcontentsline{toc}{chapter}{Streichtrio c-Moll, Op.I/2, HV 191} \includescore{Instrument_VI} \basename{Eybler_Streichquartett_HV192_B-Dur} \phantomsection -\addcontentsline{toc}{section}{\VIName} +\addcontentsline{toc}{chapter}{Streichtrio B-Dur, Op.I/3, HV 192} \includescore{Instrument_VI} diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex index 93b19ec..509f971 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex +++ b/TeX_Eybler_Streichquartette_HV190-192_Score_VII.tex @@ -11,23 +11,23 @@ % \ismn{......} \begin{document} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex} +% \input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} +\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex} \basename{Eybler_Streichquartett_HV190_D-Dur} \phantomsection -\addcontentsline{toc}{section}{\VIIName} +\addcontentsline{toc}{chapter}{Streichtrio D-Dur, Op.I/1, HV 190} \includescore{Instrument_VII} \basename{Eybler_Streichquartett_HV191_c-Moll} \phantomsection -\addcontentsline{toc}{section}{\VIIName} +\addcontentsline{toc}{chapter}{Streichtrio c-Moll, Op.I/2, HV 191} \includescore{Instrument_VII} \basename{Eybler_Streichquartett_HV192_B-Dur} \phantomsection -\addcontentsline{toc}{section}{\VIIName} +\addcontentsline{toc}{chapter}{Streichtrio B-Dur, Op.I/3, HV 192} \includescore{Instrument_VII} diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex index 0cd869c..3b3f547 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex +++ b/TeX_Eybler_Streichquartette_HV190-192_Score_Va.tex @@ -11,23 +11,23 @@ % \ismn{......} \begin{document} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex} +% \input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} +\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex} \basename{Eybler_Streichquartett_HV190_D-Dur} \phantomsection -\addcontentsline{toc}{section}{\VaName} +\addcontentsline{toc}{chapter}{Streichtrio D-Dur, Op.I/1, HV 190} \includescore{Instrument_Va} \basename{Eybler_Streichquartett_HV191_c-Moll} \phantomsection -\addcontentsline{toc}{section}{\VaName} +\addcontentsline{toc}{chapter}{Streichtrio c-Moll, Op.I/2, HV 191} \includescore{Instrument_Va} \basename{Eybler_Streichquartett_HV192_B-Dur} \phantomsection -\addcontentsline{toc}{section}{\VaName} +\addcontentsline{toc}{chapter}{Streichtrio B-Dur, Op.I/3, HV 192} \includescore{Instrument_Va} diff --git a/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex b/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex index 547a532..ca8cc4d 100644 --- a/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex +++ b/TeX_Eybler_Streichquartette_HV190-192_Score_Vc.tex @@ -11,23 +11,23 @@ % \ismn{......} \begin{document} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} -\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Long.itex} +% \input{TeX_Eybler_Streichquartette_HV190-192_Include_Coverpage.itex} +\input{TeX_Eybler_Streichquartette_HV190-192_Include_Preface_Short.itex} \basename{Eybler_Streichquartett_HV190_D-Dur} \phantomsection -\addcontentsline{toc}{section}{\VcName} +\addcontentsline{toc}{chapter}{Streichtrio D-Dur, Op.I/1, HV 190} \includescore{Instrument_Vc} \basename{Eybler_Streichquartett_HV191_c-Moll} \phantomsection -\addcontentsline{toc}{section}{\VcName} +\addcontentsline{toc}{chapter}{Streichtrio c-Moll, Op.I/2, HV 191} \includescore{Instrument_Vc} \basename{Eybler_Streichquartett_HV192_B-Dur} \phantomsection -\addcontentsline{toc}{section}{\VcName} +\addcontentsline{toc}{chapter}{Streichtrio B-Dur, Op.I/3, HV 192} \includescore{Instrument_Vc} -- GitLab