From 1e233215361c1842362eff91075507fe863b40b0 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Tue, 20 Nov 2012 22:55:26 +0100
Subject: [PATCH] Templates: Cleanup the fields

---
 Templates/EK_Full/Lily_Settings_Global.ily |  2 ++
 Templates/EK_Full/TeX_Settings.itex        |  2 +-
 Templates/default/webshop_descriptions.def | 23 +++++++++++++++++------
 editionkainhofer.sty                       |  4 ++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Templates/EK_Full/Lily_Settings_Global.ily b/Templates/EK_Full/Lily_Settings_Global.ily
index 72438fd..709acc2 100644
--- a/Templates/EK_Full/Lily_Settings_Global.ily
+++ b/Templates/EK_Full/Lily_Settings_Global.ily
@@ -10,6 +10,7 @@
   subtitle = "<< subtitle >>"
   titlepagesubtitle = "<< subtitle >>"
   composer = "<< composer >><$ if composerdate $> (<< composerdate >>)<$ endif $>"
+  shortcomposer = "<<composer>>"
 <$- if arranger $>
   arranger = "<< arranger >><$ if arrangerdate $> (<<arrangerdate >>)<$ endif $>"<$ endif $>
   copyright = \markup \abs-fontsize #9 \column{
@@ -18,6 +19,7 @@
 	 <$- else $><< publisher >>, <$ endif $> \concat{\fromproperty #'header:scorenumber .} Alle Rechte vorbehalten / All rights reserved / Printed in Austria. }
 %       \line {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
   }
+%  ismn = "..."
 }
 
 %% Possibly adjust the \orchestralScoreStructure here...
diff --git a/Templates/EK_Full/TeX_Settings.itex b/Templates/EK_Full/TeX_Settings.itex
index 02fe052..c0d6878 100644
--- a/Templates/EK_Full/TeX_Settings.itex
+++ b/Templates/EK_Full/TeX_Settings.itex
@@ -30,7 +30,7 @@
 <$ if publisherurl -$>
 \publisherurl{<< publisherurl >>}
 <$ endif -$>
-\publisher{<$ if publisherurl $>\href{<< publisherurl >>}{<< publisher >>, << publisherurl >>}<$ else $><< publisher >><$ endif $>}
+\publisher{<< publisher >>}
 <$ if shortpublisher -$>
 \shortpublisher{<$ if publisherurl $>\href{<< publisherurl >>}{<< shortpublisher >>}<$ else $><< shortpublisher >><$ endif $>}
 <$ else -$>
diff --git a/Templates/default/webshop_descriptions.def b/Templates/default/webshop_descriptions.def
index 47bb8a3..710b9f4 100644
--- a/Templates/default/webshop_descriptions.def
+++ b/Templates/default/webshop_descriptions.def
@@ -1,19 +1,30 @@
 {
-  "title": u"<<shortcomposer|default(composer)>>: << title >>, << subtitle >>",
+#  "subtitle": u"<< subtitle >>",
+#  "subtitle_en": u"<< subtitle_en |default(subtitle) >>",
 
-  "Short_Description_en": u"",
   "Short_Description_de": u"",
+  "Short_Description_en": u"",
   
   "Description_de": u'''<p></p>''',
   "Description_en": u'''<p></p>''',
   
+#  "instrumentation": u"",
+
   "Category": u"",
-  
-  "Child_Products": {
+
+  #"published": "Y",
+
+  "Child_Products": [
+#   {"sku": "...", "ismn": "...", "type": "Overrides SCORETYPE", "type_en": "English TYPE", "comment": "COMMENT to be displayed", "price": "..."},
 <$- for e in webshop_editions $>
-    "<< e.sku >>": {"ismn": "<<e.ismn>>", "comment": "<<e.comment>>", "price": <<e.price|default(0.00)>>}, # << e.type >>
+    {"sku": u"<< e.sku >>", "ismn": u"<<e.ismn>>", "comment": u"<<e.comment>>", "price": <<e.price|default(0.00)>>}, # << e.type >>
 <$- endfor $>
-  },
+  ],
   "Productimages": [
+#    "FILENAME.png",
   ],
+  "Downloadfiles": [
+#    {"filename": u"out/INFILENAME.pdf", "outname": u"OUTFILENAME.pdf", "title": u"COMPOSER: WORK, DISPLAYED DOWNLOADTITLE", "desc": u"..."}, 
+#   "out/FILENAME.pdf",
+  ]
 }
diff --git a/editionkainhofer.sty b/editionkainhofer.sty
index b36e62e..6d9d590 100644
--- a/editionkainhofer.sty
+++ b/editionkainhofer.sty
@@ -242,7 +242,7 @@
   \ifx\@shortpublisher\@empty\@publisher\else\@shortpublisher\fi\ifx\@scorenumber\@empty%
   \else, \@scorenumber\fi
   }
-  % \vfill\null
+  \vfill\null
   \end{center}
   \thispagestyle{empty} %\null
   \end{titlepage}%
@@ -264,6 +264,7 @@
   \pagebreak
   \thispagestyle{empty}\null
   \pagebreak
+  \vfill\vfill\vfill\vfill\vfill\vfill
   \backpage
 }
 
@@ -273,7 +274,6 @@
   \null
   \ifx\@ismn\@empty%
   \else
-    \vfill\vfill\vfill\vfill\vfill\vfill
     \begin{center}
     \begin{minipage}[c]{4.4cm}
     \centering
-- 
2.11.4.GIT