définition des lengths mdfbox, préfixage des length, ajout de l'option nobreak, modif...

[bclogo.git] / dev / latex / bclogoMdframedTikz.tex

diff --git a/dev/latex/bclogoMdframedTikz.tex b/dev/latex/bclogoMdframedTikz.tex
index 49940c3..60de914 100644 (file)
--- a/dev/latex/bclogoMdframedTikz.tex
+++ b/dev/latex/bclogoMdframedTikz.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 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
@@ -64,17 +64,17 @@ preaction={fill=\bcval@couleurOmbre,line width=0.5,line join=round,opacity=0.4,d
 \def\md@putbox@single{%boite qui tient sur la page
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
        \md@tikz@settings%
-        \setlength\mdfboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboxheight{\ht\@tempboxa+\dp\@tempboxa}%
-        \setlength{\bc@invboxh}{\mdfboxheight}%
+        \setlength\bc@mdfboxwidth{\wd\@tempboxa}%
+        \setlength\bc@mdfboxheight{\ht\@tempboxa+\dp\@tempboxa}%
+        \setlength{\bc@invboxh}{\bc@mdfboxheight}%
         \begin{tikzpicture}%
                 \coordinate(O)at(0,0);%
-                 \pgfmathsetlengthmacro\x{\mdfboxwidth+\mdf@innerrightmargin@length%
+                 \pgfmathsetlengthmacro\x{\bc@mdfboxwidth+\mdf@innerrightmargin@length%
                                           +\mdf@innerleftmargin@length+%
                                           2\mdf@innerlinewidth@length+\mdf@middlelinewidth@length}%
                  \pgfmathsetlengthmacro\xp{\mdf@innerleftmargin@length+%
                                           1*\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}%
-                 \pgfmathsetlengthmacro\y{\mdfboxheight+\mdf@innertopmargin@length%
+                 \pgfmathsetlengthmacro\y{\bc@mdfboxheight+\mdf@innertopmargin@length%
                                           +\mdf@innerbottommargin@length%
                                           +2*\mdf@innerlinewidth@length+\mdf@middlelinewidth@length}%
                  \pgfmathsetlengthmacro\yp{\mdf@innerbottommargin@length%
@@ -82,15 +82,16 @@ preaction={fill=\bcval@couleurOmbre,line width=0.5,line join=round,opacity=0.4,d
                  \pgfmathsetlengthmacro\dep{\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}%
                  \coordinate(P)at(\x,\y);%
                  \begin{scope}%
-                        \ifKV@bclogo@ombre%
-                        \ifKV@bclogo@blur%
+                   \ifKV@bclogo@ombre%
+                      \ifKV@bclogo@blur%
                          \path[mdfcorners]\bc@tikzBlur(-\dep,-\dep)--(\x+\dep,-\dep)--(\x+\dep,\y+\dep)--(-\dep,\y+\dep)--cycle;%
-                        \else%
-                        \path[mdfcorners]\bc@tikzOmbre(-\dep,-\dep)--(\x+\dep,-\dep)--(\x+\dep,\y+\dep)--(-\dep,\y+\dep)--cycle;%
-                        \fi\fi%
-                     \clip[preaction=mdfborderA]%
-                           [postaction={mdfbackground,mdfborderI}]%
-                           [mdfcorners](O)--(O|-P)--(P)--(P|-O)--cycle;%
+                      \else%
+                         \path[mdfcorners]\bc@tikzOmbre(-\dep,-\dep)--(\x+\dep,-\dep)--(\x+\dep,\y+\dep)--(-\dep,\y+\dep)--cycle;%
+                      \fi%
+                   \fi%
+                   \clip[preaction=mdfborderA]%
+                        [postaction={mdfbackground,mdfborderI}]%
+                        [mdfcorners](O)--(O|-P)--(P)--(P|-O)--cycle;%
                 \end{scope}%
                  \path[mdfmiddle,mdfcorners,draw=\ifKV@bclogo@noborder none\else\bcval@couleurBord\fi](O)--(O|-P)--(P)--(P|-O)--cycle;
                  \node[mdftext,anchor=north west]at%
@@ -105,25 +106,25 @@ preaction={fill=\bcval@couleurOmbre,line width=0.5,line join=round,opacity=0.4,d
      }%
 }%
 %
-\def\md@putbox@first{%tête d'une boite coupée 
+\def\md@putbox@first{%tête d'une boite coupée
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
        \md@tikz@settings%
-        \setlength\mdfboxwidth{\wd\tw@}%
-        \setlength\mdfboxheight{\ht\tw@+\dp\tw@}%
-        \setlength{\bc@invboxh}{\mdfboxheight}%
+        \setlength\bc@mdfboxwidth{\wd\tw@}%
+        \setlength\bc@mdfboxheight{\ht\tw@+\dp\tw@}%
+        \setlength{\bc@invboxh}{\bc@mdfboxheight}%
         \ifdimequal{\pagegoal}{\maxdimen}{\enlargethispage{\baselineskip}}{}%
         \begin{tikzpicture}%
                 \coordinate(O) at (0,0);%
-                 \pgfmathsetlengthmacro\x{\mdfboxwidth+\mdf@innerrightmargin@length%
+                 \pgfmathsetlengthmacro\x{\bc@mdfboxwidth+\mdf@innerrightmargin@length%
                                           +\mdf@innerleftmargin@length+%
                                           2*\mdf@innerlinewidth@length+1*\mdf@middlelinewidth@length}
                  \pgfmathsetlengthmacro\xp{\mdf@innerleftmargin@length+%
                                           1*\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}
-                 \pgfmathsetlengthmacro\y{-\mdfboxheight-\mdf@innertopmargin@length%
+                 \pgfmathsetlengthmacro\y{-\bc@mdfboxheight-\mdf@innertopmargin@length%
                                           -1*\mdf@innerlinewidth@length-0.5*\mdf@middlelinewidth@length+0.0cm}
                  \pgfmathsetlengthmacro\yp{-\mdf@innertopmargin@length%
                                            -1*\mdf@innerlinewidth@length-0.5*\mdf@middlelinewidth@length%
-                                           -0.5\mdfboxheight}
+                                           -0.5\bc@mdfboxheight}
                  \pgfmathsetlengthmacro\dep{\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}%
                  \coordinate(P)at(\x,\y);%
                  \clip(-\mdf@outerlinewidth@length-0.5*\mdf@middlelinewidth@length,%
@@ -156,18 +157,18 @@ preaction={fill=\bcval@couleurOmbre,line width=0.5,line join=round,opacity=0.4,d
 \def\md@putbox@middle{%milieu d'une boite coupée (occupe une page entière)
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
         \md@tikz@settings%
-        \setlength\mdfboxwidth{\wd\tw@}%
-        \setlength\mdfboxheight{\ht\tw@+\dp\tw@}%
-        \setlength{\bc@invboxh}{\mdfboxheight}%
-        \setlength{\mdf@ymargin@length}{0.4\baselineskip}%
+        \setlength\bc@mdfboxwidth{\wd\tw@}%
+        \setlength\bc@mdfboxheight{\ht\tw@+\dp\tw@}%
+        \setlength{\bc@invboxh}{\bc@mdfboxheight}%
+        %\setlength{\bc@mdf@ymargin@length}{0.4\baselineskip}%
         \begin{tikzpicture}%
                 \coordinate(O)at(0,0);%
-                 \pgfmathsetlengthmacro\x{\mdfboxwidth+\mdf@innerrightmargin@length%
+                 \pgfmathsetlengthmacro\x{\bc@mdfboxwidth+\mdf@innerrightmargin@length%
                                           +\mdf@innerleftmargin@length+%
                                           2*\mdf@innerlinewidth@length+1*\mdf@middlelinewidth@length}%
                  \pgfmathsetlengthmacro\xp{\mdf@innerleftmargin@length+%
                                           1*\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}%
-                 \pgfmathsetlengthmacro\y{\mdfboxheight}%
+                 \pgfmathsetlengthmacro\y{\bc@mdfboxheight}%
                  \pgfmathsetlengthmacro\yp{0cm}%
                  \pgfmathsetlengthmacro\dep{\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}%
                  \coordinate(P)at(\x,\y);%
@@ -195,17 +196,17 @@ preaction={fill=\bcval@couleurOmbre,line width=0.5,line join=round,opacity=0.4,d
 \def\md@putbox@second{%dernière partie d'une boite coupée
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
        \md@tikz@settings%
-        \setlength\mdfboxwidth{\wd\@tempboxa}%
-        \setlength\mdfboxheight{\ht\@tempboxa+\dp\@tempboxa}%
-        \setlength{\bc@invboxh}{\mdfboxheight}%
+        \setlength\bc@mdfboxwidth{\wd\@tempboxa}%
+        \setlength\bc@mdfboxheight{\ht\@tempboxa+\dp\@tempboxa}%
+        \setlength{\bc@invboxh}{\bc@mdfboxheight}%
         \begin{tikzpicture}%
                  \coordinate(O)at(0,0);%
-                 \pgfmathsetlengthmacro\x{\mdfboxwidth+\mdf@innerrightmargin@length%
+                 \pgfmathsetlengthmacro\x{\bc@mdfboxwidth+\mdf@innerrightmargin@length%
                                           +\mdf@innerleftmargin@length+%
                                           2*\mdf@innerlinewidth@length+1*\mdf@middlelinewidth@length}%
                  \pgfmathsetlengthmacro\xp{\mdf@innerleftmargin@length+%
                                           1*\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}%
-                 \pgfmathsetlengthmacro\y{\mdfboxheight%
+                 \pgfmathsetlengthmacro\y{\bc@mdfboxheight%
                                           +\mdf@innerbottommargin@length%
                                           +1*\mdf@innerlinewidth@length+0.5*\mdf@middlelinewidth@length}
                  \pgfmathsetlengthmacro\yp{\mdf@innerbottommargin@length%