From 85265edb7e5c142080c33a0d1bb9ae9b14fa9b00 Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 16 Mar 2014 14:30:44 +0100 Subject: [PATCH 1/2] Prise en compte des modifications des templates de songbook-core --- templates/{patacrep.tex => data.tex} | 4 +++- templates/naheulbeuk.tex | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename templates/{patacrep.tex => data.tex} (98%) diff --git a/templates/patacrep.tex b/templates/data.tex similarity index 98% rename from templates/patacrep.tex rename to templates/data.tex index b05b4712..63b9f276 100644 --- a/templates/patacrep.tex +++ b/templates/data.tex @@ -1,3 +1,4 @@ +(% comment %) % Copyright (C) 2014 The Songbook Team % Copyright (C) 2009-2010 Romain Goffe, Alexandre Dupas % Copyright (C) 2008 Kevin W. Hamlen @@ -48,9 +49,10 @@ %%: {"name":"languages", "description":"List of languages used by songs", "default":""} %%:] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +(% endcomment %) % begin document -(* extends "default.tex" *) +(* extends "patacrep.tex" *) (* block preambule *) \usepackage{licence} diff --git a/templates/naheulbeuk.tex b/templates/naheulbeuk.tex index ca56cad2..b46fc820 100644 --- a/templates/naheulbeuk.tex +++ b/templates/naheulbeuk.tex @@ -1,3 +1,4 @@ +(% comment %) % Copyright (C) 2014 The Songbook Team % Copyright (C) 2009-2010 Romain Goffe, Alexandre Dupas % Copyright (C) 2008 Kevin W. Hamlen @@ -46,15 +47,16 @@ %%: {"name":"languages", "description":"List of languages used by songs", "default":""} %%:] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +(% endcomment %) % begin document -(* extends "patacrep.tex" *) +(* extends "data.tex" *) (* block preambule *) +(( super() )) + \usepackage{venturisold} \renewcommand{\printchord}[1]{\mdseries\ttfamily\upshape#1} - -\usepackage{licence} (* endblock *) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% From acb455ee7733d175b9406c9d34d50f94ec928ceb Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 16 Mar 2014 18:26:35 +0100 Subject: [PATCH 2/2] Prise en charge de la langue principale This reverts commit 06710843d8c2888d884a50e1c62896e7d2a1eb71. --- latex/license.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latex/license.tex b/latex/license.tex index 88932fc6..6cbcb1fd 100644 --- a/latex/license.tex +++ b/latex/license.tex @@ -1,5 +1,5 @@ %Licence Creative Commons -\iflanguage{english}{ +\IfStrEq{\mainlanguage}{english}{ \phantomsection \addcontentsline{toc}{section}{License} \begin{center}