bidi (20oct11)

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

3 files changed, 29 insertions, 43 deletions

diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index 3204baa9ada..324998277fd 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.1}
+\def\bidiversion{v1.4.2}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
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 2b700158765..ed28ea86951 100644
--- a/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def
@@ -13,28 +13,6 @@
 %% 
 %% 
 \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
-                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelwidth
-                  \else
-                  \if@bidi@list@minipage@parbox\rightskip\else\leftskip\fi\labelsep
-                  \fi
-                  \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
-                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelwidth
-                  \else
-                  \if@bidi@list@minipage@parbox\leftskip\else\rightskip\fi\labelsep
-                  \fi
-                  \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
  \parindent\z@
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index 14086bf0498..e4ab6afe454 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -242,33 +242,41 @@
        \csname bm@#3\endcsname}%
     \if@pboxsw \m@th$\fi
   \@end@tempboxa}
-\newenvironment{LTRitems}[1][\labelsep]
+\newenvironment{LTRitems}
                  {\par\@RTLfalse
-                  \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
+                  \if@bidi@list@minipage@parbox
+                  \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth
+                  \else \if@RTLtab\if@bidi@list@minipage@parbox@not@nob
+                  \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\else
+                  \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi
+                  \else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi\fi
                   \ignorespaces}{\endtrivlist}
-\newenvironment{RTLitems}[1][\labelsep]
+\newenvironment{RTLitems}
                  {\par\@RTLtrue
-                  \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
+                  \if@bidi@list@minipage@parbox
+                  \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth
+                  \else \if@RTLtab\if@bidi@list@minipage@parbox@not@nob
+                  \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\else
+                  \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi
+                  \else \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi\fi
                   \ignorespaces}{\endtrivlist}
-\newenvironment{LTRbibitems}[1][\labelsep]
+\newenvironment{LTRbibitems}
                  {\par\@RTLfalse
-                  \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
+                  \if@bidi@list@minipage@parbox
+                  \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth
+                  \else \if@RTLtab\if@bidi@list@minipage@parbox@not@nob
+                  \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\else
+                  \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi
+                  \else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi\fi
                   \ignorespaces}{\endtrivlist}
-\newenvironment{RTLbibitems}[1][\labelsep]
+\newenvironment{RTLbibitems}
                  {\par\@RTLtrue
-                  \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
+                  \if@bidi@list@minipage@parbox
+                  \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth
+                  \else \if@RTLtab\if@bidi@list@minipage@parbox@not@nob
+                  \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\else
+                  \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi
+                  \else \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi\fi
                   \ignorespaces}{\endtrivlist}
 \def\raggedright{%
   \let\\\@centercr