109 files changed, 584 insertions, 147 deletions
diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
new file mode 100644
index 00000000000..490e19532b9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bidi/README
@@ -0,0 +1,15 @@
+_________________
+The bidi package
+v1.0.6
+
+This package provides a convenient interface for typesetting
+bidirectional texts with XeLaTeX and LuaLaTeX.
+
+This version fixes all the bugs that were present in v1.0.5. 
+
+______________
+Vafa Khalighi
+vafakh84@gmail.com
+
+Copyright 2007-2010
+Distributed under the LaTeX Project Public License
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bibitem.pdf b/Master/texmf-dist/doc/latex/bidi/bibitem.pdf
index 49191743021..49191743021 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bibitem.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bibitem.pdf
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
new file mode 100644
index 00000000000..fd15ffc5dc6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.tex b/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
index e4f6815b678..e6b00b2871e 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.tex
+++ b/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
@@ -17,16 +17,18 @@
 \definecolor{Orange}{rgb}{1,.4,.2}
 \newcommand\XeTeX{Xe\TeX}
 \newcommand\XeLaTeX{Xe\LaTeX}
-\title{The \textsf{bidi} Package\\ \href{http://bidi.berlios.de}{\texttt{http://bidi.berlios.de}}}
-\author{Vafa Khalighi\\ \href{mailto:vafa@users.berlios.de}{\texttt{vafa@users.berlios.de}}}
-\date{Version 1.0.5}
+\newcommand\LuaTeX{Lua\TeX}
+\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.6}
 \begin{document}
 \maketitle
 \tableofcontents
 \section{Introduction}
-\textsf{bidi} provides a convenient interface for typesetting bidirectional texts with \XeLaTeX. The package includes adaptations for use with many other commonly-used packages.
+\textsf{bidi} provides a convenient interface for typesetting bidirectional texts with \XeLaTeX\ and \LuaLaTeX\footnote{At present support for \LuaTeX\ is not present but it will be added when \LuaTeX\ 0.70 is released. This is because that direction support of \LuaTeX\ in 0.70 will be backward incompatible with 0.60.}. The package includes adaptations for use with many other commonly-used packages.
 
-The \textsf{bidi} package at the moment only works with  \XeTeX\  engine, but we will support other \TeX\ engines as well in the future.
+The \textsf{bidi} package at the moment only works with both \XeTeX\ and \LuaTeX\ engines, but we will support other \TeX\ engines as well in the future.
 \subsection{\textsf{bidi} Info On The Terminal and In The Log File}
 If you use \textsf{bidi} package to write any input \TeX\ document, and then run \texttt{xelatex} on your document, \textsf{bidi} writes some information about itself to the terminal and to the log file. The information is something like:
 \begin{lstlisting}[numbers=none,backgroundcolor=\color{skugga}]
@@ -35,10 +37,10 @@ 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.5, <revision 253>, 2010/07/25
+v1.0.6, <commit 6>, 2010/07/25
 License: LaTeX Project Public License, version 1.3c or higher (your choice)
-Home: http://bidi.berlios.de
-Location on CTAN: /macros/xetex/latex/bidi
+Home: http://bitbucket.org/vafa/bidi
+Location on CTAN: /macros/latex/contrib/bidi
 \end{lstlisting}
 \section{Basics}
 \subsection{Loading The Package}
@@ -80,20 +82,20 @@ l.4 \begin{document}
 
 \end{lstlisting}
 \end{enumerate}
-\subsection{Commands for Version, Subversion Revision and Date of The Package}
+\subsection{Commands for Version number, Mercurial commit number and Date of The Package}
 \begin{BDef}
-\Lcs{bidiversion}\quad\Lcs{bidirevision}\quad\Lcs{bididate}
+\Lcs{bidiversion}\quad\Lcs{bidicommit}\quad\Lcs{bididate}
 \end{BDef}
 \begin{itemize}
 \item \Lcs{bidiversion} gives the current version of the package.
-\item \Lcs{bidirevision} gives the current subversion revision of the package.
+\item \Lcs{bidicommit} gives the current Mercurial commit number of the package.
 \item \Lcs{bididate} gives the current date of the package.
 \end{itemize}
-\begin{lstlisting}[morekeywords={bidiversion,bidirevision,bididate}]
+\begin{lstlisting}[morekeywords={bidiversion,bidicommit,bididate}]
 \documentclass{article}
 \usepackage{bidi}
 \begin{document}
-This is typeset by \textsf{bidi} package, \bidiversion, \bidirevision, \bididate.
+This is typeset by \textsf{bidi} package, \bidiversion, \bidicommit, \bididate.
 \end{document}
 \end{lstlisting}
 \subsection{Options of The Package\label{options}}
@@ -175,10 +177,8 @@ Anyone who reads Old and Middle English \RLE{Short RTL text} literary texts will
 \end{lstlisting}
 \subsection{Footnotes}
 \begin{BDef}
-\Lcs{footnote}\OptArg{num}\Largb{\Larga{text}}\quad\Lcs{LTRfootnote}\OptArg{num}\Largb{\Larga{text}}\\
-\Lcs{RTLfootnote}\OptArg{num}\Largb{\Larga{text}}\quad
-\Lcs{setfootnoteRL}\quad\Lcs{setfootnoteLR}\\
-\Lcs{unsetfootnoteRL}\quad
+\Lcs{footnote}\OptArg{num}\Largb{\Larga{text}}\quad\Lcs{LTRfootnote}\OptArg{num}\Largb{\Larga{text}}\quad\Lcs{RTLfootnote}\OptArg{num}\Largb{\Larga{text}}\\
+\Lcs{setfootnoteRL}\quad\Lcs{setfootnoteLR}\quad\Lcs{unsetfootnoteRL}\\
 \Lcs{thanks}\Largb{\Larga{text}}\quad\Lcs{LTRthanks}\Largb{\Larga{text}}\quad\Lcs{RTLthanks}\Largb{\Larga{text}}
 \end{BDef}
 \begin{itemize}
@@ -220,7 +220,8 @@ If you pass the \texttt{twocolumn} option to the class file and if the main dire
 \subsection{RTL cases}
 \begin{BDef}
 \Lcs{rcases}\Largb{\Lcs{text}\Largb{\Larga{brach1}}\Lcs{cr}\Lcs{text}\Largb{\Larga{brach2}}\Lcs{cr}%
-\Lcs{text}\Largb{\Larga{brach3}}\ldots}\\\Lcs{text}\Largb{\Larga{main}}
+\Lcs{text}\Largb{\Larga{brach3}}\ldots}\\
+\Lcs{text}\Largb{\Larga{main}}
 \end{BDef}
 \Lcs{rcases} is defined in bidi for typesetting RTL cases. \Lcs{text} is defined in \textsf{amsmath} package, so this means that you need to load \textsf{amsmath} package too.
 \begin{lstlisting}[morekeywords={rcases,text}]
