From 87a7d8f050d37b37d066ad9723a2cb57b57736a6 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Fri, 19 Nov 2010 10:45:08 +0100 Subject: [PATCH] Various template updates, fixed fontsize on titlep, new vspacing var names, Contrabasso, include publisher url in copyrightbox --- Documentation/examples/orchestrallily.ly | 2 +- Templates/EK_Full/Makefile | 17 ++++- Templates/EK_Full/TeX_Include_Copyrightbox.itex | 2 +- Templates/EK_Full/TeX_Instruments.tex | 2 + Templates/EK_Full/TeX_Settings.itex | 5 +- editionkainhofer.sty | 3 + oly_defs.tex | 4 +- oly_settings_choralscore.ily | 8 +- oly_settings_fullscore.ily | 4 +- oly_settings_names.ily | 11 ++- oly_settings_vocalscore.ily | 10 +-- orchestrallily.ily | 98 +++++++++++++++++-------- testsuite/titlepage.ly | 2 +- 13 files changed, 114 insertions(+), 54 deletions(-) diff --git a/Documentation/examples/orchestrallily.ly b/Documentation/examples/orchestrallily.ly index 411a71d..821898f 120000 --- a/Documentation/examples/orchestrallily.ly +++ b/Documentation/examples/orchestrallily.ly @@ -1 +1 @@ -../../orchestrallily.ly \ No newline at end of file +../../orchestrallily.ily \ No newline at end of file diff --git a/Templates/EK_Full/Makefile b/Templates/EK_Full/Makefile index 6c01631..cedb200 100644 --- a/Templates/EK_Full/Makefile +++ b/Templates/EK_Full/Makefile @@ -15,10 +15,12 @@ texscores = << latex.scores|join (" ") >> texs = $(texscores:%=TeX_$(texbase)_Score_%.tex) texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \ $(OUT)/TeX_$(texbase)_Score_Instruments.pdf -<$ endif $> +<$- endif $> + +distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(texpdfs) <$ set jj = joiner(" ") -$> -additionalscores = <$ for s in additionalscores $><< jj() >>$(OUT)/<< s >>.pdf<$ endfor $> +additionalscores =<$ for s in additionalscores $> << jj() >>$(OUT)/<< s >>.pdf<$ endfor $> .PHONY: all clean all: $(OUT)<$ for w in works $> $(instruments<< w.nr >>) $(scores<< w.nr >>)<$ endfor $> $(additionalscores)<$ if latex $> tex<$ endif $> @@ -56,4 +58,13 @@ latexpdf: $(texpdfs) $(OUT)/TeX_%.pdf : TeX_%.tex TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex --output-directory=$(OUT)/ $< -<$ endif $> +<$- endif $> + +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) \ No newline at end of file diff --git a/Templates/EK_Full/TeX_Include_Copyrightbox.itex b/Templates/EK_Full/TeX_Include_Copyrightbox.itex index 5556f22..f3609d1 100644 --- a/Templates/EK_Full/TeX_Include_Copyrightbox.itex +++ b/Templates/EK_Full/TeX_Include_Copyrightbox.itex @@ -1,5 +1,5 @@ \makeatletter -\copyrightbox{© \@year, \@publisher\newline +\copyrightbox{© \@year, \@publisher\ifx\@publisherurl\@empty\else, \href{\@publisherurl}{\@publisherurl}\fi\newline 1. Auflage / 1st Printing \@year\newline Computersatz mit \@software\newline Alle Rechte vorbehalten / All rights reserved. Printed in Austria.} diff --git a/Templates/EK_Full/TeX_Instruments.tex b/Templates/EK_Full/TeX_Instruments.tex index 2e40787..164f467 100644 --- a/Templates/EK_Full/TeX_Instruments.tex +++ b/Templates/EK_Full/TeX_Instruments.tex @@ -82,10 +82,12 @@ \input{TeX_<< basename >>_Include_Text.itex} \end{preface} <$ if createCriticalComments $> +\iffalse \cleardoublepage \backmatter \appendix \input{TeX_<< basename >>_Include_KritBericht.itex} +\fi <$ endif $> \thispagestyle{empty} \pagebreak diff --git a/Templates/EK_Full/TeX_Settings.itex b/Templates/EK_Full/TeX_Settings.itex index f3baf04..43f7da2 100644 --- a/Templates/EK_Full/TeX_Settings.itex +++ b/Templates/EK_Full/TeX_Settings.itex @@ -27,7 +27,10 @@ % \instrumentation{2 Oboi, 2 Corni\\2 Violini, Viola, Violoncello\\e Basso Continuo (Organo e Bassi)} <$ endif -$> \editor{<$ if editorurl $>\href{<< editorurl >>}{<< editor >>}<$ else $><< editor >><$ endif $>} -\publisher{<$ if publisherurl $>\href{<< publisherurl >>}{<< publisher >>}<$ else $><< publisher >><$ endif $>} +<$ if publisherurl -$> +\publisherurl{<< publisherurl >>} +<$ endif -$> +\publisher{<$ if publisherurl $>\href{<< publisherurl >>}{<< publisher >>, << publisherurl >>}<$ else $><< publisher >><$ endif $>} <$ if shortpublisher -$> \shortpublisher{<$ if publisherurl $>\href{<< publisherurl >>}{<< shortpublisher >>}<$ else $><< shortpublisher >><$ endif $>} <$ else -$> diff --git a/editionkainhofer.sty b/editionkainhofer.sty index 9b1998a..3ec49da 100644 --- a/editionkainhofer.sty +++ b/editionkainhofer.sty @@ -125,6 +125,8 @@ \newcommand{\frontpageeditor}[1]{\gdef\@frontpageeditor{#1}} \let\@publisher\@empty \newcommand{\publisher}[1]{\gdef\@publisher{#1}} +\let\@publisherurl\@empty +\newcommand{\publisherurl}[1]{\gdef\@publisherurl{#1}} \let\@shortpublisher\@empty \newcommand{\shortpublisher}[1]{\gdef\@shortpublisher{#1}} \let\@scorenumber\@empty @@ -195,6 +197,7 @@ \else { \@scoreinfo\\ } \fi + \vfill\vfill \ifx\@frontpageinstrumentation\@empty% \else { diff --git a/oly_defs.tex b/oly_defs.tex index 4e3feea..d4f2ed0 100644 --- a/oly_defs.tex +++ b/oly_defs.tex @@ -112,8 +112,10 @@ \newcommand{\VaIName}{Viola I} \newcommand{\VaIIName}{Viola II} \newcommand{\VaSoloName}{Viola Solo} -\newcommand{\VcBName}{Violoncello / Contrabbasso} +\newcommand{\VcBName}{Violoncello / Contrabasso} +\newcommand{\VcBNameShort}{Cello / Basso} \newcommand{\VcName}{Violoncello} +\newcommand{\VcNameShort}{Cello} \newcommand{\CbName}{Basso} \newcommand{\ChName}{Coro} \newcommand{\SingstimmeName}{Singstimme} diff --git a/oly_settings_choralscore.ily b/oly_settings_choralscore.ily index 52a6bfa..08d17f7 100644 --- a/oly_settings_choralscore.ily +++ b/oly_settings_choralscore.ily @@ -27,6 +27,9 @@ OIIInstrumentName = \markup\null left-margin = 1.65\cm right-margin = 1.5\cm line-width = 17.85\cm + system-system-spacing #'minimum-distance = #2 + + system-separator-markup = #f } % Create MIDI and PDF! @@ -36,11 +39,6 @@ OIIInstrumentName = \markup\null % 5 mm staff height #(set-global-staff-size 14.5) -% no separator! -\paper { - system-separator-markup = #f -} - \header { instrument = \ChoralScoreTitle } \ No newline at end of file diff --git a/oly_settings_fullscore.ily b/oly_settings_fullscore.ily index 96851a3..8ec2c59 100644 --- a/oly_settings_fullscore.ily +++ b/oly_settings_fullscore.ily @@ -5,8 +5,7 @@ #(ly:set-option 'incipit #t) \include "oly_settings_global.ily" -% #(set-default-paper-size "a4") -#(set-global-staff-size 14.5) +#(set-global-staff-size 13) olySlashSeparator = \markup { \center-align @@ -18,6 +17,7 @@ olySlashSeparator = \markup { \paper { system-separator-markup = \olySlashSeparator #(define (page-post-process layout pages) (oly:create-toc-file layout pages)) + system-system-spacing #'minimum-distance = #20 } \layout { diff --git a/oly_settings_names.ily b/oly_settings_names.ily index c7bc1ec..0ed9820 100644 --- a/oly_settings_names.ily +++ b/oly_settings_names.ily @@ -42,6 +42,7 @@ VaIIClef = \VaClef VaSoloClef = \VaClef VcBClef = \clef "bass" VcClef = \VcBClef +VcTenorClef = \clef "tenor" CbClef = \VcBClef SClef = \clef "treble" AClef = \clef "treble" @@ -126,8 +127,8 @@ LongScoreTitle = "Partitur / Full score" OrganScoreTitle = "Orgelauszug / Organ score" VocalScoreTitle = "Klavierauszug / Vocal score" ParticellTitle = "Vokalparticell / Vocal particell" -ChoralScoreTitle = "Chorstimmen / Choral score" -SoloChoralScoreTitle = "Chorstimmen mit Soli / Choral score with solo parts" +ChoralScoreTitle = \markup{\center-column{"Chorstimmen" "Choral score"}} +SoloChoralScoreTitle = \markup{\center-column {"Chorstimmen mit Soli" "Choral score with solo parts"}} SoloScoreTitle = "Solostimmen / Solo parts" @@ -232,6 +233,12 @@ cueB = "B." cueO = "Org." cueBC = "B.C." +senzaCb = \cueText "senza Cb." +senzaVcB = \cueText "senza Vc/Cb." +senzaVcBstacked = \cueMarkup \markup{\override #'(baseline-skip . 2) \column{ senza Vc/Cb.}} +conCb = \cueText "con Cb." +conVcB = \cueText "con Vc/Cb." +conVcBstacked = \cueMarkup \markup{\override #'(baseline-skip . 2) \column{ con Vc/Cb.}} diff --git a/oly_settings_vocalscore.ily b/oly_settings_vocalscore.ily index 7b750d8..ca482fd 100644 --- a/oly_settings_vocalscore.ily +++ b/oly_settings_vocalscore.ily @@ -17,11 +17,11 @@ % 5 mm staff height (piano should be 5.5, but that will be left as a future exercise) #(set-global-staff-size 14.5) -SShortInstrumentName = "" -AShortInstrumentName = "" -TShortInstrumentName = "" -BShortInstrumentName = "" -PShortInstrumentName = "" +% SShortInstrumentName = "" +% AShortInstrumentName = "" +% TShortInstrumentName = "" +% BShortInstrumentName = "" +% PShortInstrumentName = "" \header { instrument = \VocalScoreTitle diff --git a/orchestrallily.ily b/orchestrallily.ily index b2448cc..1febb99 100644 --- a/orchestrallily.ily +++ b/orchestrallily.ily @@ -921,6 +921,11 @@ cueText = #(define-music-function (parser location instr) (string?) \set Voice.instrumentCueName = $instr #} ) +cueMarkup = #(define-music-function (parser location instr) (markup?) +#{ + \set Voice.instrumentCueName = $instr +#} +) clearCueText = #(define-music-function (parser location) () #{ @@ -1329,27 +1334,28 @@ titleHeaderMarkup = \markup { \column { \fill-line { \fromproperty #'header:logo - \center-column { - \huge \larger \bold \larger \fromproperty #'header:title - \large \smaller \bold \larger \fromproperty #'header:subtitle - \smaller \bold \fromproperty #'header:subsubtitle + \override #'(baseline-skip . 4.5) \center-column { +% \huge \larger \larger + \bold \abs-fontsize #18 \fromproperty #'header:title +% \vspace #0. +% \large \smaller \bold \larger + \abs-fontsize #12 \fromproperty #'header:subtitle +% \smaller \bold + \abs-fontsize #11 \fromproperty #'header:subsubtitle } - \bold \when-property #'header:instrument \rounded-box \fromproperty #'header:instrument + \bold \abs-fontsize #11 \when-property #'header:instrument \rounded-box \fromproperty #'header:instrument } \fill-line { - \with-dimensions #'( 0 . 0) #'( 0 . 1 ) \null + \with-dimensions #'( 0 . 0) #'( 0 . 3 ) \null } -% \fill-line { -% { \large \bold \fromproperty #'header:instrument } -% } \fill-line { - \fromproperty #'header:poet - \fromproperty #'header:composer + \abs-fontsize #10 \fromproperty #'header:poet + \abs-fontsize #10 \fromproperty #'header:composer } \fill-line { - \fromproperty #'header:meter - \fromproperty #'header:arranger + \abs-fontsize #10 \fromproperty #'header:meter + \abs-fontsize #10 \fromproperty #'header:arranger } } } @@ -1585,6 +1591,7 @@ slashedGrace = % If only one non-empty staff in a system exists, still print the backet \override SystemStartBracket #'collapse-height = #1 \consists "Instrument_name_engraver" + \consists "Keep_alive_together_engraver" } \context { \StaffGroup @@ -1784,35 +1791,62 @@ videEnd = \notemode { } \paper { - % after-title-spacing = #'((space . 2) (padding . 2) (stretchability . 5)) - % between-system-spacing = #'((space . 0) (padding . 2) (stretchability . 35)) - % bottom-system-spacing = #'((space . 10) (padding . 2) (stretchability . 5)) - markup-system-spacing = #'((space . 4) (padding . 2) (stretchability . 20)) -% system-system-spacing = #'((space . 0) (padding . 20) (stretchability . 50)) - system-system-spacing = #'((space . 0) (padding . 2) (stretchability . 50)) - top-system-spacing = #'((space . 5) (padding . 2) (stretchability . 20)) - last-bottom-spacing = #'((space . 5) (padding . 2) (stretchability . 20)) -% system-markup-spacing = #'((space . 5) (padding . 2) (stretchability . 35)) +% markup-system-spacing = #'((space . 4) (padding . 2) (stretchability . 20)) + markup-system-spacing #'minimum-distance = #0 + markup-system-spacing #'space = #4 + markup-system-spacing #'padding = #2 + markup-system-spacing #'stretchability = #40 +% system-system-spacing = #'((space . 0) (padding . 20) (stretchability . 50)) + system-system-spacing #'minimum-distance = #0 + system-system-spacing #'space = #5 + system-system-spacing #'padding = #2 + system-system-spacing #'stretchability = #50 + top-system-spacing #'minimum-distance = #0 + top-system-spacing #'space = #5 + top-system-spacing #'padding = #2 + top-system-spacing #'stretchability = #20 + last-bottom-spacing #'minimum-distance = #0 + last-bottom-spacing #'space = #5 + last-bottom-spacing #'padding = #2 + last-bottom-spacing #'stretchability = #20 + + score-markup-spacing #'space = #5 + score-markup-spacing #'stretchability = #50 + + markup-markup-spacing #'space = #5 + markup-markup-spacing #'stretchability = #30 } \layout { \context { \StaffGroup - \override StaffGrouper #'between-staff-spacing #'space = 5 - \override StaffGrouper #'between-staff-spacing #'stretchability = #4.5 +% \override StaffGrouper #'staff-staff-spacing #'space = 5 + \override StaffGrouper #'staff-staff-spacing #'stretchability = #4.5 } \context { \GrandStaff - \override StaffGrouper #'between-staff-spacing #'space = 5 - \override StaffGrouper #'between-staff-spacing #'stretchability = #4.5 +% \override StaffGrouper #'staff-staff-spacing #'space = 5 + \override StaffGrouper #'staff-staff-spacing #'stretchability = #4.5 } \context { \ChoirStaff - \override StaffGrouper #'between-staff-spacing #'space = 5 - \override StaffGrouper #'between-staff-spacing #'stretchability = #3 +% \override StaffGrouper #'staff-staff-spacing #'space = 5 + \override StaffGrouper #'staff-staff-spacing #'stretchability = #3 } \context { \Staff - \override StaffGrouper #'between-staff-spacing #'space = 1 - \override StaffGrouper #'between-staff-spacing #'stretchability = #4.9 +% \override StaffGrouper #'staff-staff-spacing #'space = 1 + \override StaffGrouper #'staff-staff-spacing #'stretchability = #4.9 } \context { \Score - \override StaffGrouper #'between-staff-spacing #'space = 5 - \override StaffGrouper #'between-staff-spacing #'stretchability = #5 +% \override StaffGrouper #'staff-staff-spacing #'space = 5 + \override StaffGrouper #'staff-staff-spacing #'stretchability = #5 + } + \context { \Lyrics + \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'minimum-distance = ##f } } +%{ + system-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1) (stretchability . 60)) + score-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1) (stretchability . 120)) + markup-system-spacing = #'((space . 5) (padding . 0.5) (stretchability . 30)) + score-markup-spacing = #'((space . 12) (padding . 0.5) (stretchability . 60)) + markup-markup-spacing = #'((space . 1) (padding . 0.5)) + top-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0)) + top-markup-spacing = #'((space . 0) (padding . 1) (minimum-distance . 0)) + last-bottom-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 30))%} diff --git a/testsuite/titlepage.ly b/testsuite/titlepage.ly index caf0185..983750f 100644 --- a/testsuite/titlepage.ly +++ b/testsuite/titlepage.ly @@ -22,7 +22,7 @@ instruments = \markup { \column { \line {"Flauto, 2 Clarinetti/Oboi, 2 Corni,"} \line {"2 Trombe, Timpani, 2 Violini, Viola,"} - \line {"Violoncello ed Contrabbasso"}} } + \line {"Violoncello ed Contrabasso"}} } subsubtitle = \markup{ \medium \fontsize #1 "Trivial to play" } } -- 2.11.4.GIT