From 19dbdc1cd16bc7c14cced07c5e1ae9c0592fac44 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Thu, 8 May 2014 21:49:16 +0100 Subject: [PATCH] =?UTF-8?q?Corrections.=20Les=20options=20sont=20=C3=A0=20?= =?UTF-8?q?pr=C3=A9sent=20bien=20pass=C3=A9es=20au=20packages.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- songbook_core/data/latex/crepbook.sty | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/songbook_core/data/latex/crepbook.sty b/songbook_core/data/latex/crepbook.sty index 2057c6ec..5e2362d4 100644 --- a/songbook_core/data/latex/crepbook.sty +++ b/songbook_core/data/latex/crepbook.sty @@ -7,15 +7,18 @@ \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{crepbook}[2014/04/13 Crepbook Package, version 0.1] -\RequirePackage{SongbookUtils} - \newif{\iffancycapo} -\DeclareOption{fancy-capo}{\iffancycapotrue} +\DeclareOption{fancy-capo}{\fancycapotrue} \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{SongbookUtils}} - \ProcessOptions\relax +\RequirePackage{SongbookUtils} + +\ifpictures + \fancycapotrue +\fi + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Multilanguage management @@ -119,13 +122,14 @@ \newlength{\capoheight} \setlength{\capoheight}{1.5cm} \renewcommand\capo[1]{% - \iftranscapos% - \transpose{#1}% - \fi% - \mbox{% - \includegraphics[height=\capoheight]{capodastre}% - \put(-22,8){\Large #1} - }% + \iftranscapos% + \transpose{#1}% + \fi% + \mbox{% + \includegraphics[height=\capoheight]{capodastre}% + \put(-22,8){\Large #1} + }% + } \fi % Fonts definitions