@@ -273,6 +274,94 @@ x^2+y^2=z^2
 \end{lstlisting}
 \subsection{\Lcs{raggedright}, \Lcs{raggedleft} commands, \texttt{flushleft} and \texttt{flushright} Environments}
 \Lcs{raggedright} command and \texttt{flushleft} environment put the text on the left hand side and \Lcs{raggedleft} command and \texttt{flushright} environment put the text on the right hand side, independent on the current mode.
+\subsection{\textsf{LTRitems} and \textsf{RTLitems} Environments}
+If you typeset an \textsf{itemize}, or an \textsf{enumerate}, or a \textsf{description} environment where all \Lcs{item}s are one directional, you have no problem at all as shown below:
+\begin{lstlisting}
+\documentclass{article}
+\begin{document}
+Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\begin{enumerate}
+\item Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\item Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\end{enumerate}
+\end{document}
+\end{lstlisting}
+However if the above example becomes bidirectional, as shown below:
+\begin{lstlisting}
+\documentclass{article}
+\usepackage{bidi}
+\begin{document}
+Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\begin{enumerate}
+\item Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\setRTL
+\item Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\end{enumerate}
+\end{document}
+\end{lstlisting}
+Then some people may argue that this typographically does not look promising. For this purpose, \textsf{RTLitems} environment is provided which has the following syntax:
+\begin{BDef}
+\LBEG{RTLitems}\OptArg{length}\\
+\quad\Lcs{item} \Larga{text}\\
+\quad\ldots\\
+\LEND{RTLitems}
+\end{BDef}
+Where \OptArg{length} is optional and if you do not give it, the value of \Lcs{rightskip} will be equal to the value of \Lcs{labelwidth}\(+\)\Lcs{labelsep} by default and if you give this optional length, then the value of \Lcs{rightskip} will be equal to the value of \Lcs{labelwidth}\(+\)\Larg{given length}. Thus by using the \textsf{RTLitems} environment, the previous example will look like the following:
+\begin{lstlisting}
+\documentclass{article}
+\usepackage{bidi}
+\begin{document}
+Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\begin{enumerate}
+\item Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\begin{RTLitems}
+\item Anyone who reads Old and Middle English literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's 
+\end{RTLitems}
+\end{enumerate}
+\end{document}
+\end{lstlisting}
+Similarly, \textsf{LTRitems} environment is defined which has the following syntax:
+\begin{BDef}
+\LBEG{LTRitems}\OptArg{length}\\
+\quad\Lcs{item} \Larga{text}\\
+\quad\ldots\\
+\LEND{LTRitems}
+\end{BDef}
+Where \OptArg{length} is optional and if you do not give it, the value of \Lcs{leftskip} will be equal to the value of \Lcs{labelwidth}\(+\)\Lcs{labelsep} by default and if you give this optional length, then the value of \Lcs{leftskip} will be equal to the value of \Lcs{labelwidth}\(+\)\Larg{given length}.
+\subsection{\Lcs{setLTRbibitems}, \Lcs{setRTLbibitems}, and \Lcs{setdefaultbibitems} commands}
+\begin{BDef}
+\Lcs{setLTRbibitems}\quad\Lcs{setRTLbibitems}\quad\Lcs{setdefaultbibitems}
+\end{BDef}
+\begin{itemize}
+\item If your whole \textsf{thebibliography} environment is inside RTL mode, but all your \Lcs{bibitem}s are LTR and you actually want to have \Lcs{bibname} to appear on the RHS, you can use \Lcs{setLTRbibitems} command before \textsf{thebibliography} environment.
+\item If your whole \textsf{thebibliography} environment is inside LTR mode, but all your \Lcs{bibitem}s are RTL and you actually want to have \Lcs{bibname} to appear on the LHS, you can use \Lcs{setRTLbibitems} command before \textsf{thebibliography} environment.
+\item \Lcs{setdefaultbibitems} is the default, when your \Lcs{bibitems} are a mixture of LTR and RTL and it does not matter what mode (LTR or RTL) your \textsf{thebibliography} environment is in. Please note that you do not have to use \Lcs{setdefaultbibitems} command  in this case at all.
+
+Consider an example that your \textsf{thebibliography} environment is inside LTR mode and you have, say two \Lcs{bibitem}s. The first \Lcs{bibitem} is LTR and the second \Lcs{bibitem} is RTL. One could typeset this senario as shown below:
+\begin{lstlisting}
+\documentclass{article}
+\usepackage{bidi}
+\begin{document}
+\begin{thebibliography}{99}
+\bibitem This is the first bibitem which is LTR.
+\begin{RTLitems}
+\bibitem This is the second bibitem which is RTL.
+\end{RTLitems}
+\end{thebibliography}
+\end{document}
+\end{lstlisting}
+\end{itemize}
+
+\subsection{Typesetting margin par}
+By default, in RTL mode, \Lcs{marginpar} appears on LHS and its content is typeset RTL and in LTR mode, \Lcs{marginpar} appears on RHS and its content is typeset LTR. In addition, the three following commands are provided:
+\begin{BDef}
+\Lcs{setRTLmarginpar}\quad\Lcs{setLTRmarginpar}\quad\Lcs{setdefaultmarginpar}
+\end{BDef}
+\begin{itemize}
+\item \Lcs{setRTLmarginpar} always makes \Lcs{marginpar} to appear on LHS and the content of \Lcs{marginpar} is typeset RTL (this is independent of the current mode).
+\item \Lcs{setLTRmarginpar} always makes \Lcs{marginpar} to appear on RHS and the content of \Lcs{marginpar} is typeset LTR (this is independent of the current mode).
+\item \Lcs{setdefaultmarginpar} gives the default behaviour of \Lcs{marginpar} as described above.
+\end{itemize}
 \subsection{Typesetting of Headers and Footers}
 If the main direction of the document is RTL, then headers and footers are typeset RTL and if the main direction of the document is LTR, then headers and footers are typeset LTR.
 \subsection{Tabular Typesetting}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.pdf b/Master/texmf-dist/doc/latex/bidi/bidisample2e.pdf
