From e915bf307c1d43c8b9ccaf3af0033f0de878bea6 Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Wed, 2 Apr 2014 16:01:26 +0200
Subject: [PATCH] Suppression des variables inutiles

Suite aux modifications sur les templates :
https://github.com/patacrep/songbook-core/issues/18
---
 books/naheulbeuk.sb      |  3 ++-
 templates/data.tex       | 28 ++++++----------------------
 templates/naheulbeuk.tex | 23 -----------------------
 3 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/books/naheulbeuk.sb b/books/naheulbeuk.sb
index 6de0cac9..f0436b72 100644
--- a/books/naheulbeuk.sb
+++ b/books/naheulbeuk.sb
@@ -20,5 +20,6 @@
 "authwords" : {
   "sep" : ["and", "et"]
   },
- "datadir" : ".."
+ "datadir" : "..",
+ "notebgcolor" : "FFFDB3"
 }
diff --git a/templates/data.tex b/templates/data.tex
index 4a24cfc0..279aa52e 100644
--- a/templates/data.tex
+++ b/templates/data.tex
@@ -16,29 +16,13 @@
 % along with this program; if not, write to the Free Software
 % Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 % MA  02110-1301, USA.
+
 (% variables %)
-[
-{"name":"title", "description":"Title", "default":"Recueil de chansons pour guitare", "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"]},
-{"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
-{"name":"version", "description":"Version", "default":"unknown"},
-{"name":"subtitle", "description":"Subtitle"},
-{"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
-{"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":"\\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"},
-{"name":"indexbgcolor", "description":"Index Shade", "type":"color", "default":"D1E4AE"},
-{"name":"titleprefixwords", "description":"Ignore some words in the beginning of song titles"},
-{"name":"authwords", "descriptipn":"Set of options to process author string (LaTeX commands authsepword, authignoreword, authbyword)"},
-{"name":"languages", "description":"List of languages used by songs", "default":"english"}
-]
+{
+"version":{ "description": {"en": "Version", "fr": "Version"},
+            "default": {"default": "3.7.2"}
+         }
+}
 (% endvariables %)
 
 % begin document
diff --git a/templates/naheulbeuk.tex b/templates/naheulbeuk.tex
index 554e4c42..53161b20 100644
--- a/templates/naheulbeuk.tex
+++ b/templates/naheulbeuk.tex
@@ -17,29 +17,6 @@
 % Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 % MA  02110-1301, USA.
 
-(% variables %)
-[
-{"name":"title", "description":"Title", "default":"Recueil de chansons pour guitare", "mandatory":true},
-{"name":"author", "description":"Author", "default":"Crep (R. Goffe) \\and Lohrun (A. Dupas)", "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"]},
-{"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
-{"name":"version", "description":"Version", "default":"3.7.2"},
-{"name":"subtitle", "description":"Subtitle"},
-{"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
-{"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},
-{"name":"picture", "description":"Picture", "type":"file", "default":"feel-the-music"},
-{"name":"picturecopyright", "description":"Copyright", "default":"foxygamergirl@deviantart.com"},
-{"name":"footer", "description":"Footer", "default":"\\begin{flushleft}\\includegraphics[width=3cm]{on-fire}\\end{flushleft}"},
-{"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":"FFFDB3"},
-{"name":"indexbgcolor", "description":"Index Shade", "type":"color", "default":"D1E4AE"},
-{"name":"languages", "description":"List of languages used by songs", "default":""}
-]
-(% endvariables %)
-
 (* extends "data.tex" *)
 
 (* block preambule *)