X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=blobdiff_plain;f=dev%2Flatex%2Fbclogo.sty;h=c0967b6e00992be2e7b8a710a7859e358a76cc1b;hb=9ae7bdf916a9036f0be2cf85f628762c563bde3a;hp=a91063fea051b18d6f70963af88467ec6895ba05;hpb=7a9c3b15fec77cbdac85e30da09c93030a385fff;p=bclogo.git

diff --git a/dev/latex/bclogo.sty b/dev/latex/bclogo.sty
index a91063f..c0967b6 100644
--- a/dev/latex/bclogo.sty
+++ b/dev/latex/bclogo.sty
@@ -3,35 +3,34 @@
 \def\fileversion{v3.0}%
 \def\filedate{2011/10/01}%
 \ProvidesPackage{bclogo}[\filedate\space\fileversion]%
-
+%
 % Extensions a charger
 \RequirePackage{xkeyval,ifthen}%
 \RequirePackage{graphicx}%
 \RequirePackage{mdframed}%
-
+%
 %% Les options globales du package sont au nombre de 2: tikz ou pstricks
 \newif\ifbclogotikz%
 \newif\ifbclogoblur%
 \define@key{bclogo.sty}{tikz}[]{\bclogotikztrue}%
 \define@key{bclogo.sty}{pstricks}[]{\bclogotikzfalse}%
 \define@key{bclogo.sty}{blur}[]{\bclogoblurtrue}%
-
+%
 % quelques dimensions
 \newlength{\bc@invboxh}\newlength{\bc@invboxd}%
 \newlength{\bc@titleLength}%
-\newlength{\logowidth}
-\newlength{\bc@mdfboxwidth}
-\newlength{\bc@mdfboxheight}
-% \newlength{\bc@mdf@ymargin@length}
-
+\newlength{\logowidth}%
+\newlength{\bc@mdfboxwidth}%
+\newlength{\bc@mdfboxheight}%
+%\newlength{\bc@mdf@ymargin@length}
+%
 \setlength{\logowidth}{17pt}%
 \ProcessOptionsX%
 %
-
 \ifbclogotikz%
         \RequirePackage{tikz}%
         \usetikzlibrary{shadows}% pour l'ombre
-        \usetikzlibrary{decorations.pathmorphing} % pour la barre ondulee
+        \usetikzlibrary{decorations.pathmorphing}% pour la barre ondulee
         \def\bc@mdf@style{1}%
         \input{bclogoMdframedTikz}%
 \else%
@@ -184,10 +183,10 @@
 \define@boolkey{bclogo}{noborder}[true]{\ifKV@bclogo@noborder\setlength{\bcval@borderWidth}{\z@}\fi}%
 \define@boolkey{bclogo}{ombre}[true]{}%
 \define@boolkey{bclogo}{avecBarre}[true]{}%
-\define@boolkey{bclogo}{nobreak}[false]{}%
+\define@boolkey{bclogo}{nobreak}[true]{}%
 \define@boolkey{bclogo}{blur}[true]{\ifKV@bclogo@blur\KV@bclogo@ombretrue\fi}%
 \define@choicekey{bclogo}{barre}{none,line,snake,motif,zigzag,imageExt,imageClip, wave}[line]{%
-\ifthenelse{\equal{#1}{none}}{\KV@bclogo@avecBarrefalse}%
+\ifthenelse{\equal{#1}{none}}{\KV@bclogo@avecBarrefalse\gdef\bc@barre{}}%
 {\gdef\bc@barre{\ifKV@bclogo@avecBarre\@nameuse{bc@barre#1}\fi}}%
 }%
 %
@@ -306,7 +305,7 @@ clip=true]{\bcval@imageBarre}%
   \end{lrbox}%
 % affichage
 %\smallskip% ressort %% Pourquoi ?
-\def\bcval@nobreak{\ifKV@bclogo@nobreak true\else false\fi} % gestion nobreak
+\def\bcval@nobreak{\ifKV@bclogo@nobreak true\else false\fi}% gestion nobreak
 \mdframed[%
  innerleftmargin={\dimexpr\ifKV@bclogo@avecBarre\logowidth\else\z@\fi+\bcval@framesep\relax},%
  innertopmargin={\dimexpr\ht\bc@envbox+\dp\bc@envbox+\bcval@framesep\relax},%hauteur titre+framesep
@@ -318,11 +317,12 @@ clip=true]{\bcval@imageBarre}%
  fontcolor=\bcval@couleurTexte,%
  linewidth=\bcval@borderWidth,%
  roundcorner={\bcval@arrondi cm},%
- nobreak= \bcval@nobreak]%
+ \ifdef{\mdf@nobreak}{,nobreak=\bcval@nobreak}{}%%l'option nobreak de mdframed vient avec la version 0.9
+]%
 }%
 {%
 \endmdframed\par%
 \ifKV@bclogo@ombre\vspace*{\bcval@epOmbre cm}\else\smallskip\fi%
 \goodbreak%
 }%
-
+\setkeys{bclogo}{barre=none}%% en cas d'utlisation de l'environnement mdframed