bidi update (16apr10)

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

6 files changed, 26 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index b141a8d2f67..5d0e6550f2f 100644
--- a/Master/texmf-dist/doc/latex/bidi/README
+++ b/Master/texmf-dist/doc/latex/bidi/README
@@ -1,12 +1,11 @@
 _________________
 The bidi package
-v1.0.8
+v1.0.9
 
 This package provides a convenient interface for typesetting
-bidirectional texts with XeLaTeX and LuaLaTeX.
+bidirectional texts in Plain TeX and LaTeX.
 
-This version adds partial support for Plain TeX too and
-in addition fixes all the bugs that were present in v1.0.7. 
+This version fixes all the bugs that were present in v1.0.8. 
 
 ______________
 Vafa Khalighi
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
index 039d0cb11e5..943c940179e 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex b/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
index 06cf929404d..5b1e80defe8 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
+++ b/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
@@ -21,7 +21,7 @@
 \newcommand\LuaLaTeX{Lua\LaTeX}
 \title{The \textsf{bidi} Package\\ \href{http://bitbucket.org/vafa/bidi}{\texttt{http://bitbucket.org/vafa/bidi}}}
 \author{Vafa Khalighi\\ \href{mailto:vafakh84@gmail.com}{\texttt{vafakh84@gmail.com}}}
-\date{Version 1.0.8}
+\date{Version 1.0.9}
 \begin{document}
 \maketitle
 \tableofcontents
@@ -37,7 +37,7 @@ Description: A convenient interface for typesetting bidirectional
 texts with XeLaTeX and LuaLaTeX.  The package includes adaptations for use
 with many other commonly-used packages.
 Copyright (c) 2009-2010 Vafa Khalighi
-v1.0.8, <commit 25>, 2010/07/25
+v1.0.9, <commit 42>, 2010/07/25
 License: LaTeX Project Public License, version 1.3c or higher (your choice)
 Home: http://bitbucket.org/vafa/bidi
 Location on CTAN: /macros/latex/contrib/bidi
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.tex b/Master/texmf-dist/doc/latex/bidi/bidi.tex
index a2b7ca07f2b..a6e9975c625 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi.tex
+++ b/Master/texmf-dist/doc/latex/bidi/bidi.tex
@@ -10,7 +10,7 @@
 %% 
 \def\bididate{2010/07/25}
 \def\bidiversion{v0.1}
-\def\bidicommit{commit 31}
+\def\bidicommit{commit 42}
 \catcode`@=11
 \edef\bidiinfo{%
 bidi package (Support for bidirectional typesetting with XeLaTeX and LuaLaTeX)^^J
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index 3fbad45a7c3..91288f61c0b 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -10,8 +10,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2010/07/25}
-\def\bidiversion{v1.0.8}
-\def\bidicommit{commit 31}
+\def\bidiversion{v1.0.9}
+\def\bidicommit{commit 42}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidicommit>
 Bidirectional typesetting in XeLaTeX and LuaLaTeX]
 \edef\bidiinfo{%
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index 3080f735671..16679305b61 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -300,20 +300,24 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
   \egroup
   \egroup
   \expandafter\@iiiparbox\@mpargs{\leavevmode\unvbox\@tempboxa}}
-\def\@arrayparboxrestore{%
-  \let\if@nobreak\iffalse
-  \let\if@noskipsec\iffalse
-  \let\par\@@par
-  \let\-\@dischyph
-  \let\'\@acci\let\`\@accii\let\=\@acciii
-  \parindent\z@ \parskip\z@skip
-  \everypar{\if@RTL\beginR\else\beginL\fi}%
-  \linewidth\hsize
-  \@totalleftmargin\z@
-  \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip
-  \parfillskip\@flushglue \lineskip\normallineskip
-  \baselineskip\normalbaselineskip
-  \sloppy}
+\long\def\@iiiparbox#1#2[#3]#4#5{%
+  \leavevmode
+  \@pboxswfalse
+  \setlength\@tempdima{#4}%
+  \@begin@tempboxa\vbox{\hbox{\if@RTL\beginL\fi\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}\if@RTL\endL\fi}}%
+    \ifx\relax#2\else
+      \setlength\@tempdimb{#2}%
+      \edef\@parboxto{to\the\@tempdimb}%
+    \fi
+    \if#1b\vbox
+    \else\if #1t\vtop
+    \else\ifmmode\vcenter
+    \else\@pboxswtrue $\vcenter
+    \fi\fi\fi
+    \@parboxto{\let\hss\vss\let\unhbox\unvbox
+       \csname bm@#3\endcsname}%
+    \if@pboxsw \m@th$\fi
+  \@end@tempboxa}
 \def\@addmarginpar{\@next\@marbox\@currlist{\@cons\@freelist\@marbox
     \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne
     \if@twocolumn