bidi (19oct11)

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

8 files changed, 284 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index c88c97f1f45..a252722cb92 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.4.0
+v1.4.1
 
 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 38065b2333f..c3a19f8a571 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 5e90049279c..6087919685d 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.4.0
+v1.4.1
 
 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.4.0}
+% \date{\today\qquad Version 1.4.1}
 % \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.4.0, 2012/01/01
+%v1.4.1, 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.4.0}
+\def\bidiversion{v1.4.1}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -2550,6 +2550,8 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \newif\if@parafootRTL
 \newif\if@RTLcolumnfootnotes
 \eqnewif{\if@RTL@footnote}{\if@rl@footnote}
+\newif\if@bidi@list@minipage@parbox
+\newif\if@bidi@list@minipage@parbox@not@nob
 \@RTLmainfalse
 \AtBeginDocument{%
   \if@RTLmain\else
@@ -6754,6 +6756,8 @@ bidi implementation of tufte title]
 \def\@iiiminipage#1#2[#3]#4{%
   \leavevmode
   \@pboxswfalse
+  \if@RTLtab\@bidi@list@minipage@parbox@not@nobtrue\fi
+  \if@RTL\if#1t\@bidi@list@minipage@parboxtrue\else\if#1b\@bidi@list@minipage@parboxtrue\fi\fi\fi
   \setlength\@tempdima{#4}%
   \def\@mpargs{{#1}{#2}[#3]{#4}}%
   \setbox\@tempboxa\vbox\bgroup
@@ -9902,6 +9906,8 @@ bidi implementation of tufte title]
 \def\@iiiminipage#1#2[#3]#4{%
   \leavevmode
   \@pboxswfalse
+  \if@RTLtab\@bidi@list@minipage@parbox@not@nobtrue\fi
+  \if@RTL\if#1t\@bidi@list@minipage@parboxtrue\else\if#1b\@bidi@list@minipage@parboxtrue\fi\fi\fi
   \setlength\@tempdima{#4}%
   \def\@mpargs{{#1}{#2}[#3]{#4}}%
   \setbox\@tempboxa\vbox\bgroup
@@ -11711,23 +11717,25 @@ bidi implementation of tufte title]
 \ProvidesFile{natbib-xetex-bidi.def}[2011/06/04 v0.1 bidi adaptations for natbib package for XeTeX engine]
 \renewenvironment{LTRbibitems}[1][\labelsep]
                  {\par\@RTLfalse
+                  \if@RTLtab\parshape \@ne \@totalleftmargin \dimexpr(\linewidth-\leftmargin)\fi
                   \ifNAT@numbers
-                  \leftskip\labelwidth
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelwidth
                   \else
-                  \leftskip\labelsep
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelsep
                   \fi
-                  \advance\leftskip #1
-                  \advance\rightskip -\leftmargin
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\leftskip\else\if@RTLtab\leftskip\else\rightskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \renewenvironment{RTLbibitems}[1][\labelsep]
                  {\par\@RTLtrue
+                  \if@RTLtab\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \dimexpr(\linewidth-\leftmargin)\fi
                   \ifNAT@numbers
-                  \rightskip\labelwidth
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelwidth
                   \else
-                  \rightskip\labelsep
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelsep
                   \fi
-                  \advance\rightskip #1
-                  \advance\leftskip -\leftmargin
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\rightskip\else\if@RTLtab\rightskip\else\leftskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \renewenvironment{thebibliography}[1]{%
  \bibsection
@@ -15658,7 +15666,7 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{xetex-bidi.def}[2012/01/01 v1.0.0 bidi adaptations  for XeTeX engine]
+\ProvidesFile{xetex-bidi.def}[2012/01/01 v1.0.1 bidi adaptations  for XeTeX engine]
 \newcommand{\TeXXeTOn}{\TeXXeTstate=1 }
 \newcommand{\TeXXeTOff}{\TeXXeTstate=0 }
 \TeXXeTOn
@@ -15704,14 +15712,14 @@ bidi implementation of tufte title]
   \bgroup
   \aftergroup\egroup
  }\vbox}
-\def\LTR{\par\@RTLfalse\@RTL@footnotefalse\hsize\linewidth\parshape\z@}
+\def\LTR{\par\@RTLfalse\@RTL@footnotefalse\if@bidi@list@minipage@parbox\beginL\else\if@RTLtab\beginL\fi\fi\hsize\linewidth\parshape\z@}
 \def\endLTR{\par}
 \def\RTL{\par\@RTLtrue\@RTL@footnotetrue\hsize\linewidth\parshape\z@}
 \def\endRTL{\par}
 \def\@ltr{\if@RTL\par\@RTLfalse\@RTL@footnotefalse\fi}
 \def\@rtl{\if@RTL\relax\else\par\@RTLtrue\@RTL@footnotetrue\fi}
 \def\setRTL{\@RTLtrue\@RTL@footnotetrue}
-\def\setLTR{\@RTLfalse\@RTL@footnotefalse}
+\def\setLTR{\@RTLfalse\@RTL@footnotefalse\if@bidi@list@minipage@parbox\beginL\else\if@RTLtab\beginL\fi\fi}
 \let\unsetRTL=\setLTR
 \let\unsetLTR=\setRTL
 \let\LR=\LRE
@@ -15759,7 +15767,7 @@ bidi implementation of tufte title]
 \def\setRTLbibitems{\@RTLbibitemstrue\@LTRbibitemsfalse}
 \def\setLTRbibitems{\@LTRbibitemstrue\@RTLbibitemsfalse}
 \def\setdefaultbibitems{\@RTLbibitemsfalse\@LTRbibitemsfalse}
-\def\list#1#2{%
+\def\list#1#2{\noindent%
   \ifnum \@listdepth >5\relax
     \@toodeep
   \else
@@ -15778,36 +15786,143 @@ bidi implementation of tufte title]
   \parindent\listparindent
   \advance\linewidth -\rightmargin
   \advance\linewidth -\leftmargin
+  \if@bidi@list@minipage@parbox
+  \if@RTL
+  \advance\@totalleftmargin \leftmargin
+  \else
+  \advance\@totalleftmargin \rightmargin
+  \fi
+  \else
+  \if@RTLtab
+  \if@bidi@list@minipage@parbox@not@nob
   \if@RTL
     \advance\@totalleftmargin \rightmargin
   \else
     \advance\@totalleftmargin \leftmargin
   \fi
+  \else
+  \if@RTL
+  \advance\@totalleftmargin \leftmargin
+  \else
+  \advance\@totalleftmargin \rightmargin
+  \fi\fi
+  \else
+  \if@RTL
+    \advance\@totalleftmargin \rightmargin
+  \else
+    \advance\@totalleftmargin \leftmargin
+  \fi\fi\fi
   \parshape \@ne \@totalleftmargin \linewidth
   \ignorespaces}
+\def\@item[#1]{%
+  \if@noparitem
+    \@donoparitem
+  \else
+    \if@inlabel
+      \indent \par
+    \fi
+    \ifhmode
+      \unskip\unskip \par
+    \fi
+    \if@newlist
+      \if@nobreak
+        \@nbitem
+      \else
+        \addpenalty\@beginparpenalty
+        \addvspace\@topsep
+        \addvspace{-\parskip}%
+      \fi
+    \else
+      \addpenalty\@itempenalty
+      \addvspace\itemsep
+    \fi
+    \global\@inlabeltrue
+  \fi
+  \everypar{\if@bidi@list@minipage@parbox\if@RTL\else\beginL\fi\else\if@RTLtab\if@RTL\else\beginL\fi\fi\fi%
+    \@minipagefalse
+    \global\@newlistfalse
+    \if@inlabel
+      \global\@inlabelfalse
+      {\setbox\z@\lastbox
+       \ifvoid\z@
+         \kern-\itemindent
+       \fi}%
+      \box\@labels
+      \penalty\z@
+    \fi
+    \if@nobreak
+      \@nobreakfalse
+      \clubpenalty \@M
+    \else
+      \clubpenalty \@clubpenalty
+      \everypar{}%
+    \fi}%
+  \if@noitemarg
+    \@noitemargfalse
+    \if@nmbrlist
+      \refstepcounter\@listctr
+    \fi
+  \fi
+  \sbox\@tempboxa{\makelabel{#1}}%
+  \global\setbox\@labels\hbox{%
+    \unhbox\@labels
+    \hskip \itemindent
+    \hskip -\labelwidth
+    \hskip -\labelsep
+    \ifdim \wd\@tempboxa >\labelwidth
+      \box\@tempboxa
+    \else
+      \hbox to\labelwidth {\unhbox\@tempboxa}%
+    \fi
+    \hskip \labelsep}%
+  \ignorespaces}
+\long\def\@iiiparbox#1#2[#3]#4#5{%
+  \leavevmode
+  \@pboxswfalse
+  \if@RTLtab\@bidi@list@minipage@parbox@not@nobtrue\fi
+  \if@RTL\if#1t\@bidi@list@minipage@parboxtrue\else\if#1b\@bidi@list@minipage@parboxtrue\fi\fi\fi
+  \setlength\@tempdima{#4}%
+  \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
+    \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}
 \newenvironment{LTRitems}[1][\labelsep]
                  {\par\@RTLfalse
-                  \leftskip\labelwidth
-                  \advance\leftskip #1
-                  \advance\rightskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \@totalleftmargin \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\leftskip\else\if@RTLtab\leftskip\else\rightskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \newenvironment{RTLitems}[1][\labelsep]
                  {\par\@RTLtrue
-                  \rightskip\labelwidth
-                  \advance\rightskip #1
-                  \advance\leftskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\rightskip\else\if@RTLtab\rightskip\else\leftskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \newenvironment{LTRbibitems}[1][\labelsep]
                  {\par\@RTLfalse
-                  \leftskip\labelwidth
-                  \advance\leftskip #1
-                  \advance\rightskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \@totalleftmargin \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\leftskip\else\if@RTLtab\leftskip\else\rightskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \newenvironment{RTLbibitems}[1][\labelsep]
                  {\par\@RTLtrue
-                  \rightskip\labelwidth
-                  \advance\rightskip #1
-                  \advance\leftskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\rightskip\else\if@RTLtab\rightskip\else\leftskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \def\raggedright{%
   \let\\\@centercr
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index 6e0790b63d3..3204baa9ada 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.4.0}
+\def\bidiversion{v1.4.1}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -44,6 +44,8 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \newif\if@parafootRTL
 \newif\if@RTLcolumnfootnotes
 \eqnewif{\if@RTL@footnote}{\if@rl@footnote}
+\newif\if@bidi@list@minipage@parbox
+\newif\if@bidi@list@minipage@parbox@not@nob
 \@RTLmainfalse
 \AtBeginDocument{%
   \if@RTLmain\else
diff --git a/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def
index 14bae3a0931..f921b460ee0 100644
--- a/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def
@@ -20,6 +20,8 @@
 \def\@iiiminipage#1#2[#3]#4{%
   \leavevmode
   \@pboxswfalse
+  \if@RTLtab\@bidi@list@minipage@parbox@not@nobtrue\fi
+  \if@RTL\if#1t\@bidi@list@minipage@parboxtrue\else\if#1b\@bidi@list@minipage@parboxtrue\fi\fi\fi
   \setlength\@tempdima{#4}%
   \def\@mpargs{{#1}{#2}[#3]{#4}}%
   \setbox\@tempboxa\vbox\bgroup
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 cdbb0bd1605..08722ce35ac 100644
--- a/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
@@ -200,6 +200,8 @@
 \def\@iiiminipage#1#2[#3]#4{%
   \leavevmode
   \@pboxswfalse
+  \if@RTLtab\@bidi@list@minipage@parbox@not@nobtrue\fi
+  \if@RTL\if#1t\@bidi@list@minipage@parboxtrue\else\if#1b\@bidi@list@minipage@parboxtrue\fi\fi\fi
   \setlength\@tempdima{#4}%
   \def\@mpargs{{#1}{#2}[#3]{#4}}%
   \setbox\@tempboxa\vbox\bgroup
diff --git a/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def
index 856309f0668..2b700158765 100644
--- a/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def
@@ -15,23 +15,25 @@
 \ProvidesFile{natbib-xetex-bidi.def}[2011/06/04 v0.1 bidi adaptations for natbib package for XeTeX engine]
 \renewenvironment{LTRbibitems}[1][\labelsep]
                  {\par\@RTLfalse
+                  \if@RTLtab\parshape \@ne \@totalleftmargin \dimexpr(\linewidth-\leftmargin)\fi
                   \ifNAT@numbers
-                  \leftskip\labelwidth
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelwidth
                   \else
-                  \leftskip\labelsep
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelsep
                   \fi
-                  \advance\leftskip #1
-                  \advance\rightskip -\leftmargin
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\leftskip\else\if@RTLtab\leftskip\else\rightskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \renewenvironment{RTLbibitems}[1][\labelsep]
                  {\par\@RTLtrue
+                  \if@RTLtab\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \dimexpr(\linewidth-\leftmargin)\fi
                   \ifNAT@numbers
-                  \rightskip\labelwidth
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelwidth
                   \else
-                  \rightskip\labelsep
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelsep
                   \fi
-                  \advance\rightskip #1
-                  \advance\leftskip -\leftmargin
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\rightskip\else\if@RTLtab\rightskip\else\leftskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \renewenvironment{thebibliography}[1]{%
  \bibsection
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index e1b76cf708a..14086bf0498 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/01/01 v1.0.0 bidi adaptations  for XeTeX engine]
+\ProvidesFile{xetex-bidi.def}[2012/01/01 v1.0.1 bidi adaptations  for XeTeX engine]
 \newcommand{\TeXXeTOn}{\TeXXeTstate=1 }
 \newcommand{\TeXXeTOff}{\TeXXeTstate=0 }
 \TeXXeTOn
@@ -58,14 +58,14 @@
   \bgroup
   \aftergroup\egroup
  }\vbox}
-\def\LTR{\par\@RTLfalse\@RTL@footnotefalse\hsize\linewidth\parshape\z@}
+\def\LTR{\par\@RTLfalse\@RTL@footnotefalse\if@bidi@list@minipage@parbox\beginL\else\if@RTLtab\beginL\fi\fi\hsize\linewidth\parshape\z@}
 \def\endLTR{\par}
 \def\RTL{\par\@RTLtrue\@RTL@footnotetrue\hsize\linewidth\parshape\z@}
 \def\endRTL{\par}
 \def\@ltr{\if@RTL\par\@RTLfalse\@RTL@footnotefalse\fi}
 \def\@rtl{\if@RTL\relax\else\par\@RTLtrue\@RTL@footnotetrue\fi}
 \def\setRTL{\@RTLtrue\@RTL@footnotetrue}
-\def\setLTR{\@RTLfalse\@RTL@footnotefalse}
+\def\setLTR{\@RTLfalse\@RTL@footnotefalse\if@bidi@list@minipage@parbox\beginL\else\if@RTLtab\beginL\fi\fi}
 \let\unsetRTL=\setLTR
 \let\unsetLTR=\setRTL
 \let\LR=\LRE
@@ -113,7 +113,7 @@
 \def\setRTLbibitems{\@RTLbibitemstrue\@LTRbibitemsfalse}
 \def\setLTRbibitems{\@LTRbibitemstrue\@RTLbibitemsfalse}
 \def\setdefaultbibitems{\@RTLbibitemsfalse\@LTRbibitemsfalse}
-\def\list#1#2{%
+\def\list#1#2{\noindent%
   \ifnum \@listdepth >5\relax
     \@toodeep
   \else
@@ -132,36 +132,143 @@
   \parindent\listparindent
   \advance\linewidth -\rightmargin
   \advance\linewidth -\leftmargin
+  \if@bidi@list@minipage@parbox
+  \if@RTL
+  \advance\@totalleftmargin \leftmargin
+  \else
+  \advance\@totalleftmargin \rightmargin
+  \fi
+  \else
+  \if@RTLtab
+  \if@bidi@list@minipage@parbox@not@nob
   \if@RTL
     \advance\@totalleftmargin \rightmargin
   \else
     \advance\@totalleftmargin \leftmargin
   \fi
+  \else
+  \if@RTL
+  \advance\@totalleftmargin \leftmargin
+  \else
+  \advance\@totalleftmargin \rightmargin
+  \fi\fi
+  \else
+  \if@RTL
+    \advance\@totalleftmargin \rightmargin
+  \else
+    \advance\@totalleftmargin \leftmargin
+  \fi\fi\fi
   \parshape \@ne \@totalleftmargin \linewidth
   \ignorespaces}
+\def\@item[#1]{%
+  \if@noparitem
+    \@donoparitem
+  \else
+    \if@inlabel
+      \indent \par
+    \fi
+    \ifhmode
+      \unskip\unskip \par
+    \fi
+    \if@newlist
+      \if@nobreak
+        \@nbitem
+      \else
+        \addpenalty\@beginparpenalty
+        \addvspace\@topsep
+        \addvspace{-\parskip}%
+      \fi
+    \else
+      \addpenalty\@itempenalty
+      \addvspace\itemsep
+    \fi
+    \global\@inlabeltrue
+  \fi
+  \everypar{\if@bidi@list@minipage@parbox\if@RTL\else\beginL\fi\else\if@RTLtab\if@RTL\else\beginL\fi\fi\fi%
+    \@minipagefalse
+    \global\@newlistfalse
+    \if@inlabel
+      \global\@inlabelfalse
+      {\setbox\z@\lastbox
+       \ifvoid\z@
+         \kern-\itemindent
+       \fi}%
+      \box\@labels
+      \penalty\z@
+    \fi
+    \if@nobreak
+      \@nobreakfalse
+      \clubpenalty \@M
+    \else
+      \clubpenalty \@clubpenalty
+      \everypar{}%
+    \fi}%
+  \if@noitemarg
+    \@noitemargfalse
+    \if@nmbrlist
+      \refstepcounter\@listctr
+    \fi
+  \fi
+  \sbox\@tempboxa{\makelabel{#1}}%
+  \global\setbox\@labels\hbox{%
+    \unhbox\@labels
+    \hskip \itemindent
+    \hskip -\labelwidth
+    \hskip -\labelsep
+    \ifdim \wd\@tempboxa >\labelwidth
+      \box\@tempboxa
+    \else
+      \hbox to\labelwidth {\unhbox\@tempboxa}%
+    \fi
+    \hskip \labelsep}%
+  \ignorespaces}
+\long\def\@iiiparbox#1#2[#3]#4#5{%
+  \leavevmode
+  \@pboxswfalse
+  \if@RTLtab\@bidi@list@minipage@parbox@not@nobtrue\fi
+  \if@RTL\if#1t\@bidi@list@minipage@parboxtrue\else\if#1b\@bidi@list@minipage@parboxtrue\fi\fi\fi
+  \setlength\@tempdima{#4}%
+  \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
+    \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}
 \newenvironment{LTRitems}[1][\labelsep]
                  {\par\@RTLfalse
-                  \leftskip\labelwidth
-                  \advance\leftskip #1
-                  \advance\rightskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \@totalleftmargin \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\leftskip\else\if@RTLtab\leftskip\else\rightskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \newenvironment{RTLitems}[1][\labelsep]
                  {\par\@RTLtrue
-                  \rightskip\labelwidth
-                  \advance\rightskip #1
-                  \advance\leftskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\rightskip\else\if@RTLtab\rightskip\else\leftskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \newenvironment{LTRbibitems}[1][\labelsep]
                  {\par\@RTLfalse
-                  \leftskip\labelwidth
-                  \advance\leftskip #1
-                  \advance\rightskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \@totalleftmargin \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\leftskip\else\if@RTLtab\leftskip\else\rightskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \newenvironment{RTLbibitems}[1][\labelsep]
                  {\par\@RTLtrue
-                  \rightskip\labelwidth
-                  \advance\rightskip #1
-                  \advance\leftskip -\leftmargin
+                  \if@RTLtab\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \dimexpr(\linewidth-\leftmargin)\fi
+                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelwidth
+                  \if@RTLtab\else\advance\if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi #1\fi
+                  \advance\if@bidi@list@minipage@parbox\rightskip\else\if@RTLtab\rightskip\else\leftskip\fi\fi -\leftmargin
                   \ignorespaces}{\endtrivlist}
 \def\raggedright{%
   \let\\\@centercr