Merge branch 'next' of https://github.com/patacrep/songbook-data into next

Conflicts:
	templates/data.tex
	templates/naheulbeuk.tex

latex/license.tex

@@ -1,5 +1,5 @@
 %Licence Creative Commons
-\iflanguage{english}{
+\IfStrEq{\mainlanguage}{english}{
   \phantomsection
   \addcontentsline{toc}{section}{License}
   \begin{center}

templates/patacrep.tex → templates/data.tex

@@ -16,7 +16,6 @@
 % 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},
@@ -43,7 +42,7 @@
 (% endvariables %)
 
 % begin document
-(* extends "default.tex" *)
+(* extends "patacrep.tex" *)
 
 (* block preambule *)
 \usepackage{licence}

templates/naheulbeuk.tex

@@ -40,11 +40,13 @@
 ]
 (% endvariables %)
 
-(* extends "patacrep.tex" *)
+(* extends "data.tex" *)
 
 (* block preambule *)
+(( super() ))
+
 \usepackage{venturisold}
 \renewcommand{\printchord}[1]{\mdseries\ttfamily\upshape#1}
 
 \usepackage{licence}
-(* endblock *)
+(* endblock *)