X-Git-Url: https://melusine.eu.org/syracuse/G/git/?p=bclogo.git;a=blobdiff_plain;f=dev%2Flatex%2Fbclogo.sty;fp=dev%2Flatex%2Fbclogo.sty;h=fc65089bb67e6ac43aac1108e4c3fca332068560;hp=acdcf5aceccb2ce06851caee2578ffe42f7be07e;hb=4197ecd5e368f0b35f6a6244232f614d1bf3d586;hpb=50766b48fd4a1b6b6fbe15c335ecc86baec83bbb

diff --git a/dev/latex/bclogo.sty b/dev/latex/bclogo.sty
index acdcf5a..fc65089 100644
--- a/dev/latex/bclogo.sty
+++ b/dev/latex/bclogo.sty
@@ -7,7 +7,7 @@
 % Extensions a charger
 \RequirePackage{xkeyval,ifthen}%
 \RequirePackage{graphicx}%
-\RequirePackage{mdframed}%
+\RequirePackage{mdframedpre}%
 \ifdef{\ifmdf@nobreak}{\relax}{\define@key{mdf}{nobreak}[]{}}%
 %l'option nobreak de mdframed vient qu'avec la version 0.9
 %
@@ -33,7 +33,7 @@
         \RequirePackage{tikz}%
         \usetikzlibrary{shadows}% pour l'ombre
         \usetikzlibrary{decorations.pathmorphing}% pour la barre ondulee
-        \def\bc@mdf@style{1}%pour la version 0.6
+        \def\bc@mdf@style{1}%pour la version 0.6 de mdframed
         \input{bclogoMdframedTikz}%redefinition des macros d'affichage 
 \else%
         \RequirePackage{pstricks}%
@@ -44,7 +44,7 @@
                 \let\pagecolorOLD\pagecolor% modification pour sauvegarde de la couleur du fond
                 \def\pagecolor#1{\gdef\psx@blurbg{#1}\pagecolorOLD{#1}}%suppose l'utilisation: \pagecolor{couleur}
         \fi%
-        \def\bc@mdf@style{3}%%pour la version 0.6
+        \def\bc@mdf@style{3}%%pour la version 0.6 de mdframed
         \input{bclogoMdframedPst}%redefinition des macros d'affichage
 \fi%
 \edef\Gin@extensions{.mps,\Gin@extensions}%
@@ -198,7 +198,7 @@ avecBarre=true,noborder=false,marge,sousTitre, couleurBord,blur=false, nobreak=f
 %
 %les differentes commandes de barre verticale a gauche
 %
-\newcommand{\bc@barreline}{%
+\newcommand*{\bc@barreline}{%
 \begin{minipage}{\logowidth}\centering%
 \ifbclogotikz%
 \begin{tikzpicture}%
@@ -209,19 +209,11 @@ avecBarre=true,noborder=false,marge,sousTitre, couleurBord,blur=false, nobreak=f
 \psline[linewidth=\bcval@epBarre,linecolor=\bcval@couleurBarre](0,\bc@invboxh)(0,0)%
 \end{pspicture}%
 \fi%
-\end{minipage}}%
-%
-\newcommand{\bc@barremotif}{%
-\begin{minipage}{\logowidth}\color{\bcval@couleurBarre}\centering%
-\vbox to \bc@invboxh{\cleaders\vbox{\vss \bcval@motifBarre \vss}\vfill}%
-\end{minipage}}%
+\end{minipage}%
+}%
 %
-\newcommand{\bc@barrewave}{%
-\begin{minipage}{\logowidth}\color{\bcval@couleurBarre}\centering%
-\vbox to \bc@invboxh{\cleaders\vbox{\vss $\leftwave\right.$ \vss}\vfill}%
-\end{minipage}}%
 %
