Merge branch 'master' into datadirs

Conflicts:
	songbook_core/data/templates/layout.tex

songbook_core/data/templates/default.tex

@@ -21,6 +21,12 @@
 
 (* variables *)
 {
+"classoptions": {"description": {"english": "LaTeX class options", "french": "Options de la classe LaTeX"},
+               "type": "flag",
+               "join": ",",
+               "mandatory": true,
+               "default": {"default":[]}
+            },
 "title": {"description": {"english": "Title", "french": "Titre"},
             "default": {"english": "Guitar songbook", "french": "Recueil de chansons pour guitare"},
             "mandatory":true
@@ -69,6 +75,12 @@
 (* extends "songs.tex" *)
 (* set indexes = "titleidx,authidx" *)
 
+(* block documentclass *)
+\documentclass[(* for option in classoptions *)
+            ((option)),
+          (* endfor *)]{article}
+(* endblock *)
+
 
 (* block songbookpreambule *)
    (( super() ))

songbook_core/data/templates/layout.tex

@@ -26,23 +26,15 @@
 %%
 %% Generated using Songbook <http://www.patacrep.com>
 
-(* variables *)
-{
-"mainfontsize": {"description": {"english": "Font Size", "french": "Taille de police"},
-               "type":"font",
-               "default":{"default": "10"}
-            }
-}
-(* endvariables *)
-
-(* block documentclass *)
-\documentclass[((mainfontsize))pt]{article}
 \makeatletter
 \def\input@path{(* for dir in datadir *)
                  {((dir))/latex/} %
                  (* endfor *)
                  }
 \makeatother
+
+(* block documentclass *)
+\documentclass{article}
 (* endblock *)
 
 (* block songbookpackages *)