Adaptation de bclogo.sty bclogoMdframedTikz.tex et bclogoMdframedPst.tex a la version...

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

diff --git a/dev/latex/bclogoMdframedPst.tex b/dev/latex/bclogoMdframedPst.tex
index 342682f..947dfce 100644 (file)
--- a/dev/latex/bclogoMdframedPst.tex
+++ b/dev/latex/bclogoMdframedPst.tex
@@ -8,29 +8,17 @@
 \def\md@putbox@single{%boite qui tient sur la page
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
         \setlength\bc@mdfboxwidth{\wd\@tempboxa}%
-        \setlength\bc@mdfboxheight{\ht\@tempboxa+\dp\@tempboxa}%
+        \setlength\bc@mdfboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
         \setlength{\bc@invboxh}{\bc@mdfboxheight}%
-        \setlength{\mdfboundingboxheight}{%
-                     \bc@mdfboxheight%
-                    +\mdf@innertopmargin@length%
-                    +\mdf@innerbottommargin@length%
-%                    +\mdf@middlelinewidth@length%
-%                    +\mdf@middlelinewidth@length%
-                  }%
+        \setlength{\mdfboundingboxheight}{\dimexpr\bc@mdfboxheight+\mdf@innertopmargin@length+\mdf@innerbottommargin@length\relax}%
          \ifbool{mdf@topline}{\addtolength{\mdfboundingboxheight}{\mdf@middlelinewidth@length}}{}%
          \ifbool{mdf@bottomline}{\addtolength{\mdfboundingboxheight}{\mdf@middlelinewidth@length}}{}%
-         \setlength{\mdfboundingboxwidth}{%
-                     \bc@mdfboxwidth%
-                    +\mdf@innerleftmargin@length%
-                    +\mdf@innerrightmargin@length%
-%                    +\mdf@middlelinewidth@length%
-%                    +\mdf@middlelinewidth@length%
-                  }%
+         \setlength{\mdfboundingboxwidth}{\dimexpr\bc@mdfboxwidth+\mdf@innerleftmargin@length+\mdf@innerrightmargin@length\relax}%
        \ifbool{mdf@leftline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
        \ifbool{mdf@rightline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
        \psset{linearc=\mdf@roundcorner@length,cornersize=absolute}%
        \psset{unit=1pt}%
-       \begin{pspicture}(0,0)(\dimexpr\mdfboundingboxwidth,\mdfboundingboxheight)%
+       \begin{pspicture}(0,0)(\mdfboundingboxwidth,\mdfboundingboxheight)%
                 \ifKV@bclogo@ombre%cadre ombre
                 \ifKV@bclogo@blur%blur
                 \psframe[fillstyle=solid, shadow=true, blur=true, shadowsize=\bcval@epOmbre cm,%
@@ -50,7 +38,7 @@
                 \fi%
                 \rput[tl](\dimexpr0.5\bcval@framesep+\mdf@middlelinewidth@length,%
                           \dimexpr\mdfboundingboxheight-0.75\bcval@framesep-\mdf@middlelinewidth@length){\box\bc@envbox}%
-                \rput[bl](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep,%
+                \rput[b](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep+0.5\logowidth,%
                           \dimexpr\mdf@innerbottommargin@length+\mdf@middlelinewidth@length){\bc@barre}%
                 \rput[bl](\dimexpr\mdf@innerleftmargin@length+\mdf@middlelinewidth@length,%
                           \dimexpr\mdf@innerbottommargin@length+\mdf@middlelinewidth@length){\box\@tempboxa}%
@@ -61,19 +49,11 @@
 \def\md@putbox@first{%tete d'une boite coupée
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
         \setlength\bc@mdfboxwidth{\wd\tw@}%
-        \setlength\bc@mdfboxheight{\ht\tw@+\dp\tw@}%
+        \setlength\bc@mdfboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
         \setlength{\bc@invboxh}{\bc@mdfboxheight}%
-        \setlength{\mdfboundingboxheight}{%
-                    +\bc@mdfboxheight%
-                    +\mdf@innertopmargin@length%
-                    +\mdf@splitbottomskip@length%
-                  }%
+        \setlength{\mdfboundingboxheight}{\dimexpr\bc@mdfboxheight+\mdf@innertopmargin@length+\mdf@splitbottomskip@length\relax}%
          \ifbool{mdf@topline}{\addtolength{\mdfboundingboxheight}{\mdf@middlelinewidth@length}}{}%
-         \setlength{\mdfboundingboxwidth}{%
-                    +\mdf@innerleftmargin@length%
-                    +\bc@mdfboxwidth
-                    +\mdf@innerrightmargin@length%
-                  }%
+         \setlength{\mdfboundingboxwidth}{\dimexpr\mdf@innerleftmargin@length+\bc@mdfboxwidth+\mdf@innerrightmargin@length\relax}%
          \ifbool{mdf@leftline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
          \ifbool{mdf@rightline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
          \psset{linearc=\mdf@roundcorner@length}%
@@ -133,7 +113,7 @@
                 }%
                 \rput[tl](\dimexpr0.5\bcval@framesep+\mdf@middlelinewidth@length,%
                           \dimexpr\mdfboundingboxheight-0.75\bcval@framesep-\mdf@middlelinewidth@length){\box\bc@envbox}%
-                \rput[bl](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep,0){\bc@barre}%
+                \rput[b](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep+0.5\logowidth,0){\bc@barre}%
                 \rput[bl](\dimexpr\mdf@innerleftmargin@length+\mdf@middlelinewidth@length,0){\box\tw@}%
            \end{pspicture}%
      }%
@@ -142,17 +122,10 @@
 \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@}%
-        \setlength\bc@mdfboxheight{\ht\tw@+\dp\tw@}%
+        \setlength\bc@mdfboxheight{\dimexpr\ht\tw@+\dp\tw@\relax}%
         \setlength{\bc@invboxh}{\bc@mdfboxheight}%
-        \setlength{\mdfboundingboxheight}{%
-                    +\bc@mdfboxheight%
-                    +\mdf@splitbottomskip@length%
-                  }%
-         \setlength{\mdfboundingboxwidth}{%
-                    +\mdf@innerleftmargin@length%
-                    +\bc@mdfboxwidth%
-                    +\mdf@innerrightmargin@length%
-                  }%
+        \setlength{\mdfboundingboxheight}{\dimexpr\bc@mdfboxheight+\mdf@splitbottomskip@length\relax}%
+         \setlength{\mdfboundingboxwidth}{\dimexpr\mdf@innerleftmargin@length+\bc@mdfboxwidth+\mdf@innerrightmargin@length\relax}%
          \ifbool{mdf@leftline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
          \ifbool{mdf@rightline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
          \psset{linearc=\mdf@roundcorner@length}%
@@ -181,7 +154,7 @@
                         (\dimexpr\mdfboundingboxwidth-0.5\mdf@middlelinewidth@length,\mdfboundingboxheight)%
                         (\dimexpr\mdfboundingboxwidth-0.5\mdf@middlelinewidth@length,0)%
                 \fi%
-                \rput[bl](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep,0){\bc@barre}%
+                \rput[b](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep+0.5\logowidth,0){\bc@barre}%
                 \rput[bl](\dimexpr\mdf@innerleftmargin@length+\mdf@middlelinewidth@length,0){\box\tw@}%
        \end{pspicture}%
      }%
@@ -190,18 +163,11 @@
 \def\md@putbox@second{%pied d'une boite coupée
    \leftline{\null\hspace*{\mdf@leftmargin@length}%%
         \setlength\bc@mdfboxwidth{\wd\@tempboxa}%
-        \setlength\bc@mdfboxheight{\ht\@tempboxa+\dp\@tempboxa}%
+        \setlength\bc@mdfboxheight{\dimexpr\ht\@tempboxa+\dp\@tempboxa\relax}%
         \setlength{\bc@invboxh}{\bc@mdfboxheight}%
-        \setlength{\mdfboundingboxheight}{%
-                    +\bc@mdfboxheight%
-                    +\mdf@innerbottommargin@length%
-                  }%
+        \setlength{\mdfboundingboxheight}{\dimexpr\bc@mdfboxheight+\mdf@innerbottommargin@length\relax}%
          \ifbool{mdf@bottomline}{\addtolength{\mdfboundingboxheight}{\mdf@middlelinewidth@length}}{}%
-         \setlength{\mdfboundingboxwidth}{%
-                    +\mdf@innerleftmargin@length%
-                    +\bc@mdfboxwidth
-                    +\mdf@innerrightmargin@length%
-                  }%
+         \setlength{\mdfboundingboxwidth}{\dimexpr+\mdf@innerleftmargin@length+\bc@mdfboxwidth+\mdf@innerrightmargin@length\relax}%
          \ifbool{mdf@leftline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
          \ifbool{mdf@rightline}{\addtolength{\mdfboundingboxwidth}{\mdf@middlelinewidth@length}}{}%
          \psset{linearc=\mdf@roundcorner@length}%
@@ -254,7 +220,7 @@
                         (\dimexpr\mdfboundingboxwidth-0.5\mdf@middlelinewidth@length,\mdfboundingboxheight)%
                 \fi%
                 }%
-                \rput[bl](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep,%
+                \rput[b](\dimexpr\mdf@middlelinewidth@length+0.5\bcval@framesep+0.5\logowidth,%
                           \dimexpr\mdf@innerbottommargin@length+\mdf@middlelinewidth@length){\bc@barre}%
                 \rput[bl](\dimexpr\mdf@innerleftmargin@length+\mdf@middlelinewidth@length,%
                           \dimexpr\mdf@innerbottommargin@length+\mdf@middlelinewidth@length){\box\@tempboxa}%