index a4bb1e0d994..a4bb1e0d994 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bidisample2e.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.tex b/Master/texmf-dist/doc/latex/bidi/bidisample2e.tex
index 4f791ead282..4f791ead282 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.tex
+++ b/Master/texmf-dist/doc/latex/bidi/bidisample2e.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.pdf b/Master/texmf-dist/doc/latex/bidi/bidismall2e.pdf
index 4961db4e01a..4961db4e01a 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bidismall2e.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.tex b/Master/texmf-dist/doc/latex/bidi/bidismall2e.tex
index 16a02e49240..16a02e49240 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.tex
+++ b/Master/texmf-dist/doc/latex/bidi/bidismall2e.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/gull.jpg b/Master/texmf-dist/doc/latex/bidi/gull.jpg
index a77d1bd3421..a77d1bd3421 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/gull.jpg
+++ b/Master/texmf-dist/doc/latex/bidi/gull.jpg
diff --git a/Master/texmf-dist/doc/xelatex/bidi/picture.jpg b/Master/texmf-dist/doc/latex/bidi/picture.jpg
index ef48e69ce85..ef48e69ce85 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/picture.jpg
+++ b/Master/texmf-dist/doc/latex/bidi/picture.jpg
diff --git a/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.pdf b/Master/texmf-dist/doc/latex/bidi/presentation-sample.pdf
index a8dd715930a..a8dd715930a 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/presentation-sample.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex b/Master/texmf-dist/doc/latex/bidi/presentation-sample.tex
index e562e9d83e9..e562e9d83e9 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex
+++ b/Master/texmf-dist/doc/latex/bidi/presentation-sample.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.pdf b/Master/texmf-dist/doc/latex/bidi/test-arydshln.pdf
index 5a250e1d019..5a250e1d019 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-arydshln.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.tex b/Master/texmf-dist/doc/latex/bidi/test-arydshln.tex
index a19c6994bd1..a19c6994bd1 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-arydshln.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-bidi.pdf b/Master/texmf-dist/doc/latex/bidi/test-bidi.pdf
index 7f2a8336f4f..7f2a8336f4f 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-bidi.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-bidi.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-bidi.tex b/Master/texmf-dist/doc/latex/bidi/test-bidi.tex
index e81a1dc599b..e81a1dc599b 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-bidi.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-bidi.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-brochure.pdf b/Master/texmf-dist/doc/latex/bidi/test-brochure.pdf
index 42956be42c8..42956be42c8 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-brochure.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-brochure.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-brochure.tex b/Master/texmf-dist/doc/latex/bidi/test-brochure.tex
index 3066e0e4b41..3066e0e4b41 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-brochure.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-brochure.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.pdf b/Master/texmf-dist/doc/latex/bidi/test-casualcv.pdf
index 6578ceb310d..6578ceb310d 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-casualcv.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.tex b/Master/texmf-dist/doc/latex/bidi/test-casualcv.tex
index 7e6c03378e1..b708d0f209f 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-casualcv.tex
@@ -15,7 +15,7 @@
 \mobile{۰۹۱۸۹۶۹۴۹۶}
 \phone{۹۸۹۰۸۳۴۱}
 \fax{۹۸۹۰۸۳۴۲}
-\email{vafa@users.berlios.de}
+\email{vafakh84@gmail.com}
 \extrainfo{اطلاعات اضافی}
 \photo[64pt]{picture}
 \quote{نقل قول}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.pdf b/Master/texmf-dist/doc/latex/bidi/test-classiccv.pdf
index 1764e6a5a11..1764e6a5a11 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-classiccv.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.tex b/Master/texmf-dist/doc/latex/bidi/test-classiccv.tex
index a1fdd2c3437..16acfc76e69 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-classiccv.tex
@@ -15,7 +15,7 @@
 \mobile{۰۹۱۸۹۶۹۴۹۶}
 \phone{۹۸۹۰۸۳۴۱}
 \fax{۹۸۹۰۸۳۴۲}
-\email{me@you.com}
+\email{vafakh84@gmail.com}
 \extrainfo{اطلاعات اضافی}
 \photo[64pt]{picture}
 \quote{نقل قول}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-color.pdf b/Master/texmf-dist/doc/latex/bidi/test-color.pdf
index 22232053af4..22232053af4 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-color.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-color.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-color.tex b/Master/texmf-dist/doc/latex/bidi/test-color.tex
index f2a9dcd7395..f2a9dcd7395 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-color.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-color.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.pdf b/Master/texmf-dist/doc/latex/bidi/test-supertabular.pdf
index d6c4539b883..d6c4539b883 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-supertabular.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex b/Master/texmf-dist/doc/latex/bidi/test-supertabular.tex
index af040d23c2c..af040d23c2c 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-supertabular.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabular.pdf b/Master/texmf-dist/doc/latex/bidi/test-tabular.pdf
index 6da31ff5b8d..6da31ff5b8d 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabular.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-tabular.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex b/Master/texmf-dist/doc/latex/bidi/test-tabular.tex
index 826f38c3515..826f38c3515 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-tabular.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.pdf b/Master/texmf-dist/doc/latex/bidi/test-tabularx.pdf
index 0e95eaa1d03..0e95eaa1d03 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-tabularx.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex b/Master/texmf-dist/doc/latex/bidi/test-tabularx.tex
index 719c266896f..719c266896f 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-tabularx.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.pdf b/Master/texmf-dist/doc/latex/bidi/test-tabulary.pdf
index 425eb03bfc7..425eb03bfc7 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test-tabulary.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.tex b/Master/texmf-dist/doc/latex/bidi/test-tabulary.tex
index 81067943c49..81067943c49 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test-tabulary.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.pdf b/Master/texmf-dist/doc/latex/bidi/test1-colortbl.pdf
index ddb4b770f07..ddb4b770f07 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test1-colortbl.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.tex b/Master/texmf-dist/doc/latex/bidi/test1-colortbl.tex
index 97f20871db1..97f20871db1 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test1-colortbl.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.pdf b/Master/texmf-dist/doc/latex/bidi/test1-wrapfig.pdf
index 2e2047a40aa..2e2047a40aa 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test1-wrapfig.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.tex b/Master/texmf-dist/doc/latex/bidi/test1-wrapfig.tex
index a0fd4b7f8e5..a0fd4b7f8e5 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test1-wrapfig.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.pdf b/Master/texmf-dist/doc/latex/bidi/test2-colortbl.pdf
index d682c51ce15..d682c51ce15 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test2-colortbl.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.tex b/Master/texmf-dist/doc/latex/bidi/test2-colortbl.tex
index 63b50618837..63b50618837 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test2-colortbl.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.pdf b/Master/texmf-dist/doc/latex/bidi/test2-wrapfig.pdf
index e915bd611be..e915bd611be 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test2-wrapfig.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.tex b/Master/texmf-dist/doc/latex/bidi/test2-wrapfig.tex
index ab655dac412..ab655dac412 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test2-wrapfig.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.pdf b/Master/texmf-dist/doc/latex/bidi/test3-wrapfig.pdf
index cf73f50ea25..cf73f50ea25 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/test3-wrapfig.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.tex b/Master/texmf-dist/doc/latex/bidi/test3-wrapfig.tex
index 4a61ff65f76..4a61ff65f76 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.tex
+++ b/Master/texmf-dist/doc/latex/bidi/test3-wrapfig.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/README b/Master/texmf-dist/doc/xelatex/bidi/README
deleted file mode 100644
index e81b5d56b1f..00000000000
--- a/Master/texmf-dist/doc/xelatex/bidi/README
+++ /dev/null
@@ -1,20 +0,0 @@
-_________________
-The bidi package
-v1.0.5
-
-This package provides a convenient interface for typesetting
-bidirectional texts with XeLaTeX.
-
-This version  fixes almost most of the bugs that were present in v1.0.4.
-The support for  bidimoderncv is back in this version.
-
-To get help, please subscribe to the XeTeX mailing list and ask your question there.
-
-The next release is planned to be ready for MikTeX 2.9 and TeXLive 2010.
-
-______________
-Vafa Khalighi
-vafa@users.berlios.de
-
-Copyright 2007-2010
-Distributed under the LaTeX Project Public License
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf
deleted file mode 100644
index a1745aaf9d5..00000000000
--- a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
index eff5ffc15e6..636d32ee940 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsart-xetex-bidi.def}[2010/07/25 v0.4 bidi adaptations for amsart class for XeTeX engine]
+\ProvidesFile{amsart-xetex-bidi.def}[2010/07/25 v0.5 bidi adaptations for amsart class for XeTeX engine]
 \def\@tocline#1#2#3#4#5#6#7{\relax
   \ifnum #1>\c@tocdepth % then omit
   \else
