Modif. bclogo.sty pour compatibilite avec mdframed

diff --git a/dev/latex/bclogo.sty b/dev/latex/bclogo.sty
index a91063f..6fb1da2 100644 (file)
--- a/dev/latex/bclogo.sty
+++ b/dev/latex/bclogo.sty
@@ -3,19 +3,19 @@
 \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}%
@@ -23,15 +23,15 @@
 \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%
@@ -187,7 +187,7 @@
 \define@boolkey{bclogo}{nobreak}[false]{}%
 \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 +306,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 +318,11 @@ clip=true]{\bcval@imageBarre}%
  fontcolor=\bcval@couleurTexte,%
  linewidth=\bcval@borderWidth,%
  roundcorner={\bcval@arrondi cm},%
- nobreak= \bcval@nobreak]%
+ nobreak=\bcval@nobreak]%
 }%
 {%
 \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 

diff --git a/dev/latex/bclogoMdframedPst.tex b/dev/latex/bclogoMdframedPst.tex
index 8632fa8..1672dfd 100644 (file)
--- a/dev/latex/bclogoMdframedPst.tex
+++ b/dev/latex/bclogoMdframedPst.tex
@@ -1,4 +1,4 @@
-%% This is a part of bclogo.sty v2.27
+%% This is a part of bclogo.sty v3.0
 %% This file is loaded by bclogo when pstrick is used
 %% It is a modification of md-frame-3.mdf file, from the mdframed package
 %% This file may be distributed under the terms of the LaTeX Project
@@ -57,8 +57,7 @@
        \end{pspicture}%
      }%
 }%
-
-
+%
 \def\md@putbox@first{%tete d'une boite coupée
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
         \setlength\bc@mdfboxwidth{\wd\tw@}%
@@ -138,8 +137,8 @@
                 \rput[bl](\dimexpr\mdf@innerleftmargin@length+\mdf@middlelinewidth@length,0){\box\tw@}%
            \end{pspicture}%
      }%
-}
-
+}%
+%
 \def\md@putbox@middle{%milieu d'une boite coupée (occupe une page entière)
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
         \setlength\bc@mdfboxwidth{\wd\tw@}%

diff --git a/dev/latex/bclogoMdframedTikz.tex b/dev/latex/bclogoMdframedTikz.tex
index 60de914..1d48e69 100644 (file)
--- a/dev/latex/bclogoMdframedTikz.tex
+++ b/dev/latex/bclogoMdframedTikz.tex
@@ -1,4 +1,4 @@
-% This is a part of bclogo.sty v3.0
+%% This is a part of bclogo.sty v3.0
 %% This file is loaded by bclogo when tikz is used
 %% It is a modification of md-frame-1.mdf file, from mdframed package
 %% This file may be distributed under the terms of the LaTeX Project