bidi (20apr12)

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

8 files changed, 54 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index 88c82c31790..e7438df66fc 100644
--- a/Master/texmf-dist/doc/latex/bidi/README
+++ b/Master/texmf-dist/doc/latex/bidi/README
@@ -1,6 +1,6 @@
 ___________________
 The bidi package
-v11.153
+v11.154
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.pdf b/Master/texmf-dist/doc/latex/bidi/bidi.pdf
index a104adbbabb..f951058c72c 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 573406c29f0..316ad59f6bf 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
-v11.153
+v11.154
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -239,7 +239,7 @@ by Vafa Khalighi.
 % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe}
 % \author{Vafa Khalighi\\
 %  \url{simurgh12@gmail.com}}
-% \date{\today\qquad Version 11.153}
+% \date{\today\qquad Version 11.154}
 %\maketitle
 % \tableofcontents
 %\section*{Introduction}
@@ -254,7 +254,7 @@ by Vafa Khalighi.
 %in plain TeX and LaTeX.  The package includes adaptations for use
 %with many other commonly-used packages.
 %Copyright (c) 2009-2012 Vafa Khalighi
-%v11.153, 2012/05/01
+%v11.154, 2012/05/01
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/latex/contrib/bidi
 %\end{lstlisting}
@@ -1298,7 +1298,9 @@ by Vafa Khalighi.
 %\fi
 % \subsection{\textsf{amsmath-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{amsmath-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for amsmath package for XeTeX engine]
+\ProvidesFile{amsmath-xetex-bidi.def}[2012/04/20 v0.3 bidi adaptations for amsmath package for XeTeX engine]
+\let\veqno=\eqno
+\iftagsleft@ \let\veqno=\leqno \fi
 \renewcommand{\numberwithin}[3][\arabic]{%
   \@ifundefined{c@#2}{\@nocounterr{#2}}{%
     \@ifundefined{c@#3}{\@nocnterr{#3}}{%
@@ -2529,7 +2531,7 @@ by Vafa Khalighi.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2012/05/01}
-\def\bidiversion{v11.153}
+\def\bidiversion{v11.154}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -3262,6 +3264,18 @@ Location on CTAN: /macros/latex/contrib/bidi}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{biditools}[2012/05/01 v0.1 Programming tools for bidi package]
+\providecommand{\@bidi@saveprimitive}[2]{\begingroup\escapechar`\\\relax
+  \edef\@tempa{\string#1}\edef\@tempb{\meaning#1}%
+  \ifx\@tempa\@tempb \global\let#2#1%
+  \else
+    \edef\@tempb{\meaning#2}%
+    \ifx\@tempa\@tempb
+    \else
+      \@latex@error{Unable to properly define \string#2; primitive
+      \noexpand#1no longer primitive}\@eha
+    \fi
+  \fi
+  \endgroup}
 \def\@tagsextension{clo}
 \def\@definitionfileextension{def}
 \def\@iftagsloaded{\@ifl@aded\@tagsextension}
@@ -12070,7 +12084,10 @@ bidi implementation of tufte title]
 \let\setRL=\setRTL
 \let\setLR=\setLTR
 \let\unsetRL=\setLTR
-\everydisplay{\predisplaydirection=0 }
+\let\bidi@saved@eqno=\eqno
+\let\bidi@saved@leqno=\leqno
+\def\eqno{\ifnum\predisplaydirection<\z@ \bidi@saved@leqno \else \bidi@saved@eqno \fi}
+\def\leqno{\ifnum\predisplaydirection<\z@ \bidi@saved@eqno \else \bidi@saved@leqno \fi}
 \def\centerline#1{\line{\hss\if@RTL\beginR\fi#1\if@RTL\endR\fi\hss}}
 \def\leftline#1{\line{\if@RTL\beginR\fi#1\if@RTL\endR\fi\hss}}
 \def\rightline#1{\line{\hss\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
@@ -15811,7 +15828,7 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{xetex-bidi.def}[2012/05/01 v1.0.1 bidi adaptations  for XeTeX engine]
+\ProvidesFile{xetex-bidi.def}[2012/05/01 v1.0.3 bidi adaptations  for XeTeX engine]
 \newcommand{\TeXXeTOn}{\TeXXeTstate=1 }
 \newcommand{\TeXXeTOff}{\TeXXeTstate=0 }
 \TeXXeTOn
@@ -16447,7 +16464,10 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
     \hb@xt@\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}%
   \fi
   \vskip\belowcaptionskip}
-\everydisplay\expandafter{\the\everydisplay\if@bidi@list@minipage@parbox\predisplaydirection=1\else\if@RTLtab\predisplaydirection=1\else\predisplaydirection=0\fi\fi }
+\let\bidi@saved@eqno=\eqno
+\let\bidi@saved@leqno=\leqno
+\def\eqno{\ifnum\predisplaydirection<\z@ \bidi@saved@leqno \else \bidi@saved@eqno \fi}
+\def\leqno{\ifnum\predisplaydirection<\z@ \bidi@saved@eqno \else \bidi@saved@leqno \fi}
 \def\@eqnnum{{\normalfont \normalcolor \if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
 \input{footnote-xetex-bidi.def}
 \@ifclassloaded{article}{\@ifclassloaded{svmult}{}{\input{article-xetex-bidi.def}}}{}
diff --git a/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
index 08426e444f1..905b3e49dbd 100644
--- a/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
@@ -12,7 +12,9 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsmath-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for amsmath package for XeTeX engine]
+\ProvidesFile{amsmath-xetex-bidi.def}[2012/04/20 v0.3 bidi adaptations for amsmath package for XeTeX engine]
+\let\veqno=\eqno
+\iftagsleft@ \let\veqno=\leqno \fi
 \renewcommand{\numberwithin}[3][\arabic]{%
   \@ifundefined{c@#2}{\@nocounterr{#2}}{%
     \@ifundefined{c@#3}{\@nocnterr{#3}}{%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index cdefeb600e0..d5a762e2fb3 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2012/05/01}
-\def\bidiversion{v11.153}
+\def\bidiversion{v11.154}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
diff --git a/Master/texmf-dist/tex/latex/bidi/biditools.sty b/Master/texmf-dist/tex/latex/bidi/biditools.sty
index f02a25179ef..0831a5a1186 100644
--- a/Master/texmf-dist/tex/latex/bidi/biditools.sty
+++ b/Master/texmf-dist/tex/latex/bidi/biditools.sty
@@ -14,6 +14,18 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{biditools}[2012/05/01 v0.1 Programming tools for bidi package]
+\providecommand{\@bidi@saveprimitive}[2]{\begingroup\escapechar`\\\relax
+  \edef\@tempa{\string#1}\edef\@tempb{\meaning#1}%
+  \ifx\@tempa\@tempb \global\let#2#1%
+  \else
+    \edef\@tempb{\meaning#2}%
+    \ifx\@tempa\@tempb
+    \else
+      \@latex@error{Unable to properly define \string#2; primitive
+      \noexpand#1no longer primitive}\@eha
+    \fi
+  \fi
+  \endgroup}
 \def\@tagsextension{clo}
 \def\@definitionfileextension{def}
 \def\@iftagsloaded{\@ifl@aded\@tagsextension}
diff --git a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def
index 6c33a02f37a..32c31c74d1b 100644
--- a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def
@@ -88,7 +88,10 @@
 \let\setRL=\setRTL
 \let\setLR=\setLTR
 \let\unsetRL=\setLTR
-\everydisplay{\predisplaydirection=0 }
+\let\bidi@saved@eqno=\eqno
+\let\bidi@saved@leqno=\leqno
+\def\eqno{\ifnum\predisplaydirection<\z@ \bidi@saved@leqno \else \bidi@saved@eqno \fi}
+\def\leqno{\ifnum\predisplaydirection<\z@ \bidi@saved@eqno \else \bidi@saved@leqno \fi}
 \def\centerline#1{\line{\hss\if@RTL\beginR\fi#1\if@RTL\endR\fi\hss}}
 \def\leftline#1{\line{\if@RTL\beginR\fi#1\if@RTL\endR\fi\hss}}
 \def\rightline#1{\line{\hss\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index 4910e1cec33..a7007b5dcfe 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -12,7 +12,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{xetex-bidi.def}[2012/05/01 v1.0.1 bidi adaptations  for XeTeX engine]
+\ProvidesFile{xetex-bidi.def}[2012/05/01 v1.0.3 bidi adaptations  for XeTeX engine]
 \newcommand{\TeXXeTOn}{\TeXXeTstate=1 }
 \newcommand{\TeXXeTOff}{\TeXXeTstate=0 }
 \TeXXeTOn
@@ -648,7 +648,10 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
     \hb@xt@\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}%
   \fi
   \vskip\belowcaptionskip}
-\everydisplay\expandafter{\the\everydisplay\if@bidi@list@minipage@parbox\predisplaydirection=1\else\if@RTLtab\predisplaydirection=1\else\predisplaydirection=0\fi\fi }
+\let\bidi@saved@eqno=\eqno
+\let\bidi@saved@leqno=\leqno
+\def\eqno{\ifnum\predisplaydirection<\z@ \bidi@saved@leqno \else \bidi@saved@eqno \fi}
+\def\leqno{\ifnum\predisplaydirection<\z@ \bidi@saved@eqno \else \bidi@saved@leqno \fi}
 \def\@eqnnum{{\normalfont \normalcolor \if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
 \input{footnote-xetex-bidi.def}
 \@ifclassloaded{article}{\@ifclassloaded{svmult}{}{\input{article-xetex-bidi.def}}}{}