From b80d7d01200fdce24b10a38b7688068647565d03 Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 3 Jun 2014 13:11:17 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Inclusion=20de=20l'unit=C3=A9=20dans=20la?= =?UTF-8?q?=20taille=20de=20la=20police?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- songbook_core/data/templates/layout.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/songbook_core/data/templates/layout.tex b/songbook_core/data/templates/layout.tex index 9a17feab..f6b04b66 100644 --- a/songbook_core/data/templates/layout.tex +++ b/songbook_core/data/templates/layout.tex @@ -30,13 +30,13 @@ { "mainfontsize": {"description": {"english": "Font Size", "french": "Taille de police"}, "type":"font", - "default":{"default": "10"} + "default":{"default": "10pt"} } } (* endvariables *) (* block documentclass *) -\documentclass[((mainfontsize))pt]{article} +\documentclass[((mainfontsize))]{article} (* endblock *) (* block songbookpackages *) From 8048027ebdb2d47eb750298de47d9010130dfecf Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 3 Jun 2014 13:46:12 +0200 Subject: [PATCH 2/2] Remolacement de l'option de template "mainfontsize" par "classoptions" --- songbook_core/data/templates/default.tex | 12 ++++++++++++ songbook_core/data/templates/layout.tex | 11 +---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/songbook_core/data/templates/default.tex b/songbook_core/data/templates/default.tex index 491fb828..802d8806 100644 --- a/songbook_core/data/templates/default.tex +++ b/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() )) diff --git a/songbook_core/data/templates/layout.tex b/songbook_core/data/templates/layout.tex index f6b04b66..c5e1b67f 100644 --- a/songbook_core/data/templates/layout.tex +++ b/songbook_core/data/templates/layout.tex @@ -26,17 +26,8 @@ %% %% Generated using Songbook -(* variables *) -{ -"mainfontsize": {"description": {"english": "Font Size", "french": "Taille de police"}, - "type":"font", - "default":{"default": "10pt"} - } -} -(* endvariables *) - (* block documentclass *) -\documentclass[((mainfontsize))]{article} +\documentclass{article} (* endblock *) (* block songbookpackages *)