bidi (23apr13)

git-svn-id: svn://tug.org/texlive/trunk@30071 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 80 insertions, 75 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/ChangeLog b/Master/texmf-dist/doc/latex/bidi/ChangeLog
index 40a47befc9c..2e8d97b1450 100644
--- a/Master/texmf-dist/doc/latex/bidi/ChangeLog
+++ b/Master/texmf-dist/doc/latex/bidi/ChangeLog
@@ -1,3 +1,9 @@
+2013/04/24    version 12.8    Persian TeX Group
+         *  Version 12.8 released.
+         *  Fixed footnotes inside `minipage' environment.
+         *  Fixed footnote-rules inside `minipage' environment.
+         *  Fixed footnote-rules with `mdframed' package.
+
 2013/04/16    version 12.7    Persian TeX Group
          *  Version 12.7 released.
          *  Fixed `frametitle' of `mdframed' package in RTL.
diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index 5529ddca999..9dd8c04dcff 100644
--- a/Master/texmf-dist/doc/latex/bidi/README
+++ b/Master/texmf-dist/doc/latex/bidi/README
@@ -1,6 +1,6 @@
 ___________________
 The bidi package
-v12.7
+v12.8
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -17,7 +17,7 @@ In doing so, please always explain your issue well enough, always include
 a minimal working examples showing the issue, and always choose the appropriate
 label for your query (i.e. if you are reporting any bugs, choose `bug' label).
 
-Current version release date: 2013/04/16
+Current version release date: 2013/04/24
 
 ___________________
 Persian TeX Group
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.pdf b/Master/texmf-dist/doc/latex/bidi/bidi.pdf
index 2f815c9b7ef..9af3d962574 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bidi.pdf
diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx
index e85c39def86..bb6a199c0d3 100644
--- a/Master/texmf-dist/source/latex/bidi/bidi.dtx
+++ b/Master/texmf-dist/source/latex/bidi/bidi.dtx
@@ -5,7 +5,7 @@
 %<*readme>
 ___________________
 The bidi package
-v12.7
+v12.8
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -24,7 +24,7 @@ a minimal working examples showing the issue, and always choose the appropriate
 label for your query (i.e. if you are reporting any bugs, choose `bug' label). 
 
 
-Current version release date: 2013/04/16
+Current version release date: 2013/04/24
 
 ___________________
 Persian TeX Group
@@ -39,6 +39,12 @@ This work is “maintained” (as per LPPL maintenance status)
 by Persian TeX Group.
 %</readme>
 %<*changelog>
+2013/04/24    version 12.8    Persian TeX Group
+         *  Version 12.8 released.
+         *  Fixed footnotes inside `minipage' environment.
+         *  Fixed footnote-rules inside `minipage' environment.
+         *  Fixed footnote-rules with `mdframed' package.
+         
 2013/04/16    version 12.7    Persian TeX Group
          *  Version 12.7 released.
          *  Fixed `frametitle' of `mdframed' package in RTL.
@@ -329,7 +335,7 @@ by Persian TeX Group.
 % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe}
 % \author{Persian TeX Group\\
 %  \url{persian-tex@tug.org}}
-% \date{\today\qquad Version 12.7}
+% \date{\today\qquad Version 12.8}
 %\maketitle
 % \tableofcontents
 %\section*{Introduction}
@@ -344,7 +350,7 @@ by Persian TeX Group.
 %in plain TeX and LaTeX.  The package includes adaptations for use
 %with many other commonly-used packages.
 %Copyright (c) 2009-2013 Persian TeX Group
-%v12.7, 2013/04/16
+%v12.8, 2013/04/24
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/latex/contrib/bidi
 %\end{lstlisting}
