bidi (18oct11)

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

6 files changed, 20 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index f0075fe5374..c88c97f1f45 100644
--- a/Master/texmf-dist/doc/latex/bidi/README
+++ b/Master/texmf-dist/doc/latex/bidi/README
@@ -1,6 +1,6 @@
 ___________________
 The bidi package
-v1.3.9
+v1.4.0
 
 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 8309d2c2d33..38065b2333f 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 4ae00824c1b..5e90049279c 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
-v1.3.9
+v1.4.0
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -231,7 +231,7 @@ by Vafa Khalighi.
 % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe}
 % \author{Vafa Khalighi\\
 %  \url{vafaklg@gmail.com}}
-% \date{\today\qquad Version 1.3.9}
+% \date{\today\qquad Version 1.4.0}
 % \maketitle
 % \tableofcontents
 %\section*{Introduction}
@@ -246,7 +246,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
-%v1.3.9, 2012/01/01
+%v1.4.0, 2012/01/01
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/latex/contrib/bidi
 %\end{lstlisting}
@@ -2520,7 +2520,7 @@ by Vafa Khalighi.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2012/01/01}
-\def\bidiversion{v1.3.9}
+\def\bidiversion{v1.4.0}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -2586,6 +2586,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \def\bididate{2012/01/01}
 \def\bidiversion{v0.1}
 \catcode`@=11
+\let \protect \relax
 \newlinechar`\^^J
 \edef\bidiinfo{%
 bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J
@@ -15740,10 +15741,14 @@ bidi implementation of tufte title]
 \let\setRL=\setRTL
 \let\setLR=\setLTR
 \let\unsetRL=\setLTR
+\gdef\endpicture{%
+  \egroup\hss\egroup
+    \ht\@picbox\@picht\dp\@picbox\z@
+   \ifmmode\else\LTR\beginL\fi%
+    \mbox{\box\@picbox}%
+    \ifmmode\else\endL\endLTR\fi}
 \@ifpackageloaded{mathtools}{\RequirePackage{graphicx}}{}
 \@ifpackageloaded{sidecap}{\RequirePackage{ragged2e}}{}
-\bidi@BeforeBeginEnvironment{picture}{\ifmmode\else\LTR\beginL\fi}
-\bidi@AfterEndEnvironment{picture}{\ifmmode\else\endL\endLTR\fi}
 \DeclareOption{RTLdocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}}
 \DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}}
 \def\RTLcases#1{\left.\vcenter{\normalbaselines\m@th
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index e62202863ed..6e0790b63d3 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/01/01}
-\def\bidiversion{v1.3.9}
+\def\bidiversion{v1.4.0}
 \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 1a353fe43d4..b9b688f4782 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.tex
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex
@@ -15,6 +15,7 @@
 \def\bididate{2012/01/01}
 \def\bidiversion{v0.1}
 \catcode`@=11
+\let \protect \relax
 \newlinechar`\^^J
 \edef\bidiinfo{%
 bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index eaae1938649..e1b76cf708a 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -95,10 +95,14 @@
 \let\setRL=\setRTL
 \let\setLR=\setLTR
 \let\unsetRL=\setLTR
+\gdef\endpicture{%
+  \egroup\hss\egroup
+    \ht\@picbox\@picht\dp\@picbox\z@
+   \ifmmode\else\LTR\beginL\fi%
+    \mbox{\box\@picbox}%
+    \ifmmode\else\endL\endLTR\fi}
 \@ifpackageloaded{mathtools}{\RequirePackage{graphicx}}{}
 \@ifpackageloaded{sidecap}{\RequirePackage{ragged2e}}{}
-\bidi@BeforeBeginEnvironment{picture}{\ifmmode\else\LTR\beginL\fi}
-\bidi@AfterEndEnvironment{picture}{\ifmmode\else\endL\endLTR\fi}
 \DeclareOption{RTLdocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}}
 \DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}}
 \def\RTLcases#1{\left.\vcenter{\normalbaselines\m@th