From 0d1b455d9be20594f32ef04d9ac66f949d39c688 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Fri, 25 Sep 2009 16:03:32 +0200 Subject: [PATCH] Use different templates for Vocal and Choral Score; Use 19x27cm for Vocal score --- Templates/TEMPLATE_Settings.ily | 1 - Templates/TEMPLATE_Settings_ChoralScore.ily | 2 ++ Templates/TEXTEMPLATE_Score.tex | 2 +- Templates/TEXTEMPLATE_Score_Instruments.tex | 2 +- editionkainhofer.sty | 10 +++++++ generate_oly_score.py | 17 +++++++++++- oly_settings_choralscore.ily | 43 +++++++++++++++++++++++++++++ oly_settings_global.ily | 1 + oly_settings_vocalscore.ily | 32 ++++++++++----------- 9 files changed, 90 insertions(+), 20 deletions(-) create mode 100644 Templates/TEMPLATE_Settings_ChoralScore.ily create mode 100644 oly_settings_choralscore.ily rewrite oly_settings_vocalscore.ily (65%) diff --git a/Templates/TEMPLATE_Settings.ily b/Templates/TEMPLATE_Settings.ily index 247c35e..77b219c 100644 --- a/Templates/TEMPLATE_Settings.ily +++ b/Templates/TEMPLATE_Settings.ily @@ -1,4 +1,3 @@ -#(set-default-paper-size "a4") #(ly:set-option 'point-and-click #f) \include "deutsch.ly" diff --git a/Templates/TEMPLATE_Settings_ChoralScore.ily b/Templates/TEMPLATE_Settings_ChoralScore.ily new file mode 100644 index 0000000..c02f284 --- /dev/null +++ b/Templates/TEMPLATE_Settings_ChoralScore.ily @@ -0,0 +1,2 @@ +\include "orchestrallily/oly_settings_choralscore.ily" +\include "%(basename)s_Settings.ily" diff --git a/Templates/TEXTEMPLATE_Score.tex b/Templates/TEXTEMPLATE_Score.tex index 1542b08..fd262ec 100644 --- a/Templates/TEXTEMPLATE_Score.tex +++ b/Templates/TEXTEMPLATE_Score.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage{orchestrallily/editionkainhofer} +\usepackage%(ekopts)s{orchestrallily/editionkainhofer} \input{TeX_%(tex_basename)s_Settings.itex} \hypersetup{ diff --git a/Templates/TEXTEMPLATE_Score_Instruments.tex b/Templates/TEXTEMPLATE_Score_Instruments.tex index e5ed02a..b4c5dba 100644 --- a/Templates/TEXTEMPLATE_Score_Instruments.tex +++ b/Templates/TEXTEMPLATE_Score_Instruments.tex @@ -1,5 +1,5 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} -\usepackage{orchestrallily/editionkainhofer} +\usepackage%(ekopts)s{orchestrallily/editionkainhofer} \input{TeX_%(tex_basename)s_Settings.itex} \hypersetup{ diff --git a/editionkainhofer.sty b/editionkainhofer.sty index fd4ec43..46fff33 100644 --- a/editionkainhofer.sty +++ b/editionkainhofer.sty @@ -24,6 +24,16 @@ \nopagecolor \usepackage{pdfpages} +\DeclareOption{vocalscore} + {\setlength\paperheight {270mm}% + \setlength\paperwidth {190mm}% + \geometry{papersize={190mm,270mm}}% + \typeout{processing vocalscore} + } +% \ExecuteOptions{vocalscore} +\ProcessOptions + + \definecolor{cover}{rgb}{0.27,0.25,0.72} % {69,40,234} \newcommand{\setfullscore}{ diff --git a/generate_oly_score.py b/generate_oly_score.py index 1878a95..bd442ec 100755 --- a/generate_oly_score.py +++ b/generate_oly_score.py @@ -163,6 +163,7 @@ template_names = { "settings_instrument": "TEMPLATE_Settings_Instrument.ily", "settings_vocalvoice": "TEMPLATE_Settings_VocalVoice.ily", "settings_vocalscore": "TEMPLATE_Settings_VocalScore.ily", + "settings_choralscore": "TEMPLATE_Settings_ChoralScore.ily", "snippet_part_score": "TEMPLATE_Snippet_PartScore.ily", @@ -245,6 +246,7 @@ def generate_settings_files (settings, templates, replacements): if (settings.get("lyrics", [])): write_settings_file (output_dir + basename + "_Settings_VocalVoice.ily", templates["settings_vocalvoice"] % replacements ); write_settings_file (output_dir + basename + "_Settings_VocalScore.ily", templates["settings_vocalscore"] % replacements ); + write_settings_file (output_dir + basename + "_Settings_ChoralScore.ily", templates["settings_choralscore"] % replacements ); del replacements["includefiles"] @@ -340,7 +342,7 @@ score_names = { } score_settings = { "OrganScore": "VocalScore", - "ChoralScore": "VocalScore", + "ChoralScore": "ChoralScore", "LongScore": "FullScore", "OriginalScore": "FullScore", "Particell": "FullScore" @@ -392,6 +394,10 @@ def write_tex_file (fn, contents): write_file (output_dir + "/"+ fn, contents ); tex_files.append (fn) +packageoptions = { + "Vocal": ["vocalscore"], +} + def generate_tex_files (settings, templates, replacements): basename = replacements["tex_basename"] write_tex_file ("TeX_" + basename + "_Settings.itex", templates["itex_settings"] % replacements); @@ -440,6 +446,10 @@ def generate_tex_files (settings, templates, replacements): ### Score files for s in settings.get ("scores", []): + opts = ",".join (packageoptions.get (s, [])); + if opts: + opts = "["+opts+"]"; + replacements["ekopts"] = opts; replacements["scoretype"] = s; write_tex_file ("TeX_" + basename + "_Score_" + s + ".tex", templates["tex_score"] % replacements); del replacements["scoretype"]; @@ -448,12 +458,17 @@ def generate_tex_files (settings, templates, replacements): replacements["scoretype"] = "InstrumentalParts" lst = "" for i in settings.get ("instruments", []): + opts = ",".join (packageoptions.get (s, [])); + if opts: + opts = "["+opts+"]"; + replacements["ekopts"] = opts; replacements["instrument"] = i lst += templates["itex_snippet_instrument"] % replacements; del replacements["instrument"] replacements["instrumentscores"] = lst; write_tex_file ("TeX_" + basename + "_Score_Instruments.tex", templates["tex_instruments"] % replacements); del replacements["instrumentscores"]; + del replacements["ekopts"]; diff --git a/oly_settings_choralscore.ily b/oly_settings_choralscore.ily new file mode 100644 index 0000000..3c63c0c --- /dev/null +++ b/oly_settings_choralscore.ily @@ -0,0 +1,43 @@ +% lilypond input for Choral scores: A4, 5mm staff height +\include "orchestrallily/oly_settings_fullscore.ily" + +% Don't print short instruments name, they are clear from the beginning +OShortInstrumentName = #f +OIShortInstrumentName = #f +OIIShortInstrumentName = #f +OrganShortInstrumentName = #f +BCShortInstrumentName = #f +PfeShortInstrumentName = #f +SShortInstrumentName = #f +AShortInstrumentName = #f +TShortInstrumentName = #f +BShortInstrumentName = #f + +OIInstrumentName = #f +OIIInstrumentName = #f + +% A4 with 1.5 cm margin. The system bracket will not count towards the margin, +% so the left margin will be 1.5 mm larger! +\paper { + paper-width = 21\cm + paper-height = 29.7\cm + left-margin = 1.65\cm + right-margin = 1.5\cm + line-width = 17.85\cm +} + +% Create MIDI and PDF! +% \setCreateMIDI ##t +% \setCreatePDF ##t + +% 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_global.ily b/oly_settings_global.ily index 39619eb..7d8dd43 100644 --- a/oly_settings_global.ily +++ b/oly_settings_global.ily @@ -104,3 +104,4 @@ subitopp = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) } %} +% #(set-default-paper-size "a4") diff --git a/oly_settings_vocalscore.ily b/oly_settings_vocalscore.ily dissimilarity index 65% index d309ef6..43ba65f 100644 --- a/oly_settings_vocalscore.ily +++ b/oly_settings_vocalscore.ily @@ -1,16 +1,16 @@ -% lilypond input for vocal scores -% changes to the full score settings for vocal scores -\include "orchestrallily/oly_settings_fullscore.ily" - -% #(set-default-paper-size "a4") -% #(set-global-staff-size 15.95) -#(set-global-staff-size 14.5) - -\paper { - system-separator-markup = #f -} - -SShortInstrumentName = #f -AShortInstrumentName = #f -TShortInstrumentName = #f -BShortInstrumentName = #f +% lilypond input for vocal scores +% changes to the full score settings for vocal scores +\include "orchestrallily/oly_settings_choralscore.ily" + +% Use 27x19 cm paper, 1.5cm margins. +\paper { + paper-width = 19\cm + paper-height = 27\cm + + left-margin = 1.5\cm + right-margin = 1.5\cm + line-width = 16\cm +} + +% 5 mm staff height (piano should be 5.5, but that will be left as a future exercise) +#(set-global-staff-size 14.5) -- 2.11.4.GIT