-\newcommand{\bc@barresnake}{%
+\newcommand*{\bc@barresnake}{%
 \begin{minipage}{\logowidth}\centering%
 \ifbclogotikz%
 \begin{tikzpicture}[decoration={snake,segment length=2.66\bcval@tailleOndu, amplitude=\bcval@tailleOndu}]%
@@ -232,9 +224,10 @@ avecBarre=true,noborder=false,marge,sousTitre, couleurBord,blur=false, nobreak=f
 \pszigzag[coilarm=0pt,coilwidth=2\bcval@tailleOndu,linewidth=1pt,linearc=1pt,coilheight=1.33,linecolor=\bcval@couleurBarre](0,\bc@invboxh)(0,0)%
 \end{pspicture}%
 \fi%
-\end{minipage}}%
+\end{minipage}%
+}%
 %
-\newcommand{\bc@barrezigzag}{%
+\newcommand*{\bc@barrezigzag}{%
 \begin{minipage}{\logowidth}\centering%
 \ifbclogotikz%
 \begin{tikzpicture}[decoration={zigzag,segment length=2.66\bcval@tailleOndu, amplitude=\bcval@tailleOndu}]%
@@ -245,18 +238,34 @@ avecBarre=true,noborder=false,marge,sousTitre, couleurBord,blur=false, nobreak=f
 \pszigzag[coilarm=0pt,coilwidth=2\bcval@tailleOndu,linewidth=1pt,linearc=0pt,coilheight=1.33,linecolor=\bcval@couleurBarre](0,\bc@invboxh)(0,0)%
 \end{pspicture}%
 \fi%
-\end{minipage}}%
+\end{minipage}%
+}%
 %
-\newcommand{\bc@barreimageExt}{% l'image est deformee
+\newcommand*{\bc@barreimageExt}{% l'image est deformee
 \begin{minipage}{\logowidth}\centering%
 \includegraphics[width=\logowidth,height=\bc@invboxh]{\bcval@imageBarre}%
-\end{minipage}}%
+\end{minipage}%
+}
 %
-\newcommand{\bc@barreimageClip}{%
+\newcommand*{\bc@barreimageClip}{%
 \begin{minipage}{\logowidth}\centering%
-\includegraphics[viewport=0 0 \logowidth~ \bc@invboxh,%
-clip=true]{\bcval@imageBarre}%
-\end{minipage}}%
+\includegraphics[viewport=0 0 \logowidth~ \bc@invboxh,clip=true]{\bcval@imageBarre}%
+\end{minipage}%
+}%
+%
+\newcommand*{\bc@barremotif}{%
+\begin{minipage}{\logowidth}\centering%
+\color{\bcval@couleurBarre}%
+\vbox to \bc@invboxh{\cleaders\vbox{\vss\bcval@motifBarre\vss}\vfill}%
+\end{minipage}%
+}%
+%
+\newcommand*{\bc@barrewave}{%
+\begin{minipage}{\logowidth}\centering%
+\color{\bcval@couleurBarre}%
+\vbox to \bc@invboxh{\cleaders\vbox{\vss$\leftwave\right.$\vss}\vfill}%
+\end{minipage}%
+}%
 %
 %======================= Quelques definitions===================================
 % boite titre
@@ -308,12 +317,12 @@ clip=true]{\bcval@imageBarre}%
 % affichage
 \smallskip% ressort %% Pourquoi ? %%%parce que ça se comprime et ça s'étire!
 \def\bcval@nobreak{\ifKV@bclogo@nobreak true\else false\fi}% gestion nobreak
-\begin{mdframed}[%
+\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
  innerrightmargin=\bcval@framesep,%
  innerbottommargin=\bcval@framesep,%
- rightmargin=\dimexpr\bcval@margeD+\ifKV@bclogo@ombre\bcval@epOmbre cm\else\z@\fi,%
+ rightmargin={\dimexpr\bcval@margeD+\ifKV@bclogo@ombre\bcval@epOmbre cm\else\z@\fi\relax},%
  leftmargin=\bcval@margeG,%
  backgroundcolor=\bcval@couleur,%
  fontcolor=\bcval@couleurTexte,%
@@ -323,8 +332,10 @@ clip=true]{\bcval@imageBarre}%
 ]%
 }%
 {%
-\end{mdframed}\par%
+\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 
+\endinput%
+%%%%%%%%%%%%%%%% fin %%%%%%%%%%%%%%%%