Création d'un répertoire SHARE, qui contient des données

examples/example.sb → share/examples/example.sb

@@ -1,5 +1,4 @@
 {
-"template" : "default.tmpl",
 "bookoptions" : [
     "importantdiagramonly",
     "repeatchords",

examples/templates/default.tmpl → share/templates/default.tmpl

@@ -4,7 +4,7 @@
 % This program is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License
 % as published by the Free Software Foundation; either version 2
-% of the License, or (at your option) any later nersion.
+% of the License, or (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,8 +25,8 @@
 % Template parameters
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%:[
-%%:  {"name":"title", "description":"Title", "default":"Song book example", "mandatory":true},
+%%:  {"name":"title", "description":"Title", "default":"Recueil de chansons pour guitare", "mandatory":true},
-%%:  {"name":"author", "description":"Author", "default":"The Songbook team (Crep (R. Goffe), Lohrun (A. Dupas), et al.)", "mandatory":true},
+%%:  {"name":"author", "description":"Author", "default":"The Songbook Team", "mandatory":true},
 %%:  {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true},
 %%:  {"name":"lang", "description":"Language", "default":"english"},
 %%:  {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]},
@@ -37,7 +37,7 @@
 %%:  {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},
 %%:  {"name":"picture", "description":"Picture", "type":"file", "default":"treble_a"},
 %%:  {"name":"picturecopyright", "description":"Copyright", "default":"Dbolton \\url{http://commons.wikimedia.org/wiki/User:Dbolton}"},
-%%:  {"name":"footer", "description":"Footer", "default":""},
+%%:  {"name":"footer", "description":"Footer", "default":"\\begin{flushright}Generated using Songbook (\\url{http://www.patacrep.com})\\end{flushright}"},
 %%:  {"name":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"},
 %%:  {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#D1E4AE"},
 %%:  {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#D1E4AE"},

songbook/__init__.py

@@ -1 +1,6 @@
+import os
+
 __VERSION__ = "3.7.2"
+
+# Directory containing shared data (default templates, custom LaTeX packages, etc.)
+__SHAREDIR__ = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "share"))

songbook/build.py

@@ -12,6 +12,7 @@ import sys
 from songbook.files import recursiveFind
 from songbook.index import processSXD
 from songbook.songs import Song, SongsList
+from songbook import __SHAREDIR__
 
 def parseTemplate(template):
     embeddedJsonPattern = re.compile(r"^%%:")
@@ -61,8 +62,6 @@ def makeTexFile(sb, output):
     datadir = sb['datadir']
     name = output[:-4]
     template_dir = os.path.join(datadir, 'templates')
-    # default value
-    template = "patacrep.tmpl"
     songs = []
 
     prefixes_tex = ""
@@ -75,6 +74,8 @@ def makeTexFile(sb, output):
     if "template" in sb:
         template = sb["template"]
         del sb["template"]
+    else:
+        template = os.path.join(__SHAREDIR__, "templates", "default.tmpl")
     if "songs" in sb:
         songs = sb["songs"]
         del sb["songs"]
@@ -179,7 +180,7 @@ def buildsongbook(sb, basename):
 
     if not os.environ.has_key('TEXINPUTS'):
         os.environ['TEXINPUTS'] = ''
-    os.environ['TEXINPUTS'] += os.pathsep + os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'latex')
+    os.environ['TEXINPUTS'] += os.pathsep + os.path.join(__SHAREDIR__, 'latex')
     os.environ['TEXINPUTS'] += os.pathsep + os.path.join(sb['datadir'], 'latex')
 
     # First pdflatex pass