@@ -81,8 +81,22 @@
      \bidi@footnotetext@after
     \insert\footins{\unvbox\footins}%
     \endgroup}
+\renewenvironment{thebibliography}[1]{%
+  \@bibtitlestyle
+  \normalfont\bibliofont\labelsep .5em\relax
+  \renewcommand\theenumiv{\arabic{enumiv}}\let\p@enumiv\@empty
+  \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+  \list{\@biblabel{\theenumiv}}{\settowidth\labelwidth{\@biblabel{#1}}%
+    \leftmargin\labelwidth \advance\leftmargin\labelsep
+    \usecounter{enumiv}}%
+  \sloppy \clubpenalty\@M \widowpenalty\clubpenalty
+  \sfcode`\.=\@m
+}{%
+  \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
+  \endlist
+}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
index c0f19fc0727..fab17c90716 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsbook-xetex-bidi.def}[2010/07/25 v0.5 bidi adaptations for amsbook class for XeTeX engine]
+\ProvidesFile{amsbook-xetex-bidi.def}[2010/07/25 v0.6 bidi adaptations for amsbook class for XeTeX engine]
 \def\@tocline#1#2#3#4#5#6#7{\relax
   \ifnum #1>\c@tocdepth % then omit
   \else
@@ -87,8 +87,22 @@
      \bidi@footnotetext@after
     \insert\footins{\unvbox\footins}%
     \endgroup}
+\renewenvironment{thebibliography}[1]{%
+  \@bibtitlestyle
+  \normalfont\bibliofont\labelsep .5em\relax
+  \renewcommand\theenumiv{\arabic{enumiv}}\let\p@enumiv\@empty
+  \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+  \list{\@biblabel{\theenumiv}}{\settowidth\labelwidth{\@biblabel{#1}}%
+    \leftmargin\labelwidth \advance\leftmargin\labelsep
+    \usecounter{enumiv}}%
+  \sloppy \clubpenalty\@M \widowpenalty\clubpenalty
+  \sfcode`\.=\@m
+}{%
+  \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
+  \endlist
+}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
index 656b0c7999e..f871af62684 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
@@ -9,17 +9,7 @@
 %% 
 %% 
 \ProvidesFile{amsmath-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for amsmath package for XeTeX engine]
-\renewenvironment{equation}{%
-  \incr@eqnum
-  \mathdisplay@push
-  \st@rredfalse \global\@eqnswtrue
-  \beginL\mathdisplay{equation}%
-}{%
-  \endmathdisplay{equation}\endL%
-  \mathdisplay@pop
-  \ignorespacesafterend
-}
-
+\everydisplay\@xp{\the\everydisplay \@displaytrue}
 \renewcommand{\numberwithin}[3][\arabic]{%
   \@ifundefined{c@#2}{\@nocounterr{#2}}{%
     \@ifundefined{c@#3}{\@nocnterr{#3}}{%
@@ -34,7 +24,7 @@
 \DeclareRobustCommand{\[}{\begin{equation*}}
 \DeclareRobustCommand{\]}{\end{equation*}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def
index 8857b937aed..94cc9b210ed 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def
@@ -11,7 +11,7 @@
 \ProvidesFile{amsthm-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for amsthm package for XeTeX engine]
 \def\@thmcountersep{\@SepMark}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def
index b9e310e3107..795bb7f2abf 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def
@@ -92,7 +92,7 @@
    \let \par \@empty
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def
index 9248fdf0489..86b330397e7 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def
@@ -143,8 +143,28 @@
     \nobreak
     \vskip 3ex
     \@afterheading}
+\renewenvironment{thebibliography}[1]
+     {\section*{\refname}%
+      \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}%
+      \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+      \list{\@biblabel{\@arabic\c@enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{#1}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+            \@openbib@code
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+      \sloppy
+      \clubpenalty4000
+      \@clubpenalty \clubpenalty
+      \widowpenalty4000%
+      \sfcode`\.\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def
index 66940c279c8..550f6e046e7 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def
@@ -144,7 +144,7 @@
 \let\adl@org@classz\@classz
 }{}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index e64ebb0c867..e0e790b0103 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -10,9 +10,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2010/07/25}
-\def\bidiversion{v1.0.5}
-\def\bidirevision{revision 253}
-\ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidirevision>
+\def\bidiversion{v1.0.6}
+\def\bidicommit{commit 15}
+\ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidicommit>
 Bidirectional typesetting in XeLaTeX and LuaLaTeX]
 \edef\bidiinfo{%
 bidi package (Support for bidirectional typesetting with XeLaTeX and LuaLaTeX)^^J
@@ -20,15 +20,14 @@ Description: A convenient interface for typesetting bidirectional^^J
 texts with XeLaTeX and LuaLaTeX.  The package includes adaptations for use^^J
 with many other commonly-used packages.^^J
 Copyright © 2009-2010 Vafa Khalighi^^J
-\bidiversion, <\bidirevision>, \bididate^^J
+\bidiversion, <\bidicommit>, \bididate^^J
 License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J
-Home: http://bidi.berlios.de^^J
-Location on CTAN: /macros/xetex/latex/bidi}
+Home: http://bitbucket.org/vafa/bidi^^J
+Location on CTAN: /macros/latex/contrib/bidi}
 \typeout{\bidiinfo}
 \edef\bidi@everyjob{\the\everyjob}
 \everyjob{\bidi@everyjob\typeout{\bidiinfo}}
-\RequirePackage{ifxetex}
-\RequirePackage{ifluatex}
+\RequirePackage{iftex}
 \def\@tagsextension{clo}
 \def\@definitionfileextension{def}
 \def\@iftagsloaded{\@ifl@aded\@tagsextension}
@@ -38,6 +37,10 @@ Location on CTAN: /macros/xetex/latex/bidi}
 \newif\if@RTLmaths
 \newif\if@Latin
 \newif\if@RTLtab
+\newif\if@RTLmarginpar
+\newif\if@LTRmarginpar
+\newif\if@LTRbibitems
+\newif\if@RTLbibitems
 \newif\if@sentdir
 \newif\if@RTL@footnote
 \let\if@rlmain=\if@RTLmain
@@ -68,10 +71,10 @@ Location on CTAN: /macros/xetex/latex/bidi}
 \def\bracetext{\ifcat\n@xt{\else\ifcat\n@xt}\fi
   \errmessage{Missing left brace has been substituted}\fi \bgroup}
 \input{loadingorder-bidi.def}
-\ifxetex
+\ifXeTeX
   \input{xetex-bidi.def}
 \else
-  \ifluatex
+  \ifLuaTeX
     \input{luatex-bidi.def}
   \else
     \PackageError{bidi}{TeX engines other than XeTeX and LuaTeX are not yet supported}
@@ -80,7 +83,7 @@ Location on CTAN: /macros/xetex/latex/bidi}
 
 \ProcessOptions
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty
index 3501e5d9480..838670ca3f9 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty
@@ -66,7 +66,7 @@
 }
 
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty b/Master/texmf-dist/tex/latex/bidi/bidicode.sty
index dcb383f932e..44f98eddbff 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidicode.sty
@@ -145,7 +145,7 @@
 \def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt}
 \def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty
index 8479487dc37..9030af705dd 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty
@@ -156,7 +156,7 @@
   \color@endbox
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls
index f6692b218c4..64297954c4a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
+++ b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls
@@ -236,6 +236,7 @@
   {%
     \section{\refname}%
     \small%
+    \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
     \begin{list}{\bibliographyitemlabel}%
       {%
         \setlength{\topsep}{0pt}%
@@ -257,7 +258,7 @@
 \let\@openbib@code\@empty
 
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty
index e4ff25a26cd..a5aad6e1206 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty
@@ -205,7 +205,7 @@
 \expandafter\def\csname modernpoem*\endcsname{\let\poem@obeylines=\obeylines\modernpoem}
 \expandafter\def\csname endmodernpoem*\endcsname{\endmodernpoem}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidipresentation.cls b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls
index e412454de34..c2b43a5945e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidipresentation.cls
+++ b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls
@@ -82,7 +82,7 @@
                {\endlist}
 
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def
index 5113e120d38..8bf5d9aee43 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{book-xetex-bidi.def}[2010/07/25 v0.5 bidi adaptations for standard book class for XeTeX engine]
+\ProvidesFile{book-xetex-bidi.def}[2010/07/25 v0.6 bidi adaptations for standard book class for XeTeX engine]
 \@ifclassloaded{bookest}{}{%
   \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
@@ -160,8 +160,28 @@
     \clearpage
   \fi
   \@mainmatterfalse}
+\renewenvironment{thebibliography}[1]
+     {\chapter*{\bibname}%
+      \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
+      \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+      \list{\@biblabel{\@arabic\c@enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{#1}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+            \@openbib@code
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+      \sloppy
+      \clubpenalty4000
+      \@clubpenalty \clubpenalty
+      \widowpenalty4000%
+      \sfcode`\.\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def
index 382d639cf0f..3231a9305fb 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def
@@ -42,7 +42,7 @@
   \vskip 30\p@
   }}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def
index 6854f373be3..4c8b7a243ea 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def
@@ -64,7 +64,7 @@
   }%
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def
index 4c9c7ba410a..4fbc3a472db 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def
@@ -11,7 +11,7 @@
 \ProvidesFile{caption-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for caption package for XeTeX engine]
 \let\@makecaption\caption@makecaption
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def
index 0f108ac0f87..eaf647aca4d 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def
@@ -50,7 +50,7 @@
 \def\color@fbox#1#2#3{%
   \color@b@x{\fboxsep\z@\bidicolor#1{#2}\fbox}{\bidicolor#1{#3}}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def
index 0b41e0c1520..e6d3c229808 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def
@@ -47,7 +47,7 @@
         \unhbox\z@\if@RTL\endL\fi}%
   \prepnext@tok}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty
index 7cf3de727d5..e120ec97174 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
+++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty
@@ -108,7 +108,7 @@
 \AtBeginDocument{\makefooter}
 
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty
index d2ff4eed4d5..3021c30a342 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty
+++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty
@@ -115,7 +115,7 @@
   }
 
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def
index 4cd997a2ec4..db6756a57ed 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def
@@ -12,7 +12,7 @@
 \renewcommand\SetWatermarkText[1]{%
   \def\sc@wm@text{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def
index c56e0893c8c..75a9d9e0994 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{extbook-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for extbook class for XeTeX engine]
+\ProvidesFile{extbook-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for extbook class for XeTeX engine]
   \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -159,8 +159,28 @@
     \clearpage
   \fi
   \@mainmatterfalse}
+\renewenvironment{thebibliography}[1]
+     {\chapter*{\bibname
+        \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}}%
+      \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+      \list{\@biblabel{\@arabic\c@enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{#1}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+            \@openbib@code
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+      \sloppy
+      \clubpenalty4000
+      \@clubpenalty \clubpenalty
+      \widowpenalty4000%
+      \sfcode`\.\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
index 24be58e219e..9a156aabb37 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
@@ -20,7 +20,7 @@
         \parbox[t]{\headwidth}{\centering\if@RTLmain\beginR\fi#3\if@RTLmain\endR\fi}\hfill
         \llap{\parbox[t]{\headwidth}{\if@RTLmain\raggedright\else\raggedleft\fi\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}}}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def
index 42988d14205..ac09ac70f17 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{fleqn-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for fleqn tag for XeTeX engine]
+\ProvidesFile{fleqn-xetex-bidi.def}[2010/03/01 v0.1 bidi adaptations for fleqn tag for XeTeX engine]
 \renewcommand\[{\relax
                 \ifmmode\@badmath
                 \else
@@ -39,7 +39,7 @@
        \endL\egroup
      \endtrivlist}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def
index c466ca32872..e3b5b11aaa2 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def
@@ -139,7 +139,7 @@
 \renewcommand\theparagraph    {\thesubsubsection\@SepMark\@arabic\c@paragraph}
 \renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}}{}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnote-luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def
index f07784e623d..d29e2e66056 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/footnote-luatex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def
@@ -10,7 +10,7 @@
 %% 
 \ProvidesFile{footnote-luatex-bidi.def}[2010/07/25 v0.1 bidi footnote macros for LuaTeX engine]
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
index 855a34bf08e..c9d3cce14ba 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
@@ -240,7 +240,7 @@
   \endgroup
   \@RTLfootnotetext}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def
index 961aef11f4b..d6b51c90e4a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def
@@ -114,7 +114,7 @@
     \Gscale@box\@tempa[\@tempb]{\box\@tempboxa}%
   \@end@tempboxa}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def
index 9abd39f87bb..df60a1a0c9c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def
@@ -236,7 +236,7 @@
 }%
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def
index eb576128696..d5600cb9c8d 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def
@@ -13,7 +13,7 @@
                       \rlap{\normalfont\normalcolor
                         \hskip -\displaywidth\if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def
index 0c0dce9fee8..97c06228ce1 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def
@@ -23,7 +23,7 @@
   \vspace{2\parskip}%
   #1\par\nobreak}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def
index 9a2eee4a73a..4056084b29c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def
@@ -28,7 +28,7 @@ to\hsize{\if@RTLmain\beginR\fi\hfil\box\@tempboxa\hfil%
       \gdef\thelstlisting{\@arabic\c@lstlisting}
   \fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
index 4ee1e07497a..acb20581ea0 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
@@ -168,7 +168,7 @@
   \fi%
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def
index fbadba5032e..919b4845111 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def
@@ -20,7 +20,7 @@
     \endgraf\vskip\baselineskip}%
   \hss}}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
index 933132ac794..e1e68fa16aa 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/luatex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
@@ -14,7 +14,7 @@
 \input{footnote-luatex-bidi.def}
 
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def
index 2286747db37..5ebe743c842 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{memoir-xetex-bidi.def}[2010/07/25 v0.4 bidi adaptations for memoir class for XeTeX engine]
+\ProvidesFile{memoir-xetex-bidi.def}[2010/07/25 v0.5 bidi adaptations for memoir class for XeTeX engine]
 \renewcommand{\keepthetitle}{%
   \@bsmtitlempty
   \global\let\thanks\relax
@@ -160,8 +160,12 @@
     \@makecaption{\csname fnum@##1\endcsname}{\ignorespaces ##3}\par
   \endgroup}
 }}{}
+\renewenvironment{thebibliography}[1]{%
+  \bibsection
+  \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+  \begin{bibitemlist}{#1}}{\end{bibitemlist}\postbibhook}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def
index 2940b4355f2..f7118b3e8ca 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def
@@ -47,7 +47,7 @@
     \par}%
   \fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def
index b8bd151746f..eb4ff77f5fb 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def
@@ -155,7 +155,7 @@
         \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\@finalstrut\strutbox}%
     \color@endgroup}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def
index 14f2c086a1c..8e20d5f71ae 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def
@@ -57,7 +57,7 @@
   \AM@ClearShipoutPicture
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pgf-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def
index 1ec69559b88..7e2cc1c5009 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pgf-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def
@@ -14,7 +14,7 @@
 \def\pgfpicture{\ifmmode\else\LTR\fi\origin@pgfpicture}
 \def\endpgfpicture{\origin@endpgfpicture\ifmmode\else\endLTR\fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def
index b32ba381de0..018c964f0fb 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def
@@ -11,7 +11,7 @@
 \ProvidesFile{pstricks-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for pstricks package for XeTeX engine]
 \def\pspicture{\begingroup\ifmmode\else\@RTLfalse\fi\pst@ifstar\pst@picture}%
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def
index f24799afeb7..5087349d95b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def
@@ -95,7 +95,7 @@
 \def\RaggedLeft{\if@RTL\origin@RaggedRight\else\origin@RaggedLeft\fi}
 \def\RaggedRight{\if@RTL\origin@RaggedLeft\else\origin@RaggedRight\fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def
index 8d921bfcb4b..a2070d72781 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{rapport3-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for rapport3 class for XeTeX engine]
+\ProvidesFile{rapport3-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for rapport3 class for XeTeX engine]
 \if@titlepage
 \renewcommand*\TitleFont{\rmfamily}
 \renewcommand*\maketitle{%
@@ -236,8 +236,25 @@
   \ifnum\c@chapter>\z@\thechapter\@SepMark\fi\@arabic\c@table}
 \renewcommand*\theequation{%
   \ifnum \c@chapter>\z@ \thechapter\@SepMark\fi\@arabic\c@equation}
+\renewenvironment{thebibliography}[1]
+     {\chapter*{\bibname}%
+       \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
+      \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+      \list{\@biblabel{\@arabic\c@enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{#1}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+            \@openbib@code
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand*\theenumiv{\@arabic\c@enumiv}}%
+      \sloppy\clubpenalty4000\widowpenalty4000%
+      \sfcode`\.\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def
index 4bc24e8486c..7fe59ec59ce 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{refrep-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for refrep class for XeTeX engine]
+\ProvidesFile{refrep-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for refrep class for XeTeX engine]
 \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -141,8 +141,28 @@
 \renewcommand\thesubsubsection {\thesubsection \@SepMark\@arabic\c@subsubsection}
 \renewcommand\theparagraph     {\thesubsubsection\@SepMark\@arabic\c@paragraph}
 \renewcommand\thesubparagraph  {\theparagraph\@SepMark\@arabic\c@subparagraph}
+\renewenvironment{thebibliography}[1]
+     {\chapter*{\bibname
+         \@mkboth{\bibname}{\bibname}}%
+      \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+      \list{\@biblabel{\@arabic\c@enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{#1}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+            \@openbib@code
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+            \sloppy
+            \clubpenalty4000
+            \@clubpenalty \clubpenalty
+            \widowpenalty4000%
+      \sfcode`\.=\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def
index fd61108ff92..80469e27a86 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{report-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for standard report class for XeTeX engine]
+\ProvidesFile{report-xetex-bidi.def}[2010/07/25 v0.4 bidi adaptations for standard report class for XeTeX engine]
   \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -150,8 +150,28 @@
     \Huge \bfseries  #1\par\nobreak
     \vskip 40\p@
   }}
+\renewenvironment{thebibliography}[1]
+     {\chapter*{\bibname}%
+      \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
+      \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+      \list{\@biblabel{\@arabic\c@enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{#1}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+            \@openbib@code
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+      \sloppy
+      \clubpenalty4000
+      \@clubpenalty \clubpenalty
+      \widowpenalty4000%
+      \sfcode`\.\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
index 951f7541b56..a4e4aa6518b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrartcl-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrartcl class for XeTeX engine]
+\ProvidesFile{scrartcl-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for scrartcl class for XeTeX engine]
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
@@ -247,8 +247,72 @@
 \renewcommand*{\thesubparagraph}{%
   \theparagraph\@SepMark\@arabic\c@subparagraph
 }
+\renewenvironment{thebibliography}[1]{%
+  \if@bib@break@
+    \bib@beginhook
+  \else
+    \bib@heading
+    \ifx\bibpreamble\relax\else\ifx\bibpreamble\@empty\else
+        \noindent\bibpreamble\par\nobreak
+    \fi\fi
+    \bib@beginhook
+    \bib@before@hook
+  \fi
+  \renewcommand{\BreakBibliography}[1]{%
+    \@bib@break
+    \end{thebibliography}%
+    \begingroup ##1\endgroup
+    \begin{thebibliography}{#1}
+  }%
+  \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+  \list{%
+    \@biblabel{\@arabic\c@enumiv}%
+  }{%
+    \settowidth\labelwidth{\@biblabel{#1}}%
+    \leftmargin\labelwidth
+    \advance\leftmargin\labelsep
+    \@openbib@code
+    \if@bib@break@
+      \edef\@tempa{%
+        \noexpand\usecounter{enumiv}%
+        \noexpand\setcounter{enumiv}{\the\c@enumiv}%
+      }\@tempa
+      \no@bib@break
+    \else
+      \usecounter{enumiv}%
+    \fi
+    \let\p@enumiv\@empty
+    \renewcommand*\theenumiv{\@arabic\c@enumiv}%
+  }%
+  \sloppy\clubpenalty4000 \widowpenalty4000
+  \sfcode`\.=\@m
+}{%
+  \if@bib@break@
+    \def\@noitemerr{%
+      \@latex@warning{%
+        \string\BreakBibliography\space at begin of `thebibliography'
+        environment\MessageBreak
+        or following \string\BreakBibliography}%
+    }%
+  \else
+    \def\@noitemerr{%
+      \@latex@warning{%
+        Empty `thebibliography' environment or
+        \string\BreakBibliography\MessageBreak
+        before end of `thebibliography' environment}%
+    }%
+  \fi
+  \endlist
+  \if@bib@break@
+  \else
+    \bib@after@hook
+    \let\bib@before@hook\@empty
+    \let\bib@after@hook\@empty
+  \fi
+  \bib@endhook
+}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
index 8b5a7f83f4d..2958aa8872c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrbook-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrbook class for XeTeX engine]
+\ProvidesFile{scrbook-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for scrbook class for XeTeX engine]
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
@@ -303,8 +303,72 @@
   \fi
   \@arabic\c@equation
 }
+\renewenvironment{thebibliography}[1]{%
+  \if@bib@break@
+    \bib@beginhook
+  \else
+    \ifx\bibpreamble\relax\else\ifx\bibpreamble\@empty\else
+        \setchapterpreamble{\bibpreamble}%
+    \fi\fi
+    \bib@heading
+    \bib@beginhook
+    \bib@before@hook
+  \fi
+  \renewcommand{\BreakBibliography}[1]{%
+    \@bib@break
+    \end{thebibliography}%
+    \begingroup ##1\endgroup
+    \begin{thebibliography}{#1}
+  }%
+   \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+  \list{%
+    \@biblabel{\@arabic\c@enumiv}%
+  }{%
+    \settowidth\labelwidth{\@biblabel{#1}}%
+    \leftmargin\labelwidth
+    \advance\leftmargin\labelsep
+    \@openbib@code
+    \if@bib@break@
+      \edef\@tempa{%
+        \noexpand\usecounter{enumiv}%
+        \noexpand\setcounter{enumiv}{\the\c@enumiv}%
+      }\@tempa
+      \no@bib@break
+    \else
+      \usecounter{enumiv}%
+    \fi
+    \let\p@enumiv\@empty
+    \renewcommand*\theenumiv{\@arabic\c@enumiv}%
+  }%
+  \sloppy\clubpenalty4000 \widowpenalty4000
+  \sfcode`\.=\@m
+}{%
+  \if@bib@break@
+    \def\@noitemerr{%
+      \@latex@warning{%
+        \string\BreakBibliography\space at begin of `thebibliography'
+        environment\MessageBreak
+        or following \string\BreakBibliography}%
+    }%
+  \else
+    \def\@noitemerr{%
+      \@latex@warning{%
+        Empty `thebibliography' environment or
+        \string\BreakBibliography\MessageBreak
+        before end of `thebibliography' environment}%
+    }%
+  \fi
+  \endlist
+  \if@bib@break@
+  \else
+    \bib@after@hook
+    \let\bib@before@hook\@empty
+    \let\bib@after@hook\@empty
+  \fi
+  \bib@endhook
+}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
index efe0fa29c24..448725d879d 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrreprt-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrreprt class for XeTeX engine]
+\ProvidesFile{scrreprt-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for scrreprt class for XeTeX engine]
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
@@ -260,8 +260,72 @@
   \thechapter\@SepMark%
   \@arabic\c@equation
 }
+\renewenvironment{thebibliography}[1]{%
+  \if@bib@break@
+    \bib@beginhook
+  \else
+    \ifx\bibpreamble\relax\else\ifx\bibpreamble\@empty\else
+        \setchapterpreamble{\bibpreamble}%
+    \fi\fi
+    \bib@heading
+    \bib@beginhook
+    \bib@before@hook
+  \fi
+  \renewcommand{\BreakBibliography}[1]{%
+    \@bib@break
+    \end{thebibliography}%
+    \begingroup ##1\endgroup
+    \begin{thebibliography}{#1}
+  }%
+  \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
+  \list{%
+    \@biblabel{\@arabic\c@enumiv}%
+  }{%
+    \settowidth\labelwidth{\@biblabel{#1}}%
+    \leftmargin\labelwidth
+    \advance\leftmargin\labelsep
+    \@openbib@code
+    \if@bib@break@
+      \edef\@tempa{%
+        \noexpand\usecounter{enumiv}%
+        \noexpand\setcounter{enumiv}{\the\c@enumiv}%
+      }\@tempa
+      \no@bib@break
+    \else
+      \usecounter{enumiv}%
+    \fi
+    \let\p@enumiv\@empty
+    \renewcommand*\theenumiv{\@arabic\c@enumiv}%
+  }%
+  \sloppy\clubpenalty4000 \widowpenalty4000
+  \sfcode`\.=\@m
+}{%
+  \if@bib@break@
+    \def\@noitemerr{%
+      \@latex@warning{%
+        \string\BreakBibliography\space at begin of `thebibliography'
+        environment\MessageBreak
+        or following \string\BreakBibliography}%
+    }%
+  \else
+    \def\@noitemerr{%
+      \@latex@warning{%
+        Empty `thebibliography' environment or
+        \string\BreakBibliography\MessageBreak
+        before end of `thebibliography' environment}%
+    }%
+  \fi
+  \endlist
+  \if@bib@break@
+  \else
+    \bib@after@hook
+    \let\bib@before@hook\@empty
+    \let\bib@after@hook\@empty
+  \fi
+  \bib@endhook
+}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def
index d64969296fe..7e4d06435de 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def
@@ -36,7 +36,7 @@
   \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
     \@preamble}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def
index 24dda09a62a..99520624782 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def
@@ -14,7 +14,7 @@
 \let\p@subtable=\thetable%
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def
index c0913650d74..4cfdbca3f34 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def
@@ -44,7 +44,7 @@
  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
  \@preamble}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def
index 83a57ae8eb1..45b04a916f5 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def
@@ -39,7 +39,7 @@
    \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi
      \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tikz-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def
index dce434239c2..88e5703bed6 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tikz-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def
@@ -14,7 +14,7 @@
 \def\tikzpicture{\ifmmode\else\LTR\fi\origin@tikzpicture}
 \def\endtikzpicture{\origin@endtikzpicture\ifmmode\else\endLTR\fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def
index 152dd4df373..f402763acc8 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def
@@ -39,7 +39,7 @@
 
 \fi
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def
index 7e040da4025..3b51747c23e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def
@@ -316,7 +316,7 @@
    \if@RTL\leftskip\else\rightskip\fi \@tocrmarg\relax
    \textit{#1}\protect\par}}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def
index 9bb376df52c..75006caf275 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def
@@ -255,7 +255,7 @@
   \@tempa
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def
index b35f7733e31..efda5dd6e15 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def
@@ -85,7 +85,7 @@
   \aftergroup\WF@startwrapping % after the \endgroup which immediately follows
 \fi}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def
index 3a33bbb25de..c37085811e5 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def
@@ -111,7 +111,7 @@
  {\color@b@x{\fboxsep\z@\bidicolor#1{#2}\XC@fbox}%
    {\@ifxempty{#3}{\bidicolor#1}{\bidicolor#3}{#4}}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index 831687a69f2..ac88ad5f224 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -21,10 +21,10 @@
 \def\moreLRE{\bracetext \aftergroup\endL \beginL\@RTLfalse}
 \def\moreRLE{\bracetext \aftergroup\endR \beginR\@RTLtrue}
 \def\lr#1{\begingroup\beginL\rmfamily#1\endL\endgroup}
-\def\LTR{\bgroup\par\@RTLfalse\@RTL@footnotefalse}
-\def\endLTR{\par\egroup}
-\def\RTL{\bgroup\par\@RTLtrue\@RTL@footnotetrue}
-\def\endRTL{\par\egroup}
+\def\LTR{\par\@RTLfalse\@RTL@footnotefalse\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}
@@ -65,6 +65,9 @@
 \def\SepMark#1{\gdef\@SepMark{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
 \SepMark{.}
 \def\@thmcountersep{\@SepMark}
+\def\setRTLbibitems{\@RTLbibitemstrue\@LTRbibitemsfalse}
+\def\setLTRbibitems{\@LTRbibitemstrue\@RTLbibitemsfalse}
+\def\setdefaultbibitems{\@RTLbibitemsfalse\@LTRbibitemsfalse}
 \def\list#1#2{%
   \ifnum \@listdepth >5\relax
     \@toodeep
@@ -91,6 +94,18 @@
   \fi
   \parshape \@ne \@totalleftmargin \linewidth
   \ignorespaces}
+\newenvironment{LTRitems}[1][\labelsep]
+                 {\par\@RTLfalse
+                  \leftskip\labelwidth
+                  \advance\leftskip #1
+                  \advance\rightskip -\leftmargin
+                  \ignorespaces}{\endtrivlist}
+\newenvironment{RTLitems}[1][\labelsep]
+                 {\par\@RTLtrue
+                  \rightskip\labelwidth
+                  \advance\rightskip #1
+                  \advance\leftskip -\leftmargin
+                  \ignorespaces}{\endtrivlist}
 \def\raggedright{%
   \let\\\@centercr
   \leftskip\z@skip\rightskip\@flushglue
@@ -284,14 +299,21 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
     \kern -\@pagedp
     \nointerlineskip
     \hb@xt@\columnwidth
-      {\if@RTL\beginR\fi\ifnum \@tempcnta >\z@
+      {\if@RTL\if@LTRmarginpar\beginL\else\beginR\fi\else\if@RTLmarginpar\beginR\else\beginL\fi\fi\ifnum \@tempcnta >\z@
           \hskip\columnwidth \hskip\marginparsep
        \else
           \hskip -\marginparsep \hskip -\marginparwidth
        \fi
-       \box\@marbox \hss\if@RTL\endR\fi}%
+       \box\@marbox \hss\if@RTL\if@LTRmarginpar\endL\else\endR\fi\else\if@RTLmarginpar\endR\else\endL\fi\fi}%
     \nointerlineskip
     \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}}
+\long\def\@ympar#1{%
+  \@savemarbox\@marbox{\if@RTL\if@LTRmarginpar\@RTLfalse\else\@RTLtrue\fi\else\if@RTLmarginpar\@RTLtrue\else\@RTLfalse\fi\fi#1}%
+  \global\setbox\@currbox\copy\@marbox
+  \@xympar}
+\def\setRTLmarginpar{\@RTLmarginpartrue\@LTRmarginparfalse}
+\def\setLTRmarginpar{\@LTRmarginpartrue\@RTLmarginparfalse}
+\def\setdefaultmarginpar{\@RTLmarginparfalse\@LTRmarginparfalse}
 \def\@stopline{\unskip\@stopfield\if@rjfield \global\@rjfieldfalse
    \@tempdima\@totalleftmargin \advance\@tempdima\linewidth
 \hbox to\@tempdima{\if@RTL\beginR\fi\@itemfudge\hskip\dimen\@curtabmar
@@ -370,8 +392,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
     \hb@xt@\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}%
   \fi
   \vskip\belowcaptionskip}
-\def\equation{\beginL$$\refstepcounter{equation}}
-\def\endequation{\eqno \hbox{\@eqnnum}$$\endL\@ignoretrue}
+\everydisplay{\predisplaydirection=0}
 \def\@eqnnum{{\normalfont \normalcolor \if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
 \input{footnote-xetex-bidi.def}
 \@iftagsloaded{leqno}{\input{leqno-xetex-bidi.def}}{}
@@ -425,7 +446,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 
 
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def
index fbef2973005..860b89b917a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def
@@ -14,7 +14,7 @@
 \let\@@XeLaTeX\XeLaTeX
 \def\XeLaTeX{\@ensure@LTR{\@@XeLaTeX}}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 84b4547f27e..6ac8ccad0c4 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -735,7 +735,6 @@ $standarddest = "texmf-dist";
  'arrayjob',	'generic',
  'barr',	'generic',
  'bghyphen',	'generic',
- 'bidi',	'xelatex',
  'circ',	'latex',
  'cirth',	'generic',
  'dehyph-exptl','generic',
@@ -1009,7 +1008,6 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'bghyphen',		'generic',
  'bib-fr',		'bibtex',
  'bibhtml',		'bibtex',
- 'bidi',		'xelatex',
  'blacklettert1',	'fonts',
  'boisik',		'fonts',
  'cbfonts',		'fonts',
@@ -1213,7 +1211,6 @@ $standarddocfmt='latex';
  'archaic',	'fonts',
  'arev',	'fonts',
  'arrayjob',	'generic',
- 'bidi',	'xelatex',
  'blacklettert1','fonts',
  'blockdraw_mp','metapost',
  'cb',		'fonts',
diff --git a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
index bc0139bdda4..16901820079 100644
--- a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
@@ -3,6 +3,7 @@ shortdesc Arabic
 longdesc Support for typesetting Arabic.
 depend arabi
 depend arabtex
+depend bidi
 depend hyphen-arabic
 depend hyphen-farsi
 depend persian-bib
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index 57f81b3b9bf..ce4211d532c 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -4,7 +4,6 @@ longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
 longdesc http://scripts.sil.org/xetex.
 depend arabxetex
 depend euenc
-depend bidi
 depend fontspec
 depend fontwrap
 depend harvardkyoto