From 60e884f3dcebc3e76af69efded90c9352e936145 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Fri, 25 Sep 2009 16:01:22 +0200 Subject: [PATCH] Add tex_basename to template settings (allows different name for TeX than Ly) --- Templates/TEXTEMPLATE_Include_Preface_Long.itex | 8 ++++---- Templates/TEXTEMPLATE_Score.tex | 10 +++++----- Templates/TEXTEMPLATE_Score_Instruments.tex | 10 +++++----- Templates/TEXTEMPLATE_Settings.itex | 2 +- Templates/oly_structure.def | 1 + generate_oly_score.py | 18 +++++++++++------- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Templates/TEXTEMPLATE_Include_Preface_Long.itex b/Templates/TEXTEMPLATE_Include_Preface_Long.itex index dd36bb7..fce9536 100644 --- a/Templates/TEXTEMPLATE_Include_Preface_Long.itex +++ b/Templates/TEXTEMPLATE_Include_Preface_Long.itex @@ -1,12 +1,12 @@ \frontmatter \maketitle -\input{TeX_%(basename)s_Include_ContentsMaterial.itex} +\input{TeX_%(tex_basename)s_Include_ContentsMaterial.itex} \cleardoublepage -\input{TeX_%(basename)s_Include_About.itex} -\input{TeX_%(basename)s_Include_Text.itex} +\input{TeX_%(tex_basename)s_Include_About.itex} +\input{TeX_%(tex_basename)s_Include_Text.itex} \pagebreak -\input{TeX_%(basename)s_Include_Leben.itex} +\input{TeX_%(tex_basename)s_Include_Leben.itex} \mainmatter \cleardoublepage diff --git a/Templates/TEXTEMPLATE_Score.tex b/Templates/TEXTEMPLATE_Score.tex index 5f6a0c7..1542b08 100644 --- a/Templates/TEXTEMPLATE_Score.tex +++ b/Templates/TEXTEMPLATE_Score.tex @@ -1,6 +1,6 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} \usepackage{orchestrallily/editionkainhofer} -\input{TeX_%(basename)s_Settings.itex} +\input{TeX_%(tex_basename)s_Settings.itex} \hypersetup{ pdftitle={\scoreTitle, \%(scoretype)sScoreType}, @@ -11,8 +11,8 @@ \%(scoretype)sScoreSettings \begin{document} -\input{TeX_%(basename)s_Include_Coverpage.itex} -\input{TeX_%(basename)s_Include_Preface_Long.itex} +\input{TeX_%(tex_basename)s_Include_Coverpage.itex} +\input{TeX_%(tex_basename)s_Include_Preface_Long.itex} \phantomsection \addcontentsline{toc}{section}{\%(scoretype)sScoreType} @@ -21,7 +21,7 @@ \cleardoublepage \backmatter \appendix -\input{TeX_%(basename)s_Include_KritBericht.itex} +\input{TeX_%(tex_basename)s_Include_KritBericht.itex} -\input{TeX_%(basename)s_Include_Backpage.itex} +\input{TeX_%(tex_basename)s_Include_Backpage.itex} \end{document} diff --git a/Templates/TEXTEMPLATE_Score_Instruments.tex b/Templates/TEXTEMPLATE_Score_Instruments.tex index 83b757f..e5ed02a 100644 --- a/Templates/TEXTEMPLATE_Score_Instruments.tex +++ b/Templates/TEXTEMPLATE_Score_Instruments.tex @@ -1,6 +1,6 @@ \documentclass[a4paper,10pt,naustrian,twoside]{report} \usepackage{orchestrallily/editionkainhofer} -\input{TeX_%(basename)s_Settings.itex} +\input{TeX_%(tex_basename)s_Settings.itex} \hypersetup{ pdftitle={\scoreTitle, \%(scoretype)sType}, @@ -11,15 +11,15 @@ \%(scoretype)sSettings \begin{document} -\input{TeX_%(basename)s_Include_Coverpage.itex} -\input{TeX_%(basename)s_Include_Preface_Long.itex} +\input{TeX_%(tex_basename)s_Include_Coverpage.itex} +\input{TeX_%(tex_basename)s_Include_Preface_Long.itex} %(instrumentscores)s \cleardoublepage \backmatter \appendix -\input{TeX_%(basename)s_Include_KritBericht.itex} +\input{TeX_%(tex_basename)s_Include_KritBericht.itex} -\input{TeX_%(basename)s_Include_Backpage.itex} +\input{TeX_%(tex_basename)s_Include_Backpage.itex} \end{document} diff --git a/Templates/TEXTEMPLATE_Settings.itex b/Templates/TEXTEMPLATE_Settings.itex index 3dd0864..26d314e 100644 --- a/Templates/TEXTEMPLATE_Settings.itex +++ b/Templates/TEXTEMPLATE_Settings.itex @@ -20,4 +20,4 @@ pdfauthor={%(editor)s <%(editormail)s>} } -\input{TeX_%(basename)s_Include_Todo.itex} +\input{TeX_%(tex_basename)s_Include_Todo.itex} diff --git a/Templates/oly_structure.def b/Templates/oly_structure.def index 3d84d3d..5bfb421 100644 --- a/Templates/oly_structure.def +++ b/Templates/oly_structure.def @@ -12,6 +12,7 @@ "scorenumber": "EK-1234", "basename": "Workname", + "tex_basename": "TeX_Workname", "parts": [ "IFirst", diff --git a/generate_oly_score.py b/generate_oly_score.py index 23f4218..bc35a44 100755 --- a/generate_oly_score.py +++ b/generate_oly_score.py @@ -14,7 +14,6 @@ program_name = 'generate_oly_score' settings_file = 'oly_structure.def' output_dir = '' script_path = os.path.dirname(__file__) -basename = "" settings_files = [] src_files = [] @@ -62,7 +61,7 @@ if files: ###################################################################### def load_settings (file_name): - global output_dir, basename; + global output_dir; try: in_f = open (file_name) s = in_f.read() @@ -76,7 +75,6 @@ def load_settings (file_name): print ("Unable to interpret settings file '%s', it's syntax is invalid. Exiting..." % file_name); exit (-1); - basename = settings_expr.get ("basename", "Score") if not output_dir: output_dir = settings_expr.get ("output_dir", output_dir) + "/"; return settings_expr; @@ -133,6 +131,10 @@ def write_file (file_name, contents): def init_replacements (settings): rep = settings.copy (); + if not rep["basename"]: + rep["basename"] = "Score"; + if not rep["tex_basename"]: + rep["tex_basename"] = rep["basename"]; del rep["parts"]; del rep["instruments"]; del rep["lyrics"]; @@ -230,6 +232,7 @@ def generate_settings_files (settings, templates, replacements): del replacements["filename"]; replacements["includefiles"] = inc + basename = replacements["basename"]; write_settings_file (output_dir + basename + "_Settings.ily", templates["settings"] % replacements ); write_file (output_dir + basename + "_Settings_Global.ily", templates["settings_global"] % replacements ); @@ -285,7 +288,7 @@ def generate_movement_files (settings, templates, replacements): defs += (templates["snippet_def_lyrics"] % replacements); del replacements["instrument"] replacements["movementinstrumentdefinitions"] = defs - fn = basename + "_Music_" + filename_ext + ".ily" + fn = replacements["basename"] + "_Music_" + filename_ext + ".ily" write_file (output_dir + fn, templates["movement"] % replacements); src_files.append (fn) del replacements["movement"] @@ -321,7 +324,7 @@ def generate_instrument_files (settings, templates, replacements): else: settings = "Instrument" replacements["settings"] = settings - fn = output_dir + basename + "_Instrument_" + i + ".ly" + fn = output_dir + replacements["basename"] + "_Instrument_" + i + ".ly" write_file (fn, templates["score_instrument"] % replacements); score_files.append (fn) del replacements["instrument"] @@ -366,9 +369,9 @@ def generate_score_files (settings, templates, replacements): del replacements["movement"] del replacements["movementname"] replacements["partlist"] = defs - filename = output_dir + basename + "_Score_" + i + ".ly"; + filename = output_dir + replacements["basename"] + "_Score_" + i + ".ly"; if i == "": - filename = output_dir + basename + "_Score.ly" + filename = output_dir + replacements["basename"] + "_Score.ly" write_file (filename, templates["score_full"] % replacements); score_files.append (filename) del replacements["score"] @@ -386,6 +389,7 @@ def write_tex_file (fn, contents): tex_files.append (fn) def generate_tex_files (settings, templates, replacements): + basename = replacements["tex_basename"] write_tex_file ("TeX_" + basename + "_Settings.itex", templates["itex_settings"] % replacements); write_tex_file ("TeX_" + basename + "_Include_Coverpage.itex", templates["itex_coverpage"] % replacements); write_tex_file ("TeX_" + basename + "_Include_Backpage.itex", templates["itex_backpage"] % replacements); -- 2.11.4.GIT