@@ -2669,8 +2675,8 @@ by Persian TeX Group.
 % \subsection{\textsf{bidi.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2013/04/16}
-\def\bidiversion{v12.7}
+\def\bididate{2013/04/24}
+\def\bidiversion{v12.8}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -2738,7 +2744,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
 %\fi
 % \subsection{\textsf{bidi.tex}}
 %    \begin{macrocode}
-\def\bididate{2013/04/16}
+\def\bididate{2013/04/24}
 \def\bidiversion{v0.2}
 \catcode`@=11
 \let \protect \relax
@@ -10750,9 +10756,10 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{footnote-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{footnote-xetex-bidi.def}[2012/12/12 v0.6 bidi footnote macros for XeTeX engine]
+\ProvidesFile{footnote-xetex-bidi.def}[2013/04/21 v0.7 bidi footnote macros for XeTeX engine]
 \if@RTLmain\@RTL@footnotetrue\else\@RTL@footnotefalse\fi
 \newif\ifbidi@autofootnoterule
+\def\bidi@mpfootnoterule{\footnoterule}
 \newcounter{footdir@label}
 \renewcommand*{\thefootdir@label}{footdir@\the\value{footdir@label}}
 \newcommand*{\footdir@write}{%
@@ -10971,7 +10978,7 @@ bidi implementation of tufte title]
 \footdir@temp\footdir@ORG@bidi@LTRfootnotetext\@LTRfootnotetext{L}%
 
 \long\def\@mpRTLfootnotetext#1{%
-  \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\rightfootnoterule\fi\fi%
+  \ifbidi@autofootnoterule\ifnum\c@mpfootnote=\@ne\global\let\bidi@mpfootnoterule\right@footnoterule\fi\fi%
   \global\setbox\@mpfootins\vbox{\@RTLtrue%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -10984,7 +10991,7 @@ bidi implementation of tufte title]
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}
 \long\def\@mpLTRfootnotetext#1{%
- \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\leftfootnoterule\fi\fi%
+ \ifbidi@autofootnoterule\ifnum\c@mpfootnote=\@ne\global\let\bidi@mpfootnoterule\left@footnoterule\fi\fi%
   \global\setbox\@mpfootins\vbox{\@RTLfalse%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -10997,7 +11004,7 @@ bidi implementation of tufte title]
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}
 \long\def\@mpfootnotetext#1{%
- \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\if@RTL@footnote\rightfootnoterule\else\leftfootnoterule\fi\fi\fi%
+ \ifbidi@autofootnoterule\ifnum\c@mpfootnote=\@ne\if@RTL@footnote\global\let\bidi@mpfootnoterule\right@footnoterule\else\global\let\bidi@mpfootnoterule\left@footnoterule\fi\fi\fi%
   \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -11028,6 +11035,19 @@ bidi implementation of tufte title]
       \let\@listdepth\@mplistdepth \@mplistdepth\z@
       \@minipagerestore
       \@setminipage}
+\def\endminipage{%
+    \par
+    \unskip
+    \ifvoid\@mpfootins\else
+      \vskip\skip\@mpfootins
+      \normalcolor
+      \bidi@mpfootnoterule
+      \unvbox\@mpfootins
+    \fi
+    \@minipagefalse   %% added 24 May 89
+  \color@endgroup
+  \egroup
+  \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
 \def\LTRthanks#1{\footnotemark
     \protected@xdef\@thanks{\@thanks
         \protect\LTRfootnotetext[\the\c@footnote]{#1}}%
@@ -12529,7 +12549,7 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{mdframed-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{mdframed-xetex-bidi.def}[2013/04/16 v0.2 bidi adaptations for mdframed package for XeTeX engine]
+\ProvidesFile{mdframed-xetex-bidi.def}[2013/04/20 v0.3 bidi adaptations for mdframed package for XeTeX engine]
 \newif\if@bidi@mdf@RTL
 \def\mdf@lrbox#1{%
 %%patch to work with amsthm
@@ -12587,30 +12607,16 @@ bidi implementation of tufte title]
                                   +\mdf@frametitlebelowskip@length
                                 \relax%
 }
-\newrobustcmd*\mdf@left@footnoterule{%
-    \kern0\p@%
-    \hrule \@width 1in \kern 2.6\p@}
-
-\newrobustcmd*\mdf@right@footnoterule{%
-  \hbox to \columnwidth
-  {\beginR \vbox{\kern0\p@%
-   \hrule \@width 1in \kern 2.6\p@}\hfil\endR}}
-   
-\newrobustcmd*\mdf@textwidth@footnoterule{\kern0\p@%
-  \hrule \@width \columnwidth \kern 2.6\p@}
-   
-\newrobustcmd*\mdf@leftfootnoterule{%
-\bidi@autofootnoterulefalse%
-\renewrobustcmd*\mdf@footnoterule{\mdf@left@footnoterule}}
-
-\newrobustcmd*\mdf@rightfootnoterule{%
-\bidi@autofootnoterulefalse%
-\renewrobustcmd*\mdf@footnoterule{\mdf@right@footnoterule}}
-
-\newrobustcmd*\mdf@textwidthfootnoterule{%
-\bidi@autofootnoterulefalse%
-\renewrobustcmd*\mdf@footnoterule{\mdf@textwidth@footnoterule}}
 
+\renewrobustcmd*\mdf@footnoteoutput{%
+     \ifvoid\@mpfootins\else%
+          \nobreak%
+          \vskip\mdf@footenotedistance@length%
+          \normalcolor%
+          \bidi@mpfootnoterule%
+          \unvbox\@mpfootins%
+     \fi%
+}
 
 
 \renewrobustcmd*\mdf@footnoteinput{%
@@ -12620,10 +12626,6 @@ bidi implementation of tufte title]
    \let\@footnotetext\@mpfootnotetext%
     \let\@LTRfootnotetext\@mpLTRfootnotetext%
     \let\@RTLfootnotetext\@mpRTLfootnotetext%
-    \let\leftfootnoterule\mdf@leftfootnoterule%
-    \let\LRfootnoterule=\leftfootnoterule%
-    \let\rightfootnoterule\mdf@rightfootnoterule%
-    \let\textwidthfootnoterule\mdf@textwidthfootnoterule%
 }
 %    \end{macrocode}
 % \iffalse
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index eaa4d6b8f09..becee45d46a 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -13,8 +13,8 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2013/04/16}
-\def\bidiversion{v12.7}
+\def\bididate{2013/04/24}
+\def\bidiversion{v12.8}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.tex b/Master/texmf-dist/tex/latex/bidi/bidi.tex
index 6a0cf4755ec..edacc29e834 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.tex
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex
@@ -12,7 +12,7 @@
 %%   License information appended.
 %% 
 %% 
-\def\bididate{2013/04/16}
+\def\bididate{2013/04/24}
 \def\bidiversion{v0.2}
 \catcode`@=11
 \let \protect \relax
diff --git a/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
index 57275500542..202c8351946 100644
--- a/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
@@ -12,9 +12,10 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{footnote-xetex-bidi.def}[2012/12/12 v0.6 bidi footnote macros for XeTeX engine]
+\ProvidesFile{footnote-xetex-bidi.def}[2013/04/21 v0.7 bidi footnote macros for XeTeX engine]
 \if@RTLmain\@RTL@footnotetrue\else\@RTL@footnotefalse\fi
 \newif\ifbidi@autofootnoterule
+\def\bidi@mpfootnoterule{\footnoterule}
 \newcounter{footdir@label}
 \renewcommand*{\thefootdir@label}{footdir@\the\value{footdir@label}}
 \newcommand*{\footdir@write}{%
@@ -224,7 +225,7 @@
 \footdir@temp\footdir@ORG@bidi@LTRfootnotetext\@LTRfootnotetext{L}%
 
 \long\def\@mpRTLfootnotetext#1{%
-  \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\rightfootnoterule\fi\fi%
+  \ifbidi@autofootnoterule\ifnum\c@mpfootnote=\@ne\global\let\bidi@mpfootnoterule\right@footnoterule\fi\fi%
   \global\setbox\@mpfootins\vbox{\@RTLtrue%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -237,7 +238,7 @@
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}
 \long\def\@mpLTRfootnotetext#1{%
- \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\leftfootnoterule\fi\fi%
+ \ifbidi@autofootnoterule\ifnum\c@mpfootnote=\@ne\global\let\bidi@mpfootnoterule\left@footnoterule\fi\fi%
   \global\setbox\@mpfootins\vbox{\@RTLfalse%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -250,7 +251,7 @@
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}
 \long\def\@mpfootnotetext#1{%
- \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\if@RTL@footnote\rightfootnoterule\else\leftfootnoterule\fi\fi\fi%
+ \ifbidi@autofootnoterule\ifnum\c@mpfootnote=\@ne\if@RTL@footnote\global\let\bidi@mpfootnoterule\right@footnoterule\else\global\let\bidi@mpfootnoterule\left@footnoterule\fi\fi\fi%
   \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -281,6 +282,19 @@
       \let\@listdepth\@mplistdepth \@mplistdepth\z@
       \@minipagerestore
       \@setminipage}
+\def\endminipage{%
+    \par
+    \unskip
+    \ifvoid\@mpfootins\else
+      \vskip\skip\@mpfootins
+      \normalcolor
+      \bidi@mpfootnoterule
+      \unvbox\@mpfootins
+    \fi
+    \@minipagefalse   %% added 24 May 89
+  \color@endgroup
+  \egroup
+  \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
 \def\LTRthanks#1{\footnotemark
     \protected@xdef\@thanks{\@thanks
         \protect\LTRfootnotetext[\the\c@footnote]{#1}}%
diff --git a/Master/texmf-dist/tex/latex/bidi/mdframed-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/mdframed-xetex-bidi.def
index 686c2fee239..b3d2d89d3d0 100644
--- a/Master/texmf-dist/tex/latex/bidi/mdframed-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/mdframed-xetex-bidi.def
@@ -12,7 +12,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{mdframed-xetex-bidi.def}[2013/04/16 v0.2 bidi adaptations for mdframed package for XeTeX engine]
+\ProvidesFile{mdframed-xetex-bidi.def}[2013/04/20 v0.3 bidi adaptations for mdframed package for XeTeX engine]
 \newif\if@bidi@mdf@RTL
 \def\mdf@lrbox#1{%
 %%patch to work with amsthm
@@ -70,29 +70,16 @@
                                   +\mdf@frametitlebelowskip@length
                                 \relax%
 }
-\newrobustcmd*\mdf@left@footnoterule{%
-    \kern0\p@%
-    \hrule \@width 1in \kern 2.6\p@}
 
-\newrobustcmd*\mdf@right@footnoterule{%
-  \hbox to \columnwidth
-  {\beginR \vbox{\kern0\p@%
-   \hrule \@width 1in \kern 2.6\p@}\hfil\endR}}
-
-\newrobustcmd*\mdf@textwidth@footnoterule{\kern0\p@%
-  \hrule \@width \columnwidth \kern 2.6\p@}
-
-\newrobustcmd*\mdf@leftfootnoterule{%
-\bidi@autofootnoterulefalse%
-\renewrobustcmd*\mdf@footnoterule{\mdf@left@footnoterule}}
-
-\newrobustcmd*\mdf@rightfootnoterule{%
-\bidi@autofootnoterulefalse%
-\renewrobustcmd*\mdf@footnoterule{\mdf@right@footnoterule}}
-
-\newrobustcmd*\mdf@textwidthfootnoterule{%
-\bidi@autofootnoterulefalse%
-\renewrobustcmd*\mdf@footnoterule{\mdf@textwidth@footnoterule}}
+\renewrobustcmd*\mdf@footnoteoutput{%
+     \ifvoid\@mpfootins\else%
+          \nobreak%
+          \vskip\mdf@footenotedistance@length%
+          \normalcolor%
+          \bidi@mpfootnoterule%
+          \unvbox\@mpfootins%
+     \fi%
+}
 
 \renewrobustcmd*\mdf@footnoteinput{%
    \def\@mpfn{mpfootnote}%
@@ -101,10 +88,6 @@
    \let\@footnotetext\@mpfootnotetext%
     \let\@LTRfootnotetext\@mpLTRfootnotetext%
     \let\@RTLfootnotetext\@mpRTLfootnotetext%
-    \let\leftfootnoterule\mdf@leftfootnoterule%
-    \let\LRfootnoterule=\leftfootnoterule%
-    \let\rightfootnoterule\mdf@rightfootnoterule%
-    \let\textwidthfootnoterule\mdf@textwidthfootnoterule%
 }
 %% 
 %% Copyright © 2009–2013  Persian TeX Group <persian-tex@tug.org>