bidi (8nov11)

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

5 files changed, 8 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index 2beffba8b58..ec6cefb7c1c 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.5
+v1.4.6
 
 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 9e360aec59a..7726ce071df 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 32ed3c7e7e7..56633bbe6e7 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.5
+v1.4.6
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -233,7 +233,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.5}
+% \date{\today\qquad Version 1.4.6}
 % \maketitle
 % \tableofcontents
 %\section*{Introduction}
@@ -248,7 +248,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.5, 2012/01/01
+%v1.4.6, 2012/01/01
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/latex/contrib/bidi
 %\end{lstlisting}
@@ -2519,7 +2519,7 @@ by Vafa Khalighi.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2012/01/01}
-\def\bidiversion{v1.4.5}
+\def\bidiversion{v1.4.6}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -16494,7 +16494,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{amsthm}{\input{amsthm-xetex-bidi.def}}{}
 \@ifpackageloaded{breqn}{\input{breqn-xetex-bidi.def}}{}
 \@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{}
-\@ifpackageloaded{crop}{\input{crop-xetex-bidi.def}}{}
+\@ifpackageloaded{crop}{\@ifclassloaded{memoir}{}{\input{crop-xetex-bidi.def}}}{}
 \@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{}
 \@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{}
 \@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{}
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index 47e53724d18..6757f7ec781 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.5}
+\def\bidiversion{v1.4.6}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \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 6aae2f56c93..1b28fee55d9 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -686,7 +686,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{amsthm}{\input{amsthm-xetex-bidi.def}}{}
 \@ifpackageloaded{breqn}{\input{breqn-xetex-bidi.def}}{}
 \@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{}
-\@ifpackageloaded{crop}{\input{crop-xetex-bidi.def}}{}
+\@ifpackageloaded{crop}{\@ifclassloaded{memoir}{}{\input{crop-xetex-bidi.def}}}{}
 \@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{}
 \@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{}
 \@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{}