bidi update (5apr10)

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

94 files changed, 2275 insertions, 1125 deletions

diff --git a/Master/texmf-dist/doc/xelatex/bidi/README b/Master/texmf-dist/doc/xelatex/bidi/README
index f33ff8852d9..e81b5d56b1f 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/README
+++ b/Master/texmf-dist/doc/xelatex/bidi/README
@@ -1,19 +1,17 @@
 _________________
 The bidi package
-v1.0.4
+v1.0.5
 
 This package provides a convenient interface for typesetting
 bidirectional texts with XeLaTeX.
 
-This version fixes all the bugs that were present in v1.0.3 and in
-addition it provides new features explained in the documentation. 
-The support for bidibeamer and bidimoderncv is removed in this version
-and it will be back in version 1.0.5 (hopefully ready for MiKTeX 2.9 
-and TeXLive 2010).
-
+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
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf
index a1623eab8f4..a1745aaf9d5 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.tex b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.tex
index f7d3bdb3034..e4f6815b678 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.tex
@@ -1,12 +1,9 @@
-\documentclass{article}
-\usepackage{fontspec}
+\documentclass{artikel3}
 \usepackage{calc}
 \usepackage{pifont}
 \usepackage{bbding}
-\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
 \usepackage[colorlinks=true,linkcolor=mybrown,urlcolor=mygreen]{hyperref}
 \usepackage{bidicode}
-\usepackage{bidi}
 \newcounter{local}
 \renewcommand\theenumi{\protect\setcounter{local}%
   {201+\the\value{enumi}}\protect\ding{\value{local}}}
@@ -18,41 +15,31 @@
 \definecolor{mybrown}{rgb}{.6,0,0}
 \definecolor{mygreen}{rgb}{0,.43,0}
 \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.4}
+\date{Version 1.0.5}
 \begin{document}
 \maketitle
 \tableofcontents
-\lstlistoflistings
 \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.
 
-The \textsf{bidi} package at the moment only works with \XeTeX\ engine, but we will support Lua\TeX\ engine as well in our next release.
+The \textsf{bidi} package at the moment only works with  \XeTeX\  engine, 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{center}
-\colorbox{lightgray}{\begin{minipage}{0.9\textwidth}\ttfamily
-bidi package (Support for bidirectional typesetting with XeLaTeX)\\
-Description: A convenient interface for typesetting bidirectional\\
-texts with XeLaTeX.  The package includes adaptations for use\\
-with many other commonly-used packages.\\
-Copyright © 2009-2010 Vafa Khalighi\\
-\bidiversion, <\bidirevision>, \bididate\\
-License: LaTeX Project Public License, version 1.3c or higher (your choice)\\
-Home: http://bidi.berlios.de\\
+\begin{lstlisting}[numbers=none,backgroundcolor=\color{skugga}]
+bidi package (Support for bidirectional typesetting with XeLaTeX and LuaLaTeX)
+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
+License: LaTeX Project Public License, version 1.3c or higher (your choice)
+Home: http://bidi.berlios.de
 Location on CTAN: /macros/xetex/latex/bidi
-\end{minipage}}
-\end{center}
-\subsection{PDF Creator of \textsf{bidi} Documents}
-If you use \textsf{bidi} package to produce a PDF file, the \textsf{bidi} package writes itself to the Application field of the PDF file and hyperref would have no effect since this is done at the beggining of the document. Thus if you produce a PDF file using the \textsf{bidi} package and then you look at the application field in the properties of the PDF file, you will see this:
-
-\begin{center}
-\colorbox{yellow}{\begin{minipage}{0.6\textwidth}%
-Bidi \bidiversion\ <\bidirevision> Copyright © 2009-2010 Vafa Khalighi
-\end{minipage}}
-\end{center}
-Check out the properties of this document to verify this.
+\end{lstlisting}
 \section{Basics}
 \subsection{Loading The Package}
 You can load the package in the ordinary way;
@@ -63,13 +50,13 @@ Where \texttt{options} of the package are explained later in \autoref{options}.
 
 When loading the package, it is important to know that:
 \begin{enumerate}
-\item \textsf{bidi} should be the last package that you loade, because otherwise you are certainly going to overwrite \textsf{bidi}'s definitions and consequently, you will not get the expected output.
+\item \textsf{bidi} should be the last package that you load, because otherwise you are certainly going to overwrite \textsf{bidi}'s definitions and consequently, you will not get the expected output.
 \item In fact, \textsf{bidi} makes sure that some specific packages are loaded before \textsf{bidi}; these are those packages that \textsf{bidi} modifies them for bidirectional typesetting. 
 
 If you load \textsf{bidi} before any of these packages, then you will get an error saying that you should load \textsf{bidi} as your last package.
 
 For instance, consider the following minimal example:
-\begin{lstlisting}[caption={Wrong Order Of Loading \textsf{bidi} Package},captionpos=t]
+\begin{lstlisting}
 \documentclass{minimal}
 \usepackage{bidi}
 \usepackage{graphicx}
@@ -78,7 +65,7 @@ This is just a test.
 \end{document}
 \end{lstlisting}
 Where \textsf{graphicx} is loaded after \textsf{bidi}. If you run \texttt{xelatex} on this document, you will get an error which looks like this:
-\begin{lstlisting}[numbers=none]
+\begin{lstlisting}[numbers=none,backgroundcolor=\color{skugga}]
 ! Package bidi Error: Oops! you have loaded package graphicx after bidi package
 . Please load package graphicx before bidi package, and then try to run xelatex
  on your document again.
@@ -102,7 +89,7 @@ l.4 \begin{document}
 \item \Lcs{bidirevision} gives the current subversion revision of the package.
 \item \Lcs{bididate} gives the current date of the package.
 \end{itemize}
-\begin{lstlisting}[morekeywords={bidiversion,bidirevision,bididate},captionpos=t,caption={Version, SVN Revision and Date Commands}]
+\begin{lstlisting}[morekeywords={bidiversion,bidirevision,bididate}]
 \documentclass{article}
 \usepackage{bidi}
 \begin{document}
@@ -122,15 +109,19 @@ It is clear that if you do not pass any of these options to the package, you wil
 \item With any of the commands in the first row, you can typeset LTR paragraphs.
 \item With any of the commands in the second row, you can typeset RTL paragraphs.
 \end{itemize}
-\begin{lstlisting}[morekeywords={setRTL,setLTR},captionpos=t,caption={Paragraph Direction Switching}]
+\begin{lstlisting}
 \documentclass{article}
 \usepackage{bidi}
 \begin{document}
 \setRTL%
-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 jewel embossed on the front cover.
+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 jewel embossed on the front cover.
 
 \setLTR% Notice the blank line before \setLTR
-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 jewel embossed on the front cover.
+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 jewel embossed on the front cover.
 \end{document}
 \end{lstlisting}
 \subsection{Pargraph Switching Environments}
@@ -142,14 +133,18 @@ Anyone who reads Old and Middle English literary texts will be familiar with the
 \item With \texttt{LTR} environment, you can typeset LTR paragraphs.
 \item With \texttt{RTL} environment, you can typeset RTL paragraphs.
 \end{itemize}
-\begin{lstlisting}[captionpos=t,caption={\texttt{RTL} and \texttt{LTR} Environments}]
+\begin{lstlisting}
 \documentclass{article}
 \usepackage{bidi}
 \begin{document}
 \begin{RTL}
-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 jewel embossed on the front cover.
+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 jewel embossed on the front cover.
 \begin{LTR}
-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 jewel embossed on the front cover.
+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 jewel embossed on the front cover.
 \end{LTR}
 And we are still typesetting RTL.
 \end{RTL}
@@ -164,20 +159,26 @@ And we are still typesetting RTL.
 \item With any of the commands in the first row, you can typeset short LTR text inside RTL paragraphs.
 \item With any of the commands in the second row, you can typeset short RTL text inside LTR paragraphs.
 \end{itemize}
-\begin{lstlisting}[morekeywords={LRE,RLE},captionpos=t,caption={Typesetting Short LTR and RTL texts}]
+\begin{lstlisting}
 \begin{document}
 \begin{RTL}
-Anyone who reads Old and Middle English \LRE{Short LTR text} literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's jewel embossed on the front cover.
+Anyone who reads Old and Middle English \LRE{Short LTR text} literary texts will be familiar
+ with the mid-brown volumes of the EETS, with the symbol
+ of Alfred's jewel embossed on the front cover.
 \begin{LTR}
-Anyone who reads Old and Middle English \RLE{Short RTL text} literary texts will be familiar with the mid-brown volumes of the EETS, with the symbol of Alfred's jewel embossed on the front cover.
+Anyone who reads Old and Middle English \RLE{Short RTL text} literary texts will be familiar
+ with the mid-brown volumes of the EETS, with the symbol
+ of Alfred's jewel embossed on the front cover.
 \end{LTR}
 \end{RTL}
 \end{document}
 \end{lstlisting}
 \subsection{Footnotes}
 \begin{BDef}
-\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{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{thanks}\Largb{\Larga{text}}\quad\Lcs{LTRthanks}\Largb{\Larga{text}}\quad\Lcs{RTLthanks}\Largb{\Larga{text}}
 \end{BDef}
 \begin{itemize}
@@ -191,7 +192,8 @@ Anyone who reads Old and Middle English \RLE{Short RTL text} literary texts will
 \item \Lcs{RTLthanks} (to be used only inside \Lcs{author} or \Lcs{title} argument) will always produce an RTL footnote, independent on the current mode.
 \end{itemize}
 \begin{BDef}
-\Lcs{footnotetext}\OptArg{num}\Largb{\Larga{text}}\quad\Lcs{LTRfootnotetext}\OptArg{num}\Largb{\Larga{text}}\quad\Lcs{RTLfootnotetext}\OptArg{num}\Largb{\Larga{text}}
+\Lcs{footnotetext}\OptArg{num}\Largb{\Larga{text}}\quad\Lcs{LTRfootnotetext}\OptArg{num}\Largb{\Larga{text}}\\
+\Lcs{RTLfootnotetext}\OptArg{num}\Largb{\Larga{text}}
 \end{BDef}
 \begin{itemize}
 \item \Lcs{footnotetext} used in conjunction with \Lcs{footnotemark},  in RTL mode produces an RTL footnote while in LTR mode it produces an LTR footnote.
@@ -218,10 +220,10 @@ 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={setRTL,rcases,text},captionpos=t,caption={RTL Cases}]
+\begin{lstlisting}[morekeywords={rcases,text}]
 \documentclass{article}
 \usepackage{amsmath}
 \usepackage{bidi}
@@ -242,7 +244,7 @@ If you pass the \texttt{twocolumn} option to the class file and if the main dire
 \Lcs{SepMark}\Largb{\Larga{mark}}\quad\Lcs{@SepMark}
 \end{BDef}
 Generally in Standard \LaTeX, dot is used for separation between section numbers, equation numbers any anything else which needs to be seperated. You can use \Lcs{SepMark} to use any other mark as the seperation mark instead a dot.
-\begin{lstlisting}[morekeywords={SepMark,subsection,subsubsection},captionpos=t,caption={Using A Dash Instead A Dot For Seperation Marks}]
+\begin{lstlisting}[morekeywords={SepMark,subsection,subsubsection}]
 \documentclass{article}
 \usepackage{bidi}
 \SepMark{-}
@@ -255,7 +257,7 @@ Generally in Standard \LaTeX, dot is used for separation between section numbers
 
 If you decide to change the numbering of chapters, sections, subsections, equations, figures and \ldots, you should either load \textsf{amsmath} package and use \Lcs{numberwithin} macro to do this or do the ordinary way, but instead dot write \Lcs{@SepMark}. Using dot instead \Lcs{@SepMark} will certainly make trouble.
 
-\begin{lstlisting}[morekeywords={SepMark,theequation,thesection},captionpos=t,caption={Redefining \Lcs{theequation}}]
+\begin{lstlisting}[morekeywords={theequation,thesection,SepMark}]
 \documentclass{article}
 \usepackage{bidi}
 \SepMark{-}
@@ -273,14 +275,12 @@ x^2+y^2=z^2
 \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{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.
-
-Please note that if you would like to define any page style for headers and footers such as \Lcs{pagestyle}\Largb{headings}, you should do it after loading \textsf{bidi} package because \textsf{bidi} for proper direction typesetting of headers and footers redefines page styles for headers and footers and so if you change your headers and footers before loading \textsf{bidi} package, your definitions for headers and footers would have no effect at all.
 \subsection{Tabular Typesetting}
 In RTL mode, tabular are typeset RTL and in LTR mode, tabular are typeset LTR. 
 \subsection{Equation Numbers}
 For \texttt{reqno}, equation numbers are on the right hand side and for \texttt{leqno}, equation numbers are on the left hand side, independent on the current mode.
 \section{Support For Various Packages and Classes}
-The \textsf{bidi} package supports \textsf{amsmath}, \textsf{amsthm}, \textsf{array}, \textsf{arydshln}, \textsf{breqn}, \textsf{color}, \textsf{colortbl}, \textsf{draftwatermark}, \textsf{fancyhdr}, \textsf{flowfram}, \textsf{graphicx}, \textsf{hyperref}, \textsf{listings}, \textsf{minitoc}, \textsf{multicol}, \textsf{pdfpages}, \textsf{pstricks}, \textsf{ragged2e}, \textsf{stabular}, \textsf{supertabular}, \textsf{xtab}, \textsf{tabls}, \textsf{tabulary}, \textsf{PGF \&\ TIKZ}, \textsf{tocbibind}, \textsf{tocloft}, \textsf{tocstyle}, \textsf{wrapfig}, \textsf{xcolor}, \textsf{xltxtra} packages, \textsf{amsart}, \textsf{amsbook}, \textsf{standrad article}, \textsf{standard book}, \textsf{bookest}, \textsf{extbook}, \textsf{standard letter}, \textsf{memoir}, \textsf{rapport3}, \textsf{refrep}, \textsf{standard report}, \textsf{scartcl}, \textsf{scrbook}, \textsf{scrreprt} classes and any other packages and classes that relies on these packages and classes. This means, you can use all these packages and classes in addition to other packages and classes that rely on these packages and classes and use their functionality fully for your bidirectional documents. 
+The \textsf{bidi} package supports \textsf{amsmath}, \textsf{amsthm}, \textsf{array}, \textsf{arydshln}, \textsf{breqn}, \textsf{caption}, \textsf{color}, \textsf{colortbl}, \textsf{draftwatermark}, \textsf{fancyhdr}, \textsf{flowfram}, \textsf{graphicx}, \textsf{hyperref}, \textsf{listings}, \textsf{minitoc}, \textsf{multicol}, \textsf{pdfpages}, \textsf{pstricks}, \textsf{ragged2e}, \textsf{stabular}, \textsf{subfigure}, \textsf{supertabular}, \textsf{xtab}, \textsf{tabls}, \textsf{tabulary}, \textsf{PGF \&\ TIKZ}, \textsf{tocbibind}, \textsf{tocloft}, \textsf{tocstyle}, \textsf{wrapfig}, \textsf{xcolor}, \textsf{xltxtra} packages, \textsf{amsart}, \textsf{amsbook}, \textsf{standrad article}, \textsf{standard book}, \textsf{bookest}, \textsf{extbook}, \textsf{standard letter}, \textsf{memoir}, \textsf{rapport3}, \textsf{refrep}, \textsf{standard report}, \textsf{scartcl}, \textsf{scrbook}, \textsf{scrreprt} classes and any other packages and classes that relies on these packages and classes. This means, you can use all these packages and classes in addition to other packages and classes that rely on these packages and classes and use their functionality fully for your bidirectional documents. 
 
 We now give some details that you should know about the supported packages or classes.
 \subsection{Color}
@@ -292,8 +292,7 @@ For having coloured tabular, you can use \textsf{colortbl} package.
 \subsection{Hyperref}
 The \textsf{hyperref} package works fine with bidirectional documents if and only if, your link will not span more than a line. If your link spans more than a line, then your whole document, or page or paragraph may be linked.
 
-\subsection{\textsf{fancyhdr} Package}
-When using \textsf{fancyhdr} package, any commands of \textsf{fancyhdr} package such as \Lcs{pagestyle}\Largb{fancy}, should be done after loading \textsf{bidi} package.
+
 \subsection{\textsf{flowfram} Package}
 You can use \textsf{flowfram} package for your bidirectional documents. Please note that \textsf{flowfram} package provides support for bidirectional column typesetting, for details, see its manual.
 \subsection{Multicolumn Typesetting}
@@ -330,6 +329,8 @@ If you need to change the default distance between two verses, you can do just t
 \ldots\\
 \LEND{traditionalpoem*}
 \end{BDef}
+\subsection{Typesetting Resum\'e}
+The \textsf{bidi} package provides \textsf{bidimoderncv}\footnote{This class is the modified version of \textsf{moderncv} class.} class for typesetting resum\'es. There are two examples, namely \texttt{test-casualcv.tex} and \texttt{test-classiccv.tex}, in the \textsf{doc} folder than you can look and learn how you can use it.
 \subsection{Print Two Pages On A Single Page}
 \textsf{bidi} package provides \textsf{bidi2in1} package  for printing two pages on a single (landscape) A4 page. Page numbers appear on the included pages, and not on the landscape 'container' page.
 
@@ -356,7 +357,7 @@ The class is used with
         article class will be appropriate for a presentation class, e. g. twocolumn.
 
 A simple example document:
-\begin{lstlisting}[caption={\textsf{bidipresentation} Sample},morekeywords={AddToShipoutPicture,includegraphics,distance}]
+\begin{lstlisting}[morekeywords={AddToShipoutPicture,includegraphics,distance}]
  \documentclass[12pt]{bidipresentation}
  \usepackage{eso-pic}
  \usepackage[RTLdocument]{bidi}
@@ -433,12 +434,14 @@ If the main direction of the document is RTL, \Lcs{if@RTLmain} is true and if th
 \Lcs{if@Latin} inside any environment that uses Latin font is true and inside any environment that uses RTL font is false.
 \subsection{Tags Internal Macro}
 \begin{BDef}
-\Lcs{@iftagsloaded}\Largb{\Larga{tags name}}\Largb{\Larga{do thing(s) if the tag is loaded}}\Largb{\Larga{do thing(s) if the tag is not loaded}}
+\Lcs{@iftagsloaded}\Largb{\Larga{tags name}}\Largb{\Larga{do thing(s) if the tag is loaded}}\\
+\Largb{\Larga{do thing(s) if the tag is not loaded}}
 \end{BDef}
 As you can see, the syntax of \Lcs{@iftagsloaded} is exactly the same as the syntax of \Lcs{@ifpackageloaded} and \Lcs{@ifclassloaded}. By tags, we mean things like \texttt{leqno} or \texttt{reqno}. Please note that in the argument \Larga{tags name}, the extension \texttt{clo} should not be given.
 \subsection{Definition File Loaded Internal Macro}
 \begin{BDef}
-\Lcs{@ifdefinitionfileloaded}\Largb{\Larga{definition file name}}\Largb{\Larga{do thing(s) if the definition file is loaded}}\\
+\Lcs{@ifdefinitionfileloaded}\Largb{\Larga{definition file name}}\\
+\Largb{\Larga{do thing(s) if the definition file is loaded}}\\
 \Largb{\Larga{do thing(s) if the definition file  is not loaded}}
 \end{BDef}
 As you can see, the syntax of \Lcs{@ifdefinitionfileloaded} is exactly the same as the syntax of \Lcs{@ifpackageloaded} and \Lcs{@ifclassloaded}. By definition file, we mean things like \texttt{hyperref-bidi.def} or \texttt{wrapfig-bidi.def}. Please note that in the argument \Larga{definition file name}, the extension \texttt{def} should not be given.
@@ -454,7 +457,8 @@ If the tabular is typeset RTL, \Lcs{if@RTLtab} is true and if the tabular is typ
 When footnotes are typeset RTL, \Lcs{if@RTL@footnote} is true and when footnotes are typeset LTR, \Lcs{if@RTL@footnote} is false.
 \subsection{Direction Ensuring Macros}
 \begin{BDef}
-\Lcs{@ensure@RTL}\Largb{\Larga{text}}\quad\Lcs{@ensure@RL}\Largb{\Larga{text}}\quad\Lcs{@ensure@LTR}\Largb{\Larga{text}}\quad\Lcs{@ensure@LR}\Largb{\Larga{text}}\\
+\Lcs{@ensure@RTL}\Largb{\Larga{text}}\quad\Lcs{@ensure@RL}\Largb{\Larga{text}}\quad\Lcs{@ensure@LTR}\Largb{\Larga{text}}\\
+\Lcs{@ensure@LR}\Largb{\Larga{text}}\quad
 \Lcs{@ensure@dir}\Largb{\Larga{text}}\quad\Lcs{@ensure@maindir}\Largb{\Larga{text}}
 \end{BDef}
 \begin{itemize}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.pdf
new file mode 100644
index 00000000000..a4bb1e0d994
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.pdf
new file mode 100644
index 00000000000..4961db4e01a
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/picture.jpg b/Master/texmf-dist/doc/xelatex/bidi/picture.jpg
new file mode 100644
index 00000000000..ef48e69ce85
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/picture.jpg
diff --git a/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.pdf b/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.pdf
new file mode 100644
index 00000000000..a8dd715930a
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex b/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex
index b7464609633..e562e9d83e9 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex
@@ -1,13 +1,9 @@
 \documentclass[12pt,twoside]{bidipresentation}
-\usepackage{eso-pic}
-\usepackage{graphicx}
 \usepackage{fontspec}
 \setmainfont[Script=Arabic,Mapping=farsidigits]{XB Niloofar}
 \usepackage[RTLdocument]{bidi}
 \pagestyle{pres}
-\AddToShipoutPicture{
-\includegraphics{gradient.png}
-}
+
 
 \begin{document}
 \begin{titlepage}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.pdf
new file mode 100644
index 00000000000..5a250e1d019
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.tex b/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.tex
new file mode 100644
index 00000000000..a19c6994bd1
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-arydshln.tex
@@ -0,0 +1,27 @@
+\documentclass{article}
+\usepackage{arydshln}
+\usepackage{bidi}
+\title{Testing \textsf{arydshln} Package in LTR and RTL modes}
+\author{}
+\date{}
+\begin{document}
+\maketitle
+\section{LTR Mode}
+\begin{center}
+\begin{tabular}{|l::c;{2pt/2pt}r|}\hline
+A&B&C\\\hdashline[1pt/1pt]
+AAA&BBB&CCC\\\cdashline{1-2}[.4pt/1pt]
+\multicolumn{2}{|l;{2pt/2pt}}{AB}&C\\\hdashline\hdashline
+\end{tabular}
+\end{center}
+\section{RTL Mode}
+\begin{RTL}
+\begin{center}
+\begin{tabular}{|r::c;{2pt/2pt}l|}\hline
+A&B&C\\\hdashline[1pt/1pt]
+AAA&BBB&CCC\\\cdashline{1-2}[.4pt/1pt]
+\multicolumn{2}{|r;{2pt/2pt}}{AB}&C\\\hdashline\hdashline
+\end{tabular}
+\end{center}
+\end{RTL}
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-bidi.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-bidi.pdf
new file mode 100644
index 00000000000..7f2a8336f4f
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-bidi.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-brochure.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-brochure.pdf
new file mode 100644
index 00000000000..42956be42c8
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-brochure.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-brochure.tex b/Master/texmf-dist/doc/xelatex/bidi/test-brochure.tex
new file mode 100644
index 00000000000..3066e0e4b41
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-brochure.tex
@@ -0,0 +1,360 @@
+\documentclass[a4paper]{report}
+
+\usepackage[landscape,margin=1in]{geometry}
+\usepackage{color}
+\usepackage[RL]{flowfram}% we enable `RL' option for RTL multicolumn typesetting (see flowfram package documentation)
+\usepackage[colorlinks,setpagesize=false]{hyperref}
+
+\usepackage[RTLdocument]{bidi}
+% adjust \textheight so that it is an integer multiple of
+% \baselineskip
+\adjustheight{\textheight}
+
+% set up pagelayout. One column for title page
+% two columns for the rest.
+\onecolumninarea[1,2]{0.6\textwidth}{\textheight}{0.4\textwidth}{0pt}
+\twocolumninarea[>2]{0.6\textwidth}{\textheight}{0.4\textwidth}{0pt}
+
+% Set up dynamic frame on the left. This is where
+% the headings will go.
+
+\newdynamicframe{0.4\textwidth}{\textheight}{0pt}{0pt}[left]
+
+% put the chapter headings in this frame
+\dfchaphead*{left}
+% Modify the default style
+\renewcommand{\DFchapterstyle}[1]{%
+\raggedright\Huge\slshape\MakeUppercase{#1}\par}
+
+% Make static frames for background (only for page 1)
+\vtwotone[1]{0.6\paperwidth}{[cmyk]{0.65,0.13,0,0}}{backleft}%
+{0.4\paperwidth}{[cmyk]{0.94,0.54,0,0}}{backright}
+
+% Make a border along the top of each page
+\vtwotonetop{1cm}{0.6\paperwidth}{[cmyk]{0.65,0.13,0,0}}{topleft}%
+{0.4\paperwidth}{[cmyk]{0.94,0.54,0,0}}{topright}
+
+% make a static frame for the logo
+\newstaticframe{0.2\textwidth}{0.25\textheight}{0pt}{0pt}[logo]
+
+% empty page style, because I am going to make my own
+\pagestyle{empty}
+
+% Each new chapter sets \thispagestyle{\chapterfirstpagestyle}, change this empty as well
+\renewcommand{\chapterfirstpagestyle}{empty} 
+
+% Now make a frame in which to put my own customized footer
+\newdynamicframe[>1]{\textwidth}{\headheight}{0pt}{-\footskip}[footer]
+
+% set the contents of the frame:
+\setdynamiccontents*{footer}{%
+School of Computing Sciences, University of East Anglia\hfill
+http://www.cmp.uea.ac.uk/\hfill
+page \thepage\ of \pageref*{lastpage}}
+
+
+\newcommand{\env}[1]{\texttt{#1}}
+\newcommand{\cmdname}[1]{\texttt{\symbol{92}#1}}
+\newcommand{\meta}[1]{\textnormal{\textless\textit{#1}\textgreater}}
+
+\begin{document}
+
+% not a very interesting logo
+\setstaticcontents*{logo}{\sffamily{\Huge\slshape FLF} Flowfram}
+
+{\noindent
+\slshape\Huge\MakeUppercase{A Sample Brochure}\par
+\vskip0.5in
+\noindent\large\MakeUppercase{Nicola Talbot}\\
+}
+
+
+\chapter{Introduction}
+
+The \textsl{flowfram} package is designed to enable you to create
+frames in a document such that the 
+contents of the \env{document} environment flow from one 
+frame to the next in the order that they were defined.  
+This is useful for creating posters
+or magazines or any other form of document that does not 
+conform to the standard one or two column layout.
+
+This is a modified version of the manual for the \textsl{flowfram} package.
+It is intended to illustrated what can be done. See the full 
+manual (ffuserguide.pdf) for
+a comprehensive description, as some parts of this document
+may now be out of date.
+If the columns are very narrow, it may be better to
+use \cmdname{raggedright}, otherwise \TeX\ may have a
+problem working out the line breaks.
+
+This is column~\thedisplayedframe.
+
+The main type of frame is the flow frame. This is described on
+column~\ref{flow:flowframe} on page~\pageref{flow:flowframe}.
+The order used to draw the contents of each frame on the page
+is described in column~\ref{flow:stacking} on 
+page~\pageref{flow:stacking}. Floats are describe in 
+column~\ref{flow:floats} on page~\pageref{flow:floats}.
+
+\chapter{Setting up Frames}
+
+This is column~\thedisplayedframe.
+
+The \textsl{flowfram} package provides three types of frame:
+{flow frames}, {static 
+frames} and {dynamic frames}.
+
+\section*{Flow Frames}
+
+\labelflow{flow:flowframe}
+The flow frame is the principle type of frame.
+The text of the \env{document} environment will flow from 
+one frame to the next in order of definition. Each 
+flow frame has an associated width, height, 
+position on the page, and optionally a border.
+
+It is recommended that all the flow frames in a document
+have the same width, otherwise problems may occur
+when a paragraph spans to flow frames of unequal
+widths. This is because \TeX's output routine does not
+register the change in \cmdname{hsize} until it reaches
+a paragraph break. If it is absolutely necessary for 
+flow frames to have unequal widths, judicious use of
+\cmdname{framebreak} is required.
+
+\section*{Static Frames}
+
+A static frame is a rectangular area in which text neither
+flows into, nor flows out of.  The contents must be set
+explicitly, and once set, the contents of the static frame will
+remain the same on each page until it is explicitly 
+changed.  Thus, a static frame can be used, for example, to make 
+a company logo appear in the same place on every page.
+
+\section*{Dynamic Frames}
+
+A dynamic frame is similar to a static frame, but its contents
+are re-typeset on each page. (A static frame stores its 
+contents in a savebox, whereas a dynamic frame stores its
+contents in a macro).
+
+This is column~\thedisplayedframe.
+
+\chapter{Frame Attributes}
+\label{sec:modattr}
+
+Once you have defined the {flow frames}, {static frames} and 
+{dynamic frames}, their attributes can be changed. 
+The three types of frame mostly have the 
+same set of attributes, but some are specific to a certain type.
+The available attributes are as follows
+(\textsuperscript{\textbf{F}} indicates the key is
+only available for {flow frames}, 
+\textsuperscript{\textbf{S}} indicates the key is only available 
+for {static frames}
+and \textsuperscript{\textbf{D}} indicates the key
+is only available for {dynamic frames}):
+
+\begin{description}
+\item[width=\meta{length}]\mbox{}\par  The width of the frame.
+
+\item[height=\meta{length}]\mbox{}\par The height of the frame.
+
+\item[x=\meta{length}]\mbox{}\par The x-coordinate of the frame.
+
+\item[y=\meta{length}]\mbox{}\par The y-coordinate of the frame.
+
+\item[border=\meta{style}]\mbox{}\par The style of the border around the 
+frame, this can take the values: \texttt{none} (no border),
+\texttt{plain} (plain border) or the name of a \LaTeX\ 
+frame making command without the preceding backslash. 
+The value \texttt{fbox} is equivalent to \texttt{plain}.
+
+\item[offset=\meta{offset}]\mbox{}\par The border offset, if it is a 
+user-defined border.  This is the distance from the outer
+edge of the left hand border to the left edge of the
+bounding box of the text inside the border.  The \textsl{flowfram}
+package is able to compute the border for 
+known frame making commands. 
+If you define your own frame making command, you may need to 
+specify the offset explicitly, or the frames 
+may end up shifted to the right or left.
+
+\item[bordercolor=\meta{colour}]\mbox{}\par The colour of the border
+if you are using a standard frame making command.
+The colour can either be specified as, e.g.\ \texttt{green},
+or including the colour model, for example 
+\verb/[rgb]{0,1,0}/.
+
+\item[textcolor=\meta{colour}]\mbox{}\par The text colour for that 
+frame. Again, the colour can either be specified as, 
+e.g.\ \texttt{green}, or including the colour model, 
+for example \verb/[rgb]{0,1,0}/.
+
+\item[pages=\meta{page list}]\mbox{}\par The {list of 
+pages} for which the frame
+should appear. This can either have the values: \texttt{all},
+\texttt{even}, \texttt{odd} or \texttt{none} (the latter 
+removes the frame from that point on---useful if you
+have multiple pages with the same number), or it can be a 
+comma-separated list of single pages, or 
+{page ranges}.
+
+\item[margin=\meta{side}\textsuperscript{F}]\mbox{}\par The side of
+the flow frame that its corresponding margin should go on. This
+can take the values \texttt{left} or \texttt{right}.
+
+\item[clear=\meta{boolean}\textsuperscript{S}] If this value
+is set, the static frame will be cleared at the start of the
+next page.
+
+\item[style=\meta{cmd}\textsuperscript{D}]\mbox{}\par This should be
+the name of a command \emph{without} the preceding backslash, 
+to be applied to the contents of the specified dynamic frame. 
+The command may either be a declaration, for example \verb/style=large/
+which will set the contents of all the dynamic frames in a
+large font, or it can be a command that takes a single argument,
+for example \verb/style=textbf/
+which will make the text for all the dynamic frames come out in 
+bold.  To unset a style, do \verb/style=none/.
+
+\end{description}
+
+\chapter{Miscellaneous}
+
+\section*{Page Layout}
+
+The \textsl{flowfram} package has the package option \texttt{draft}
+which will draw the {bounding boxes} for
+each frame defined.  At the bottom right of each
+bounding box (except for the bounding box denoting the 
+typeblock), a marker will be shown to indictate the type
+of frame, its IDN and its IDL.
+
+You can see the layout for the current page (irrespective of
+whether or not the \texttt{draft} option has been set) using
+the command:\newline 
+\cmdname{flowframeshowlayout}
+
+The headers and footers will appear as usual (but will not
+be shown in draft mode), according to the format given by 
+\cmdname{pagestyle}.
+
+\section*{Frame Stacking Order}
+
+\labelflow{flow:stacking}
+The material on each page is placed in the following order:
+\begin{enumerate}
+\item Each static frame defined for that page in ascending
+order of IDN.
+
+\item Each flow frame defined for that page in ascending
+order of IDN.
+
+\item Each dynamic frame defined for that page in ascending
+order of IDN.
+
+\item {Bounding boxes} if the \texttt{draft}
+package option has been used.
+\end{enumerate}
+
+This ordering can be used to determine if you want something
+to overlay or underlay everything else on the page. 
+
+\section*{Prematurely Ending a Flow Frame}
+
+You can force text to move immediately to the next defined
+flow frame using one of the standard \LaTeX\ page breaking commands
+which  work in an analogous way to the way they
+work in standard two column mode. 
+
+The command \cmdname{framebreak} is provided for situations
+where a paragraph spans two flow frames
+of different widths, as \TeX's output routine does not 
+adjust to the new value of \cmdname{hsize} until the last 
+paragraph of the previous frame has ended. As a 
+result, the end of the paragraph at the beginning of the new
+flow frame retains the width of the previous flow frame.
+
+If you want to start a new page, rather than simply move to the 
+next frame, use the command\newline
+\cmdname{finishthispage}.
+
+\section*{Floats}
+
+\labelflow{flow:floats}
+Since floats (such as figures and tables) can only go in 
+{flow frames}, this package provides
+the additional environments: 
+\env{staticfigure} and  
+\env{statictable} which can be used in static frames
+and dynamic frames. Unlike their \env{figure} and
+\env{table} counterparts, they are fixed in place, and
+so do not take an optional placement specifier. The 
+\cmdname{caption} and \cmdname{label} commands can 
+be used within \env{staticfigure} and \env{statictable} as
+usual.
+
+The standard \env{figure} and \env{table} commands will 
+behave as usual in the flow frames, but their starred versions,
+\env{figure*} and \env{table*} behave no differently
+from \env{figure} and \env{table}.
+
+\section*{Global Values}
+
+The following macros can be changed using\linebreak \cmdname{renewcommand}:
+
+\begin{itemize}
+\item \cmdname{setffdraftcolor} 
+
+This sets the colour of the bounding box
+when it is displayed in draft mode.
+
+\item 
+\cmdname{setffdrafttypeblockcolor} 
+
+This sets the colour of
+the bounding box of the typeblock when it is displayed
+in draft mode.
+
+\item \cmdname{fflabelfont}
+
+This sets the font size for the bounding box markers in 
+draft mode.
+
+\end{itemize}
+
+The following are lengths, which can be changed using
+\cmdname{setlength}:
+
+\begin{itemize}
+\item \cmdname{fflabelsep}
+
+This is the distance from the right hand side of the
+bounding box at which to place the bounding box marker.
+
+\item \cmdname{flowframesep}
+
+This is the gap between the text of the frame and
+its border, for the standard border types. 
+
+\item \cmdname{flowframerule}
+
+This is the width of the frame's border, if using
+a border given by a frame making command that uses \cmdname{fboxsep}
+to set its border width.
+
+\item \cmdname{columnsep}
+
+This is the horizontal distance between flow frames when using one of the
+\cmdname{Ncolumn} type of commands
+
+\item \cmdname{vcolumnsep}
+
+This is the vertical distance between the flow frames and the static or
+dynamic frame when using one of the \cmdname{Ncolumntop} type of commands.
+\end{itemize}
+
+\label{lastpage}
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.pdf
new file mode 100644
index 00000000000..6578ceb310d
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.tex b/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.tex
new file mode 100644
index 00000000000..7e6c03378e1
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-casualcv.tex
@@ -0,0 +1,71 @@
+\documentclass[11pt,a4paper]{bidimoderncv}
+\cvtheme[orange]{bidicasual} % you can use orange, red, green and blue as options
+\usepackage[scale=0.8]{geometry}
+\usepackage{fontspec}
+\usepackage[RTLdocument]{bidi}
+\def\refname{تألیفات}
+\setmainfont[Script=Arabic,Mapping=parsidigits]{XB Niloofar}
+\newfontfamily\rmfamily[Mapping=tex-text]{Linux Libertine}
+\AtBeginDocument{\recomputelengths}
+\resumename{رزومه}
+\firstname{سید محمد}
+\familyname{یزدی اصفهانی}
+\title{رزومهٔ من}
+\address{تهران، خیابان آزادی پلاک ۹}
+\mobile{۰۹۱۸۹۶۹۴۹۶}
+\phone{۹۸۹۰۸۳۴۱}
+\fax{۹۸۹۰۸۳۴۲}
+\email{vafa@users.berlios.de}
+\extrainfo{اطلاعات اضافی}
+\photo[64pt]{picture}
+\quote{نقل قول}
+\begin{document}
+\maketitle
+\section{تحصیلات}
+\cventry{سال--سال}{درجه}{دانشگاه}{شهر}{\textit{نمره}}{توضیح}   % arguments 3 to 6 are optional
+\cventry{سال--سال}{درجه}{دانشگاه}{شهر}{\textit{نمره}}{توضیح}  % arguments 3 to 6 are optional
+
+\section{پایان‌نامهٔ کارشناسی ارشد}
+\cvline{عنوان}{\emph{عنوان}}
+\cvline{استاد راهنما}{استاد راهنما}
+\cvline{توضیح}{\small چکیده کوچک پایان‌نامه}
+
+\section{تجربیات}
+\subsection{عنوان}
+\cventry{سال--سال}{نام شغل}{صاحب کار}{شهر}{}{توضیح}                % arguments 3 to 6 are optional
+\cventry{سال--سال}{نام شغل}{صاحب کار}{شهر}{}{توضیح}                % arguments 3 to 6 are optional
+\subsection{متفرقه}
+\cventry{سال--سال}{نام شغل}{صاحب کار}{شهر}{}{توضیح خط ۱\newline{}توضیح خط ۲}% arguments 3 to 6 are optional
+
+\section{زبانها}
+\cvlanguage{زبان ۱}{درجه مهارت}{نظر}
+\cvlanguage{زبان ۲}{درجه مهارت}{نظر}
+\cvlanguage{زبان ۳}{درجه مهارت}{نظر}
+
+\section{مهارتهای رایانه‌ای}
+\cvcomputer{طبقه ۱}{یک، دو، سه}{طبقه ۴}{یک، دو، سه}
+\cvcomputer{طبقه ۲}{یک، دو، سه}{طبقه ۵}{یک، دو، سه}
+\cvcomputer{طبقه ۳}{یک، دو، سه}{طبقه ۶}{یک، دو، سه}
+
+\section{علاقه‌ها}
+\cvline{علاقه ۱}{\small توضیح}
+\cvline{علاقه ۲}{\small توضیح}
+\cvline{علاقه ۳}{\small توضیح}
+
+\renewcommand{\listitemsymbol}{-} % change the symbol for lists
+
+\section{بعدی ۱}
+\cvlistitem{شماره ۱}
+\cvlistitem{شماره ۲}
+\cvlistitem[+]{شماره ۳}            % optional other symbol
+
+\section{بعدی ۲}
+\cvlistdoubleitem[\Neutral]{شماره ۱}{شماره ۴}
+\cvlistdoubleitem[\Neutral]{شماره ۲}{شماره ۵}
+\cvlistdoubleitem[\Neutral]{شماره ۳}{}
+
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{publications}       % 'publications' is the name of a BibTeX file
+
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.pdf
new file mode 100644
index 00000000000..1764e6a5a11
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.tex b/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.tex
new file mode 100644
index 00000000000..a1fdd2c3437
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-classiccv.tex
@@ -0,0 +1,71 @@
+\documentclass[11pt,a4paper]{bidimoderncv}
+\cvtheme[green]{bidiclassic} % you can use orange, red, green, grey and blue as options
+\usepackage[scale=0.8]{geometry}
+\usepackage{fontspec}
+\setmainfont[Script=Arabic,Mapping=parsidigits]{XB Zar}
+\newfontfamily\rmfamily[Mapping=tex-text]{Linux Libertine}
+\def\refname{تألیفات}
+\usepackage[RTLdocument]{bidi}
+\AtBeginDocument{\recomputelengths}
+\resumename{رزومه}
+\firstname{وفا}
+\familyname{خلیقی}
+\title{رزومهٔ من}
+\address{تهران، خیابان آزادی پلاک ۹}
+\mobile{۰۹۱۸۹۶۹۴۹۶}
+\phone{۹۸۹۰۸۳۴۱}
+\fax{۹۸۹۰۸۳۴۲}
+\email{me@you.com}
+\extrainfo{اطلاعات اضافی}
+\photo[64pt]{picture}
+\quote{نقل قول}
+\begin{document}
+\maketitle
+\section{تحصیلات}
+\cventry{سال--سال}{درجه}{دانشگاه}{شهر}{\textit{نمره}}{توضیح}   % arguments 3 to 6 are optional
+\cventry{سال--سال}{درجه}{دانشگاه}{شهر}{\textit{نمره}}{توضیح}  % arguments 3 to 6 are optional
+
+\section{پایان‌نامهٔ کارشناسی ارشد}
+\cvline{عنوان}{\emph{عنوان}}
+\cvline{استاد راهنما}{استاد راهنما}
+\cvline{توضیح}{\small چکیده کوچک پایان‌نامه}
+
+\section{تجربیات}
+\subsection{عنوان}
+\cventry{سال--سال}{نام شغل}{صاحب کار}{شهر}{}{توضیح}                % arguments 3 to 6 are optional
+\cventry{سال--سال}{نام شغل}{صاحب کار}{شهر}{}{توضیح}                % arguments 3 to 6 are optional
+\subsection{متفرقه}
+\cventry{سال--سال}{نام شغل}{صاحب کار}{شهر}{}{توضیح خط ۱\newline{}توضیح خط ۲}% arguments 3 to 6 are optional
+
+\section{زبانها}
+\cvlanguage{زبان ۱}{درجه مهارت}{نظر}
+\cvlanguage{زبان ۲}{درجه مهارت}{نظر}
+\cvlanguage{زبان ۳}{درجه مهارت}{نظر}
+
+\section{مهارتهای رایانه‌ای}
+\cvcomputer{طبقه ۱}{یک، دو، سه}{طبقه ۴}{یک، دو، سه}
+\cvcomputer{طبقه ۲}{یک، دو، سه}{طبقه ۵}{یک، دو، سه}
+\cvcomputer{طبقه ۳}{یک، دو، سه}{طبقه ۶}{یک، دو، سه}
+
+\section{علاقه‌ها}
+\cvline{علاقه ۱}{\small توضیح}
+\cvline{علاقه ۲}{\small توضیح}
+\cvline{علاقه ۳}{\small توضیح}
+
+\renewcommand{\listitemsymbol}{-} % change the symbol for lists
+
+\section{بعدی ۱}
+\cvlistitem{شماره ۱}
+\cvlistitem{شماره ۲}
+\cvlistitem[+]{شماره ۳}            % optional other symbol
+
+\section{بعدی ۲}
+\cvlistdoubleitem[\Neutral]{شماره ۱}{شماره ۴}
+\cvlistdoubleitem[\Neutral]{شماره ۲}{شماره ۵}
+\cvlistdoubleitem[\Neutral]{شماره ۳}{}
+
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{publications}       % 'publications' is the name of a BibTeX file
+
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-color.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-color.pdf
new file mode 100644
index 00000000000..22232053af4
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-color.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-color.tex b/Master/texmf-dist/doc/xelatex/bidi/test-color.tex
new file mode 100644
index 00000000000..f2a9dcd7395
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-color.tex
@@ -0,0 +1,44 @@
+\documentclass{article}
+\usepackage{fontspec}
+\usepackage{xecolour} % for RTL coloured texts that spans more than a line
+\usepackage{fullpage}
+\usepackage{colortbl}
+\setmainfont[Scale=1,Script=Arabic,Mapping=farsidigits]{XB Kayhan}
+\usepackage{xcolor}
+\usepackage[RTLdocument]{bidi}
+\begin{document}
+این یک آزمایش است.
+
+\bigskip
+\fcolorbox{red}{yellow}{\begin{minipage}{0.8\textwidth}
+این یک متن است که من آن را داخل یک جعبهٔ زردرنگ قرار می‌دهم. این یک متن است که من آن را داخل یک جعبهٔ زردرنگ قرار می‌دهم
+\end{minipage}}
+
+این {\color{red} رنگ قرمز} است و این هم \textcolor{blue}{رنگ آبی} است همانطور که می‌بینید.
+
+\bigskip
+من اسم خودم {\color{red}  وفا خلیقی} را با رنگ قرمز می‌نویسم.
+
+\bigskip
+من اسم خودم \textcolor{blue}{وفا خلیقی} را با رنگ آبی می‌نویسم.
+
+\bigskip
+\colorbox{yellow}{\begin{minipage}{0.8\textwidth}
+این یک متن است که من آن را داخل یک جعبهٔ زردرنگ قرار می‌دهم. این یک متن است که من آن را داخل یک جعبهٔ زردرنگ قرار می‌دهم
+\end{minipage}}
+
+\bigskip
+این یک پاراگراف با \blue{رنگ آبی اول است و همینطور و همینطور ما می‌توانیم از رنگاهی مختلف استفاده کنیم} و حالا
+\red{این روزها حجم اخبار و مطالب مرتبط با ایران و مسایل مربوط به آن بسیار زیاد شده وابزارهایی مانند گوگل ریدر برای مرور لیست بلند بالایی از سایتها و وبلاگ های به روز شده ، بیشتر مورد استفاده قرار میگیرد.} و حالا هم
+\darkred{یکی از مشکلاتی که در استفاده از گوگل ریدر داشتم، نامناسب بودن فونت فارسی آن بود. اگر چه عمده وبلاگها و سایتها از فونت تاهوما (مانند فونتی که این مطالب با آن نوشته شده است) استفاده می کنند اما تعدادی از وبلاگها از فونتهای دیگری که بعضی وقتها خیلی ریز هم هستند }استفاده می کنند که خواندن آن در گوگل ریدر بسیار دشوار است. متاسفانه در گوگل ریدر بخشی برای تغییر فونت وجود ندارد و نمیتوان نوع فونت یا اندازه مطالب آن را تغییر داد. بعد از کمی جستجو بر روی اینترنت راه حل جالبی را پیدا کردم که با کمی تغییر برای مطالب فارسی هم قابل استفاده است.
+اگر از فایرفاکس برای مرور مطالب جدید در گوگل ریدر استفاده می کنید، این راه حل را باری حل این مشکل به شما پیشنهاد میکنم
+
+\bigskip
+حالا نوبت جعبه‌های رنگی است یعنی مثلاً \colorbox{red}{{\color{white}سلام}} و \fcolorbox{yellow}{red}{{\color{white}این یک متن داخل جعبه رنگی است که کمی طولانی است}}
+
+
+
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.pdf
new file mode 100644
index 00000000000..d6c4539b883
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex b/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex
index 5e43860b849..af040d23c2c 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex
@@ -65,9 +65,9 @@ zeta               & GREEK SMALL LETTER ZETA             & 03B6\\
 \tablehead
    {\bfseries Entity&\bfseries  Unicode Name&\bfseries Unicode\\ \hline}
 \tabletail
-   {\hline \multicolumn{3}{r}{\emph{Continued on next page}}\\}
+   {\hline \multicolumn{3}{l}{\emph{Continued on next page}}\\}
 \tablelasttail{\hline}
-\begin{supertabular}{lll}
+\begin{supertabular}{rrr}
 alpha              & GREEK SMALL LETTER ALPHA            & 03B1\\
 beta               & GREEK SMALL LETTER BETA             & 03B2\\
 chi                & GREEK SMALL LETTER CHI              & 03C7\\
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabular.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-tabular.pdf
new file mode 100644
index 00000000000..6da31ff5b8d
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabular.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex b/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex
index ffc08ac933a..826f38c3515 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex
@@ -36,7 +36,7 @@ In this document we test \LaTeX's default tabular in \textsf{RTL} and \textsf{LT
 
 \setRTL
 \begin{center}\small
-\begin{tabular}{|l||c|l|c|l|c|l|}
+\begin{tabular}{|r||c|r|c|r|c|r|}
 \hline
 & \multicolumn{2}{c|}{6.15--7.15 pm} & \multicolumn{2}{c|}{7.20--8.20 pm}
 & \multicolumn{2}{c|}{8.30--9.30 pm} \\ \cline{2-7}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.pdf
new file mode 100644
index 00000000000..0e95eaa1d03
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex b/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex
index 2867c7cd17a..719c266896f 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex
@@ -23,7 +23,7 @@ Lion & Yellow & Elephants & Tartare \\\cline{4-4}
 \section{RTL}
 
 \setRTL
-\begin{tabularx}{\linewidth}{|l|p{1.25cm}|p{1.5cm}|X|}\hline
+\begin{tabularx}{\linewidth}{|r|p{1.25cm}|p{1.5cm}|X|}\hline
 \multicolumn{1}{|c|}{\textbf{Animal}}
   & \textbf{Hair Colour}
   & \multicolumn{2}{c|}{\textbf{Favourite foods}} \\\hline\hline
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.pdf b/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.pdf
new file mode 100644
index 00000000000..425eb03bfc7
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.pdf b/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.pdf
new file mode 100644
index 00000000000..ddb4b770f07
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.tex b/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.tex
new file mode 100644
index 00000000000..97f20871db1
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test1-colortbl.tex
@@ -0,0 +1,47 @@
+\documentclass{article}
+\usepackage{fontspec}
+\setmainfont[Mapping=farsidigits,Script=Arabic]{XB Kayhan}
+\usepackage{hhline}
+\usepackage{colortbl}
+\usepackage[RTLdocument]{bidi}
+\begin{document}
+این فقط یک آزمایش است
+\begin{center}
+\setlength\arrayrulewidth{5pt}
+\setlength\doublerulesep{5pt}
+ \renewcommand{\arraystretch}{2}
+ \definecolor{orange}{cmyk}{0,0.61,0.87,0}
+ \definecolor{indigo}{cmyk}{0.8,0.9,0,0}
+ \definecolor{violet}{cmyk}{0.6,0.9,0,0}
+ \newcommand\rainbowline[1]{%
+ \hhline{%
+   >{\arrayrulecolor   {red}\doublerulesepcolor[rgb]{.3,.3,1}}%
+   |#1:=%
+   >{\arrayrulecolor{orange}\doublerulesepcolor[rgb]{.4,.4,1}}%
+   =%
+   >{\arrayrulecolor{yellow}\doublerulesepcolor[rgb]{.5,.5,1}}%
+   =%
+   >{\arrayrulecolor {green}\doublerulesepcolor[rgb]{.6,.6,1}}%
+   =%
+   >{\arrayrulecolor  {blue}\doublerulesepcolor[rgb]{.7,.7,1}}%
+  =%
+   >{\arrayrulecolor{indigo}\doublerulesepcolor[rgb]{.8,.8,1}}%
+   =%
+   >{\arrayrulecolor{violet}\doublerulesepcolor[rgb]{.9,.9,1}}%
+   =:#1|%
+   }}
+ \arrayrulecolor{red}
+ \doublerulesepcolor[rgb]{.3,.3,1}
+ \begin{tabular}{||*7{>{\columncolor[gray]{.9}}c}||}
+ \rainbowline{t}%
+ \arrayrulecolor{violet}\doublerulesepcolor[rgb]{.9,.9,1}
+ وفا&خلیقی&یک&دانشجوی&ریاضی&است&
+ \multicolumn{1}{>{\columncolor[gray]{.9}}c||}{حرف آخر}\\
+ \rainbowline{}%
+ 1&2&3&4&5&6&
+ \multicolumn{1}{>{\columncolor[gray]{.9}}c||}{7}\\
+ \rainbowline{b}%
+ \end{tabular}
+ \end{center}
+این صرفاً یک آزمایش است
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.pdf b/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.pdf
new file mode 100644
index 00000000000..2e2047a40aa
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.pdf b/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.pdf
new file mode 100644
index 00000000000..d682c51ce15
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.tex b/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.tex
new file mode 100644
index 00000000000..63b50618837
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test2-colortbl.tex
@@ -0,0 +1,28 @@
+\documentclass{article}
+\usepackage{fullpage}
+\usepackage{fontspec}
+\usepackage{colortbl}
+\setmainfont[Scale=1,Script=Arabic,Mapping=farsidigits]{XB Kayhan}
+\usepackage[RTLdocument]{bidi}
+\begin{document}
+این فقط یک آزمایش است
+
+\setlength{\extrarowheight}{2mm}
+\setlength{\tabcolsep}{2mm}
+\begin{center}
+\begin{tabular}{|l|%
+>{\columncolor{yellow}}c|c|>{\columncolor{yellow}}c|c|%
+>{\columncolor{red}\bfseries}c<{\textsc{GBP}}|}
+\hline
+\multicolumn{3}{>{\columncolor{red}}r}{\color{white}\textbf{لَنْدَنْ}}
+&\multicolumn{3}{>{\columncolor{red}}l}{\color{white}\textbf{قیمت}}
+\\[1pt]
+\hline
+سیدنی & OG4G &سشنبه ۱۰ اکتبر &دوشنبه ۲۱ اکتبر یا ۲۸‌ام &11 یا ۱۸ روز &999\\
+& &سشنبه ۱۷ اکتبر &دوشنبه ۲۱ اکتبر یا ۲۸‌ام & 4 یا ۱۱ روز &999\\
+& OG7A &یکشنبه ۱۱ اکتبر &دوشنبه ۲۱ اکتبر یا ۲۸‌ام & 8 یا ۱۵ روز &999\\
+& &یکشنبه ۲۰ اکتبر &دوشنبه ۲۸ اکتبر & 8 روز &999\\
+\hline
+\end{tabular}
+\end{center}
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.pdf b/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.pdf
new file mode 100644
index 00000000000..e915bd611be
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.pdf b/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.pdf
new file mode 100644
index 00000000000..cf73f50ea25
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.pdf
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsart-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def
index 4eaa7ac72ed..eff5ffc15e6 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsart-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `amsart-bidi.def',
+%% This is file `amsart-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsart-bidi.def}[2010/03/01 v0.3 adaptations for amsart class]
+\ProvidesFile{amsart-xetex-bidi.def}[2010/07/25 v0.4 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
@@ -33,20 +33,6 @@
 \def\part{\@startsection{part}{0}%
   \z@{\linespacing\@plus\linespacing}{.5\linespacing}%
   {\normalfont\bfseries\if@RTL\raggedleft\else\raggedright\fi}}
-\renewenvironment{thebibliography}[1]{%
-  \@bibtitlestyle
-  \normalfont\bibliofont\labelsep .5em\relax
-  \renewcommand\theenumiv{\arabic{enumiv}}\let\p@enumiv\@empty
-  \list{\@biblabel{\theenumiv}}{\settowidth\labelwidth{\@biblabel{#1}}%
-    \leftmargin\labelwidth \advance\leftmargin\labelsep
-    \rightmargin\labelwidth \advance\rightmargin\labelsep
-    \usecounter{enumiv}}%
-  \sloppy \clubpenalty\@M \widowpenalty\clubpenalty
-  \sfcode`\.=\@m
-}{%
-  \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
-  \endlist
-}
 \def\right@footnote{%
   \hbox to \columnwidth
   {\beginR \vbox{\kern-.4\p@
@@ -109,4 +95,4 @@
 %% 
 %% 
 %%
-%% End of file `amsart-bidi.def'.
+%% End of file `amsart-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsbook-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def
index 04bbebd7966..c0f19fc0727 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsbook-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `amsbook-bidi.def',
+%% This is file `amsbook-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsbook-bidi.def}[2010/03/01 v0.3 adaptations for amsbook class]
+\ProvidesFile{amsbook-xetex-bidi.def}[2010/07/25 v0.5 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
@@ -30,33 +30,15 @@
 \renewcommand\thesubsubsection {\thesubsection \@SepMark\arabic{subsubsection}}
 \renewcommand\theparagraph     {\thesubsubsection\@SepMark\arabic{paragraph}}
 \renewcommand\thesubparagraph  {\theparagraph\@SepMark\arabic{subparagraph}}
-\renewenvironment{thebibliography}[1]{%
-  \@bibtitlestyle
-  \normalfont\bibliofont\labelsep .5em\relax
-  \renewcommand\theenumiv{\arabic{enumiv}}\let\p@enumiv\@empty
-  \list{\@biblabel{\theenumiv}}{\settowidth\labelwidth{\@biblabel{#1}}%
-    \rightmargin\labelwidth \advance\rightmargin\labelsep
-     \leftmargin\labelwidth \advance\leftmargin\labelsep
-    \usecounter{enumiv}}%
-  \sloppy \clubpenalty\@M \widowpenalty\clubpenalty
-  \sfcode`\.=\@m
-}{%
-  \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
-  \endlist
-}
 \def\theindex{\@restonecoltrue\if@twocolumn\@restonecolfalse\fi
-\columnseprule\z@ \columnsep 35\p@
-\@indextitlestyle
-\thispagestyle{plain}%
-\let\item\@idxitem
-\parindent\z@ \parskip\z@\@plus.3\p@\relax
-\raggedleft
-\hyphenpenalty\@M
-\footnotesize}
-
-\def\@idxitem{\par\hangindent -2em}
-\def\subitem{\par\hangindent -2em\hspace*{1em}}
-\def\subsubitem{\par\hangindent -3em\hspace*{2em}}
+  \columnseprule\z@ \columnsep 35\p@
+  \@indextitlestyle
+  \thispagestyle{plain}%
+  \let\item\@idxitem
+  \parindent\z@  \parskip\z@\@plus.3\p@\relax
+  \if@RTL\raggedleft\else\raggedright\fi
+  \hyphenpenalty\@M
+  \footnotesize}
 \def\right@footnote{%
   \hbox to \columnwidth
   {\beginR \vbox{\kern-.4\p@
@@ -119,4 +101,4 @@
 %% 
 %% 
 %%
-%% End of file `amsbook-bidi.def'.
+%% End of file `amsbook-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsmath-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def
index e148fc0fc4d..656b0c7999e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsmath-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `amsmath-bidi.def',
+%% This is file `amsmath-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsmath-bidi.def}[2010/03/01 v0.2 adaptations for amsmath package]
+\ProvidesFile{amsmath-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for amsmath package for XeTeX engine]
 \renewenvironment{equation}{%
   \incr@eqnum
   \mathdisplay@push
@@ -47,4 +47,4 @@
 %% 
 %% 
 %%
-%% End of file `amsmath-bidi.def'.
+%% End of file `amsmath-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsthm-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def
index a51a758c584..8857b937aed 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsthm-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `amsthm-bidi.def',
+%% This is file `amsthm-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsthm-bidi.def}[2010/03/01 v0.1 adaptations for amsthm package]
+\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>
@@ -24,4 +24,4 @@
 %% 
 %% 
 %%
-%% End of file `amsthm-bidi.def'.
+%% End of file `amsthm-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/array-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def
index cf1986e1aaa..b9e310e3107 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/array-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `array-bidi.def',
+%% This is file `array-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{array-bidi.def}[2010/03/01 v0.1 adaptations for array package]
+\ProvidesFile{array-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for array package for XeTeX engine]
 \def\@testpach{\@chclass
  \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
   \ifnum \@lastchclass=7 5 \else
@@ -105,4 +105,4 @@
 %% 
 %% 
 %%
-%% End of file `array-bidi.def'.
+%% End of file `array-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/article-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def
index 328d17fcee1..9248fdf0489 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/article-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `article-bidi.def',
+%% This is file `article-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{article-bidi.def}[2010/03/01 v0.2 adaptations for standard article class]
+\ProvidesFile{article-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for standard article class for XeTeX engine]
 \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -143,67 +143,6 @@
     \nobreak
     \vskip 3ex
     \@afterheading}
-    \def\ps@plain{\ps@empty
-\def\@oddfoot{\hfil\thepage\hfil}%
-\let\@evenfoot\@oddfoot
-}
-\renewenvironment{thebibliography}[1]
-     {\section*{\refname}%
-      \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}%
-      \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\@biblabel{#1}}%
-            \rightmargin\labelwidth    \advance\rightmargin\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}
-\if@twoside
-  \def\ps@headings{%
-      \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\if@RTLmain\beginR\fi\leftmark\if@RTLmain\endR\fi\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi}%
-      \let\@mkboth\markboth
-    \def\sectionmark##1{%
-      \markboth {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\z@
-          \thesection\quad
-        \fi
-        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}{}}%
-    \def\subsectionmark##1{%
-      \markright {%
-        \ifnum \c@secnumdepth >\@ne
-          \if@RTLmain\beginR\fi\thesubsection\quad\if@RTLmain\endR\fi
-        \fi
-        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi}%
-    \let\@mkboth\markboth
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\m@ne
-          \if@RTLmain\beginR\fi\thesection\quad\if@RTLmain\endR\fi
-        \fi
-        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}}
-\fi
-\def\ps@myheadings{%
-    \let\@oddfoot\@empty\let\@evenfoot\@empty
-    \def\@evenhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\leftmark\if@RTLmain\endR\fi}%
-    \def\@oddhead{\sl\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi\hfil\thepage}%
-    \let\@mkboth\@gobbletwo
-    \let\sectionmark\@gobble
-    \let\subsectionmark\@gobble
-    }
-\pagestyle{plain}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
 %% 
@@ -218,4 +157,4 @@
 %% 
 %% 
 %%
-%% End of file `article-bidi.def'.
+%% End of file `article-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/arydshln-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def
index 5021c938aaf..66940c279c8 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/arydshln-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `arydshln-bidi.def',
+%% This is file `arydshln-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{arydshln-bidi.def}[2010/03/01 v0.1 adaptations for arydshln package]
+\ProvidesFile{arydshln-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for arydshln package for XeTeX engine]
 \def\endarray{\adl@endarray \egroup \adl@arrayrestore \if@RTLtab\egroup\endR\egroup\fi\egroup}
 \def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup\global\@RTLtabfalse}
 \expandafter\let\csname endtabular*\endcsname\endtabular
@@ -157,4 +157,4 @@
 %% 
 %% 
 %%
-%% End of file `arydshln-bidi.def'.
+%% End of file `arydshln-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
index 89f18c2000e..e64ebb0c867 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
@@ -9,18 +9,15 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2010/03/01}
-\def\bidiversion{v1.0.4}
-\def\bidirevision{revision 202}
+\def\bididate{2010/07/25}
+\def\bidiversion{v1.0.5}
+\def\bidirevision{revision 253}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidirevision>
-Bidirectional typesetting in XeLaTeX]
-\AtBeginDocument{\special{pdf: docinfo <<
-/Creator (Bidi \bidiversion\space <\bidirevision> Copyright © 2009-2010 Vafa Khalighi)
-         >>}}
+Bidirectional typesetting in XeLaTeX and LuaLaTeX]
 \edef\bidiinfo{%
-bidi package (Support for bidirectional typesetting with XeLaTeX)^^J
+bidi package (Support for bidirectional typesetting with XeLaTeX and LuaLaTeX)^^J
 Description: A convenient interface for typesetting bidirectional^^J
-texts with XeLaTeX.  The package includes adaptations for use^^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
@@ -30,12 +27,15 @@ Location on CTAN: /macros/xetex/latex/bidi}
 \typeout{\bidiinfo}
 \edef\bidi@everyjob{\the\everyjob}
 \everyjob{\bidi@everyjob\typeout{\bidiinfo}}
+\RequirePackage{ifxetex}
+\RequirePackage{ifluatex}
 \def\@tagsextension{clo}
 \def\@definitionfileextension{def}
 \def\@iftagsloaded{\@ifl@aded\@tagsextension}
 \def\@ifdefinitionfileloaded{\@ifl@aded\@definitionfileextension}
 \newif\if@RTLmain
 \newif\if@RTL
+\newif\if@RTLmaths
 \newif\if@Latin
 \newif\if@RTLtab
 \newif\if@sentdir
@@ -53,16 +53,6 @@ Location on CTAN: /macros/xetex/latex/bidi}
 \let\@tab@rltrue=\@RTLtabtrue
 \let\@tab@rlfalse=\@RTLtabfalse
 \@RTLmainfalse
-\ifx\TeXXeTstate\undefined\else%
-   \TeXXeTstate=1
-\fi
-\ifx\beginR\@undefined%
-   \newlinechar`\^^J
-   \typeout{^^JTo avoid this error message,^^J%
-     run TeX--XeT or e-TeX engine instead of regular TeX.^^J}
-   \errmessage{Right-to-Left Support Error: use TeX--XeT or e-TeX
-     engine}%
-\fi
 \AtBeginDocument{%
   \if@RTLmain\else
     \if@RTL\@RTLmaintrue%
@@ -70,392 +60,25 @@ Location on CTAN: /macros/xetex/latex/bidi}
     \fi%
   \fi%
 }
-\def\Bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\usebox\z@}\fi}
-   \let\o@everypar=\everypar
-   \newtoks\n@everypar
-   \n@everypar\expandafter{\the\o@everypar}
-   \o@everypar{\Bidi@RTL@everypar\the\n@everypar}
-   \let\everypar=\n@everypar
 \let\n@xt=\
 \def\LRE{\protect\pLRE}%
 \def\pLRE{\protect\afterassignment\moreLRE \let\n@xt= }
-\def\moreLRE{\bracetext \aftergroup\endL \beginL\@RTLfalse}
 \def\RLE{\protect\pRLE}
 \def\pRLE{\protect\afterassignment\moreRLE \let\n@xt= }
-\def\moreRLE{\bracetext \aftergroup\endR \beginR\@RTLtrue}
 \def\bracetext{\ifcat\n@xt{\else\ifcat\n@xt}\fi
   \errmessage{Missing left brace has been substituted}\fi \bgroup}
-\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{\if@RTL\par\@RTLfalse\@RTL@footnotefalse\fi}
-\def\rtl{\if@RTL\relax\else\par\@RTLtrue\@RTL@footnotetrue\fi}
-\def\setRTL{\@RTLtrue\@RTL@footnotetrue}
-\def\setLTR{\@RTLfalse\@RTL@footnotefalse}
-\let\unsetRTL=\setLTR
-\let\unsetLTR=\setRTL
-\let\LR=\LRE
-\let\RL=\RLE
-\def\@ensure@RTL#1{\if@RTL#1\else\RLE{#1}\fi}
-\def\@ensure@LTR#1{\if@RTL\LRE{#1}\else#1\fi}
-\let\@ensure@RL=\@ensure@RTL
-\let\@ensure@LR=\@ensure@LTR
-\def\@ensure@dir#1{\if@RTL\RLE{#1}\else{#1}\fi}
-\let\@ensure@maindir=\@ensure@dir
-\def\@@RTL{RTL}
-\def\@@LTR{LTR}
-\def\save@dir{\if@RTL\gdef\saved@@dir{RTL}\else\gdef\saved@@dir{LTR}\fi}
-\def\reset@dir{\ifx\saved@@dir\@@RTL\setRTL\else\ifx\saved@@dir\@@LTR\setLTR\else\relax\fi\fi}
-\let\@@TeX\TeX
-\def\TeX{\@ensure@LTR{\@@TeX}}
-\let\@@LaTeX\LaTeX
-\def\LaTeX{\@ensure@LTR{\@@LaTeX}}
-\let\@@LaTeXe\LaTeXe
-\def\LaTeXe{\@ensure@LTR{\@@LaTeXe}}
-\def\reflect#1{{\setbox0=\hbox{#1}\rlap{\kern0.5\wd0
-  \special{x:gsave}\special{x:scale -1 1}}\box0 \special{x:grestore}}}
-\def\XeTeX{\LR{\leavevmode$\smash{\hbox{X\lower.5ex
-  \hbox{\kern-.125em\reflect{E}}\kern-.1667em \TeX}}$}}
-\def\XeLaTeX{\LR{\leavevmode$\smash{\hbox{X\lower.5ex
-  \hbox{\kern-.125em\reflect{E}}\kern-.1667em \LaTeX}}$}}
-\let\setRL=\setRTL
-\let\setLR=\setLTR
-\let\unsetRL=\setLTR
-\DeclareOption{RTLdocument}{\@RTLtrue\@RTL@footnotetrue\autofootnoterule}
-\DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\autofootnoterule}
-\def\rcases#1{\left.\vcenter{\normalbaselines\m@th
-    \ialign{$##\hfil$&\quad{##}\hfil\crcr#1\crcr}}\,\right\}}
-\def\SepMark#1{\gdef\@SepMark{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
-\SepMark{.}
-\def\@thmcountersep{\@SepMark}
-\def\list#1#2{%
-  \ifnum \@listdepth >5\relax
-    \@toodeep
-  \else
-    \global\advance\@listdepth\@ne
-  \fi
-  \rightmargin\z@
-  \listparindent\z@
-  \itemindent\z@
-  \csname @list\romannumeral\the\@listdepth\endcsname
-  \def\@itemlabel{#1}%
-  \let\makelabel\@mklab
-  \@nmbrlistfalse
-  #2\relax
-  \@trivlist
-  \parskip\parsep
-  \parindent\listparindent
-  \advance\linewidth -\rightmargin
-  \advance\linewidth -\leftmargin
-  \if@RTL
-    \advance\@totalleftmargin \rightmargin
-  \else
-    \advance\@totalleftmargin \leftmargin
-  \fi
-  \parshape \@ne \@totalleftmargin \linewidth
-  \ignorespaces}
-\def\raggedright{%
-  \let\\\@centercr
-  \leftskip\z@skip\rightskip\@flushglue
-  \parindent\z@\parfillskip\z@skip}
-\let\@@raggedleft=\raggedleft
-\let\@@raggedright=\raggedright
-\renewcommand\raggedleft{\if@RTL\@@raggedright%
-                         \else\@@raggedleft\fi}
-\renewcommand\raggedright{\if@RTL\@@raggedleft%
-                          \else\@@raggedright\fi}
-\def\raggedright{%
-  \let\\\@centercr
-  \rightskip\z@skip\rightskip\@flushglue
-  \parindent\z@\parfillskip\z@skip}
-\renewcommand\raggedleft{\@@raggedleft}
-\renewcommand\raggedright{\@@raggedright}
-\def\centerline#1{%
-\if@RTL\@@line{\hss\beginR#1\endR\hss}
-\else\@@line{\hss#1\hss}\fi}
-\def\leftline#1{%
-\if@RTL\@@line{\beginR#1\endR\hss}
-\else\@@line{#1\hss}\fi}
-\def\rightline#1{%
-\if@RTL\@@line{\hss\beginR#1\endR}
-\else\@@line{\hss#1}\fi}
-\def\narrower{%
-  \advance\if@RTL\rightskip\else\leftskip\fi\parindent
-  \advance\if@RTL\leftskip\else\rightskip\fi\parindent}
-\def\leftmark{\if@RTLmain\beginR\fi\expandafter\@leftmark\botmark\@empty\@empty\if@RTLmain\endR\fi}
-\def\rightmark{\if@RTLmain\beginR\fi\expandafter\@rightmark\firstmark\@empty\@empty\if@RTLmain\endR\fi}
-\def\underline#1{%
-  \relax
-  \ifmmode\@@underline{#1}%
-  \else
-\if@RTL $\@@underline{\hbox{\beginR#1\endR}}\m@th$\relax
+\input{loadingorder-bidi.def}
+\ifxetex
+  \input{xetex-bidi.def}
 \else
-$\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
-\if@compatibility
-   \let\undertext=\underline
-\fi
-\global\@RTLtabfalse
-\def\@tabular{\if@RTL\global\@RTLtabtrue\fi
-   \leavevmode \hbox \bgroup \if@RTLtab\beginR \fi
-   $\let\@acol\@tabacol
-   \let\@classz\@tabclassz
-   \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
-\def\endtabular{\crcr\egroup\if@RTLtab\egroup\endR\egroup\fi
-                 \egroup $\if@RTLtab\endR\fi\egroup
-                 \global\@RTLtabfalse}
-\expandafter \let \csname endtabular*\endcsname = \endtabular
-\def\@array[#1]#2{%
-  \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi
-  \bgroup
-  \setbox\@arstrutbox\hbox{%
-    \vrule \@height\arraystretch\ht\strutbox
-           \@depth\arraystretch \dp\strutbox
-           \@width\z@}%
-  \@mkpream{#2}%
-  \edef\@preamble{%
-    \ialign \noexpand\@halignto
-      \bgroup \@arstrut \@preamble \tabskip\z@skip \cr}%
-  \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
-  \let\tabularnewline\\%
-    \let\par\@empty
-    \let\@sharp##%
-    \set@typeset@protect
-    \lineskip\z@skip\baselineskip\z@skip
-    \ifhmode \@preamerr\z@ \@@par\fi
-  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
-    \@preamble}
-\def\@testpach#1{\@chclass \ifnum \@lastchclass=\tw@ 4 \else
-    \ifnum \@lastchclass=3 5 \else
-     \z@ \if #1c\@chnum \z@ \else
-                              \if \if@RTLtab#1r\else#1l\fi\@chnum \@ne \else
-                              \if \if@RTLtab#1l\else#1r\fi\@chnum \tw@ \else
-          \@chclass \if #1|\@ne \else
-                    \if #1@\tw@ \else
-                    \if #1p3 \else \z@ \@preamerr 0\fi
-  \fi  \fi  \fi  \fi  \fi  \fi
-\fi}
-\def\@dottedtocline#1#2#3#4#5{%
-  \ifnum #1>\c@tocdepth \else
-    \vskip \z@ \@plus.2\p@
-    {\if@RTL\rightskip\else\leftskip\fi #2\relax \if@RTL\leftskip\else\rightskip\fi \@tocrmarg \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent #2\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima #3\relax
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {#4}\nobreak
-     \leaders\hbox{$\m@th
-        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
-        mu$}\hfill
-     \nobreak
-     \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
-     \par}%
-  \fi}
-\def\RTL@outputdblcol{\if@firstcolumn
-\global\@firstcolumnfalse
-    \global\setbox\@leftcolumn\box\@outputbox
-  \else \global\@firstcolumntrue
-    \setbox\@outputbox\vbox{%
-     \hbox to\textwidth{%
-      \hbox to\columnwidth{\box\@outputbox \hss}%
-      \hfil \vrule width\columnseprule\hfil
-      \hbox to\columnwidth{\box\@leftcolumn \hss}%
-   }}\@combinedblfloats
-\@outputpage \begingroup \@dblfloatplacement
-\@startdblcolumn
-\@whilesw\if@fcolmade \fi
-{\@outputpage\@startdblcolumn}\endgroup
-    \fi}
-\def\LTR@outputdblcol{\if@firstcolumn
-\global\@firstcolumnfalse
-    \global\setbox\@leftcolumn\box\@outputbox
-  \else \global\@firstcolumntrue
-    \setbox\@outputbox\vbox{\hbox to\textwidth{%
-      \hbox to\columnwidth
-      {\box\@leftcolumn \hss}\hfil
-       \vrule width\columnseprule\hfil
-       \hbox to\columnwidth{\box\@outputbox \hss}}}%
-       \@combinedblfloats
-       \@outputpage \begingroup \@dblfloatplacement
-       \@startdblcolumn
-       \@whilesw\if@fcolmade \fi
-       {\@outputpage\@startdblcolumn}\endgroup
-    \fi}
-\renewcommand{\@outputdblcol}{\if@RTLmain\RTL@outputdblcol\else\LTR@outputdblcol\fi}
-\newcommand{\RTLdblcol}{\renewcommand{\@outputdblcol}{\RTL@outputdblcol}}
-\newcommand{\LTRdblcol}{\renewcommand{\@outputdblcol}{\LTR@outputdblcol}}
-\def\@addmarginpar{\@next\@marbox\@currlist{\@cons\@freelist\@marbox
-    \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne
-    \if@twocolumn
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \ifnum\@tempcnta <\z@  \global\setbox\@marbox\box\@currbox \fi
-    \@tempdima\@mparbottom
-    \advance\@tempdima -\@pageht
-    \advance\@tempdima\ht\@marbox
-    \ifdim\@tempdima >\z@
-      \@latex@warning@no@line {Marginpar on page \thepage\space moved}%
-    \else
-      \@tempdima\z@
-    \fi
-    \global\@mparbottom\@pageht
-    \global\advance\@mparbottom\@tempdima
-    \global\advance\@mparbottom\dp\@marbox
-    \global\advance\@mparbottom\marginparpush
-    \advance\@tempdima -\ht\@marbox
-    \global\setbox \@marbox
-                   \vbox {\vskip \@tempdima
-                          \box \@marbox}%
-    \global \ht\@marbox \z@
-    \global \dp\@marbox \z@
-    \kern -\@pagedp
-    \nointerlineskip
-    \hb@xt@\columnwidth
-      {\if@RTL\beginR\fi\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\marginparsep
-       \else
-          \hskip -\marginparsep \hskip -\marginparwidth
-       \fi
-       \box\@marbox \hss\if@RTL\endR\fi}%
-    \nointerlineskip
-    \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}}
-\def\@stopline{\unskip\@stopfield\if@rjfield \global\@rjfieldfalse
-   \@tempdima\@totalleftmargin \advance\@tempdima\linewidth
-\hbox to\@tempdima{\if@RTL\beginR\fi\@itemfudge\hskip\dimen\@curtabmar
-   \box\@curline\hfil\box\@curfield\if@RTL\endR\fi}\else\@addfield
-   \hbox to\linewidth{\if@RTL\beginR\fi\@itemfudge
-   \hskip\dimen\@curtabmar\box\@curline\hfil\if@RTL\endR\fi}%
-\fi}
-\def\@outputpage{%
-\begingroup           % the \endgroup is put in by \aftergroup
-  \let \protect \noexpand
-  \@resetactivechars
-  \global\let\@@if@newlist\if@newlist
-  \global\@newlistfalse
-  \@parboxrestore
-  \shipout \vbox{%
-    \set@typeset@protect
-    \aftergroup \endgroup
-    \aftergroup \set@typeset@protect
-                                % correct? or just restore by ending
-                                % the group?
-  \if@specialpage
-    \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
-  \fi
-  \if@twoside
-    \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
-         \let\@themargin\oddsidemargin
-    \else \let\@thehead\@evenhead
-       \let\@thefoot\@evenfoot \let\@themargin\evensidemargin
-    \fi
-    \ifx\@thehead\@empty \let\@thehead\hfil \fi
-    \ifx\@thefoot\@empty \let\@thefoot\hfil \fi
-    \else %% not @twoside
-    \ifx\@oddhead\@empty \let\@thehead\hfil \fi
-    \ifx\@oddfoot\@empty \let\@thefoot\hfil \fi
-  \fi
-  \reset@font
-  \normalsize
-  \normalsfcodes
-  \let\label\@gobble
-  \let\index\@gobble
-  \let\glossary\@gobble
-  \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
-    \@begindvi
-    \vskip \topmargin
-    \moveright\@themargin \vbox {%
-      \setbox\@tempboxa \vbox to\headheight{%
-        \vfil
-        \color@hbox
-          \normalcolor
-          \hb@xt@\textwidth{\if@RTLmain\beginR\fi\@thehead\if@RTLmain\endR\fi}%
-        \color@endbox
-        }%                        %% 22 Feb 87
-      \dp\@tempboxa \z@
-      \box\@tempboxa
-      \vskip \headsep
-      \box\@outputbox
-      \baselineskip \footskip
-      \color@hbox
-        \normalcolor
-        \hb@xt@\textwidth{\if@RTLmain\beginR\fi\@thefoot\if@RTLmain\endR\fi}%
-      \color@endbox
-      }%
-    }%
-  \global\let\if@newlist\@@if@newlist
-  \global \@colht \textheight
-  \stepcounter{page}%
-  \let\firstmark\botmark
-}
-\long\def\@makecaption#1#2{%
-  \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1: #2}%
-  \ifdim \wd\@tempboxa >\hsize
-    \if@RTL\beginR\fi#1: #2\if@RTL\endR\fi\par
+  \ifluatex
+    \input{luatex-bidi.def}
   \else
-    \global \@minipagefalse
-    \hb@xt@\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}%
+    \PackageError{bidi}{TeX engines other than XeTeX and LuaTeX are not yet supported}
   \fi
-  \vskip\belowcaptionskip}
-\def\equation{\beginL$$\refstepcounter{equation}}
-\def\endequation{\eqno \hbox{\@eqnnum}$$\endL\@ignoretrue}
-\def\@eqnnum{{\normalfont \normalcolor \if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
-\input{footnote-bidi.def}
-\input{loadingorder-bidi.def}
-\@iftagsloaded{leqno}{\input{leqno-bidi.def}}{}
-\@iftagsloaded{fleqn}{\input{fleqn-bidi.def}}{}
-\@ifpackageloaded{amsmath}{\input{amsmath-bidi.def}}{}
-\@ifpackageloaded{amsthm}{\input{amsthm-bidi.def}}{}
-\@ifpackageloaded{breqn}{\input{breqn-bidi.def}}{}
-\@ifpackageloaded{color}{\input{color-bidi.def}}{}
-\@ifpackageloaded{xcolor}{\input{xcolor-bidi.def}}{}
-\@ifpackageloaded{colortbl}{\input{colortbl-bidi.def}}{}
-\@ifpackageloaded{flowfram}{\input{flowfram-bidi.def}}{}
-\@ifpackageloaded{xltxtra}{\input{xltxtra-bidi.def}}{}
-\@ifpackageloaded{wrapfig}{\input{wrapfig-bidi.def}}{}
-\@ifpackageloaded{graphicx}{\input{graphicx-bidi.def}}{}
-\@ifpackageloaded{hyperref}{\input{hyperref-bidi.def}}{}
-\@ifpackageloaded{fancyhdr}{\input{fancyhdr-bidi.def}}{}
-\@ifpackageloaded{draftwatermark}{\input{draftwatermark-bidi.def}}{}
-\@ifpackageloaded{pdfpages}{\input{pdfpages-bidi.def}}{}
-\@ifpackageloaded{listings}{\input{listings-bidi.def}}{}
-\@ifpackageloaded{pstricks}{\input{pstricks-bidi.def}}{}
-\@ifpackageloaded{tikz}{\input{tikz-bidi.def}}{}
-\@ifpackageloaded{array}{\input{array-bidi.def}}{}
-\@ifpackageloaded{stabular}{\input{stabular-bidi.def}}{}
-\@ifpackageloaded{longtable}{\input{longtable-bidi.def}}{}
-\@ifpackageloaded{arydshln}{\input{arydshln-bidi.def}}{}
-\@ifpackageloaded{multicol}{\input{multicol-bidi.def}}{}
-\@ifpackageloaded{minitoc}{\input{minitoc-bidi.def}}{}
-\@ifpackageloaded{ragged2e}{\input{ragged2e-bidi.def}}{}
-\@ifpackageloaded{tabls}{\input{tabls-bidi.def}}{}
-\@ifpackageloaded{tabulary}{\input{tabulary-bidi.def}}{}
-\@ifpackageloaded{tocstyle}{\input{tocstyle-bidi.def}}{}
-\@ifclassloaded{article}{\input{article-bidi.def}}{}
-\@ifclassloaded{amsart}{\input{amsart-bidi.def}}{}
-\@ifclassloaded{letter}{\input{letter-bidi.def}}{}
-\@ifclassloaded{memoir}{\input{memoir-bidi.def}}{}
-\@ifclassloaded{refrep}{\input{refrep-bidi.def}}{}
-\@ifclassloaded{report}{\@ifpackageloaded{flowfram}{}{\input{report-bidi.def}}}{}
-\@ifclassloaded{rapport3}{\input{rapport3-bidi.def}}{}
-\@ifclassloaded{scrartcl}{\input{scrartcl-bidi.def}}{}
-\@ifclassloaded{scrbook}{\input{scrbook-bidi.def}}{}
-\@ifclassloaded{scrreprt}{\input{scrreprt-bidi.def}}{}
-\@ifclassloaded{amsbook}{\input{amsbook-bidi.def}}{}
-\@ifclassloaded{bookest}{\input{bookest-bidi.def}}{}
-\@ifclassloaded{extbook}{\input{extbook-bidi.def}}{}
-\@ifclassloaded{book}{\@ifpackageloaded{flowfram}{}{\input{book-bidi.def}}}{}
-\@ifpackageloaded{tocbibind}{\@ifclassloaded{memoir}{}{\input{tocbibind-bidi.def}}}{}
-\@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-bidi.def}}}{}
-\ProcessOptions
+\fi
 
+\ProcessOptions
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
index 7a8dd0b3768..dcb383f932e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
@@ -26,79 +26,38 @@
 \lstset{%
     language=[LaTeX]TEX,%
     float=hbp,%
-    basicstyle=\ttfamily, %
+    basicstyle=\ttfamily\small, %
     identifierstyle=\color{black}, %
     keywordstyle=\color{mygreen}, %
     stringstyle=\color{blue}, %
     commentstyle=\color{blue}, %
     columns=flexible, %
+    tabsize=4, %
+    frame=single, %
     extendedchars=true, %
     showspaces=false, %
     showstringspaces=false, %
+    numbers=left,
+    numbersep=12pt,
+    numberstyle=\tiny, %
     breaklines=true, %
     breakautoindent=true,
-    captionpos=t,
-    explpreset={columns=flexible,language=[LaTeX]TEX},
+    captionpos=b,
+    xleftmargin=1em,
+    breaklines=true,
+    backgroundcolor=\color{mybackground},
+    breakautoindent=true,
+    rframe={},
+    explpreset={numbers=left,numberstyle=\tiny,numbersep=12pt,
+    xleftmargin=1em,columns=flexible,language=[LaTeX]TEX},
    morekeywords={setLTR,setLR,setRTL,setRL,LRE,LR,RLE,RL,lr}
 }
-\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20}}
-\lstdefinestyle{code}{backgroundcolor=\color{red!20}}
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstdefinestyle{code}{backgroundcolor=\color{red!20},numbers=left,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
 \lst@UserCommand\lstlistlistingname{List of Examples} % \lstlistoflistings
 \lst@UserCommand\lstlistingname{Example}
-
-\def\lst@Init#1{%
-    \begingroup\if@RTL\@RTLfalse\fi
-    \ifx\lst@float\relax\else
-        \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}%
-        \expandafter\@tempa
-    \fi
-    \ifx\lst@multicols\@empty\else
-        \edef\lst@next{\noexpand\multicols{\lst@multicols}}
-        \expandafter\lst@next
-    \fi
-    \ifhmode\ifinner \lst@boxtrue \fi\fi
-    \lst@ifbox
-        \lsthk@BoxUnsafe
-        \hbox to\z@\bgroup
-             $\if t\lst@boxpos \vtop
-        \else \if b\lst@boxpos \vbox
-        \else \vcenter \fi\fi
-        \bgroup \par\noindent
-    \else
-        \lst@ifdisplaystyle
-            \lst@EveryDisplay
-            \par\penalty-50\relax
-            \vspace\lst@aboveskip
-        \fi
-    \fi
-    \normalbaselines
-    \abovecaptionskip\lst@abovecaption\relax
-    \belowcaptionskip\lst@belowcaption\relax
-    \lst@MakeCaption t%
-    \lsthk@PreInit \lsthk@Init
-    \lst@ifdisplaystyle
-        \global\let\lst@ltxlabel\@empty
-        \if@inlabel
-            \lst@ifresetmargins
-                \leavevmode
-            \else
-                \xdef\lst@ltxlabel{\the\everypar}%
-                \lst@AddTo\lst@ltxlabel{%
-                    \global\let\lst@ltxlabel\@empty
-                    \everypar{\lsthk@EveryLine\lsthk@EveryPar}}%
-            \fi
-        \fi
-        \everypar\expandafter{\lst@ltxlabel
-                              \lsthk@EveryLine\lsthk@EveryPar}%
-    \else
-        \everypar{}\let\lst@NewLine\@empty
-    \fi
-    \lsthk@InitVars \lsthk@InitVarsBOL
-    \lst@Let{13}\lst@MProcessListing
-    \let\lst@Backslash#1%
-    \lst@EnterMode{\lst@Pmode}{\lst@SelectCharTable}%
-    \lst@InitFinalize}
-
 \newcommand\Larg [1]{{\normalfont\itshape#1\/}}
 \newcommand\Larga[1]{$\langle$\Larg{#1}$\rangle$}
 \newcommand\Largb[1]{\lcb\Larg{#1}\rcb}
@@ -139,7 +98,7 @@
 \newsavebox{\boxdef}
 \newenvironment{BDef}
   {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}\if@RTL\@RTLfalse\fi
+      \def\arraystretch{1.0}
       \begin{tabular}{@{}l@{}l@{}l@{}}
   }
   {\end{tabular}\end{lrbox}
@@ -150,7 +109,7 @@
 
 \newenvironment{BDef*}
   {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}\if@RTL\@RTLfalse\fi
+      \def\arraystretch{1.0}
       \begin{tabular}{@{}l@{}l@{}l@{}}
   }
   {\end{tabular}\end{lrbox}
@@ -161,7 +120,7 @@
   \@beginparpenalty-\@lowpenalty
   \topsep\BDefaboveskip
   \fboxsep3pt
-  \flushleft\if@RTL\@RTLfalse\fi}
+  \flushleft}
  {\@endparpenalty\@M
   \@topsepadd\BDefbelowskip
   \endflushleft}
@@ -170,7 +129,7 @@
   \@beginparpenalty\@M
   \topsep\BDefinlineskip
   \fboxsep3pt
-  \flushleft\if@RTL\@RTLfalse\fi}
+  \flushleft}
  {\@endparpenalty5000
   \endflushleft}
 
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
new file mode 100644
index 00000000000..f6692b218c4
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
@@ -0,0 +1,273 @@
+%%
+%% This is file `bidimoderncv.cls',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{bidimoderncv}
+\newif\if@DEBUG\@DEBUGfalse
+\DeclareOption{a4paper}{
+  \setlength\paperheight{297mm}
+  \setlength\paperwidth{210mm}}
+\DeclareOption{a5paper}{
+  \setlength\paperheight{210mm}
+  \setlength\paperwidth{148mm}}
+\DeclareOption{b5paper}{
+  \setlength\paperheight{250mm}
+  \setlength\paperwidth{176mm}}
+\DeclareOption{letterpaper}{
+  \setlength\paperheight{11in}
+  \setlength\paperwidth{8.5in}}
+\DeclareOption{legalpaper}{
+  \setlength\paperheight{14in}
+  \setlength\paperwidth{8.5in}}
+\DeclareOption{executivepaper}{
+  \setlength\paperheight{10.5in}
+  \setlength\paperwidth{7.25in}}
+\DeclareOption{landscape}{
+  \setlength\@tempdima{\paperheight}
+  \setlength\paperheight{\paperwidth}
+  \setlength\paperwidth{\@tempdima}}
+\newcommand\@ptsize{}
+\DeclareOption{10pt}{\renewcommand\@ptsize{0}}
+\DeclareOption{11pt}{\renewcommand\@ptsize{1}}
+\DeclareOption{12pt}{\renewcommand\@ptsize{2}}
+\DeclareOption{draft}{\setlength\overfullrule{5pt}}
+\DeclareOption{final}{\setlength\overfullrule{0pt}}
+\newif\if@colour\@colourtrue
+\DeclareOption{nocolour}{\@colourfalse}
+\ExecuteOptions{a4paper,11pt,colour,final}
+\ProcessOptions\relax
+\input{size1\@ptsize.clo}
+\RequirePackage{color}
+\RequirePackage{graphicx}
+\RequirePackage{ifthen}
+\RequirePackage{marvosym}
+\addtolength{\oddsidemargin}{-54pt}
+\addtolength{\textwidth}{109pt}
+\addtolength{\topmargin}{-70pt}
+\addtolength{\textheight}{122pt}
+\addtolength{\marginparsep}{-5pt}
+\addtolength{\marginparwidth}{-10pt}
+\RequirePackage{url}
+\RequirePackage{hyperref}
+\hypersetup{%
+  breaklinks,
+  baseurl       = http://,%
+  pdfborder     = 0 0 0,%
+  pdfpagemode   = UseNone,%
+  pdfstartpage  = 1}
+\AtEndOfClass{%
+  \AtBeginDocument{%
+    \hypersetup{%
+      pdfauthor     = \@firstname~\@familyname,%
+      pdftitle      = \@title,%
+      pdfsubject    = \@firstname~\@familyname,%
+      pdfkeywords   = \@resumename~\@firstname~\@familyname}}}
+\urlstyle{tt}
+\RequirePackage{fancyhdr}
+\fancypagestyle{plain}{%
+  \renewcommand{\headrulewidth}{0pt}
+  \renewcommand{\footrulewidth}{0pt}
+  \fancyhf{}}
+\pagestyle{plain}
+\setlength\lineskip{1\p@}
+\setlength\normallineskip{1\p@}
+\renewcommand\baselinestretch{}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{0pt}
+\setlength\columnsep{10\p@}
+\setlength\columnseprule{0\p@}
+\pagestyle{empty}
+\pagenumbering{arabic}
+\raggedbottom
+\onecolumn
+\providecommand*{\listitemsymbol}{\textbullet}
+\providecommand*{\addresssymbol}{}
+\providecommand*{\mobilesymbol}{\Mobilefone}
+\providecommand*{\phonesymbol}{\Telefon}
+\providecommand*{\faxsymbol}{\FAX}
+\providecommand*{\emailsymbol}{\Letter}
+\definecolor{firstnamecolor}{rgb}{0,0,0}
+\def\firstnamecolour#1{\gdef\@firstnamecolour{\addfontfeature{Color=#1}}}
+\def\familynamecolour#1{\gdef\@familynamecolour{\addfontfeature{Color=#1}}}
+\def\titlecolour#1{\gdef\@titlecolour{\addfontfeature{Color=#1}}}
+\def\addresscolour#1{\gdef\@addresscolour{\addfontfeature{Color=#1}}}
+\def\quotecolour#1{\gdef\@quotecolour{\addfontfeature{Color=#1}}}
+\def\sectiontitlecolour#1{\gdef\@sectiontitlecolour{\addfontfeature{Color=#1}}}
+\definecolor{sectionrectanglecolor}{rgb}{0,0,0}
+\def\subsectioncolour#1{\gdef\@subsectioncolour{\addfontfeature{Color=#1}}}
+\def\hintcolour#1{\gdef\@hintcolour{\addfontfeature{Color=#1}}}
+\providecommand*{\firstnamefont}{}
+\providecommand*{\familynamefont}{}
+\providecommand*{\titlefont}{}
+\providecommand*{\addressfont}{}
+\providecommand*{\quotefont}{}
+\providecommand*{\sectionfont}{}
+\providecommand*{\subsectionfont}{}
+\providecommand*{\hintfont}{\small}
+\providecommand*{\firstnamestyle}[1]{{\firstnamefont\@firstnamecolour#1}}
+\providecommand*{\familynamestyle}[1]{{\familynamefont\@familynamecolour#1}}
+\providecommand*{\titlestyle}[1]{{\titlefont\@titlecolour#1}}
+\providecommand*{\addresstyle}[1]{{\addressfont\@addresscolour#1}}
+\providecommand*{\quotestyle}[1]{{\quotefont\@quotecolour#1}}
+\providecommand*{\sectionstyle}[1]{{\sectionfont\@sectiontitlecolour#1}}
+\providecommand*{\subsectionstyle}[1]{{\subsectionfont\@subsectioncolour#1}}
+\providecommand*{\hintstyle}[1]{{\hintfont\@hintcolour#1}}
+\newcommand*{\cvtheme}[2][]{
+  \def\@cvtheme{#2}
+  \def\@cvthemeoptions{#1}}
+\cvtheme{bidi-casual}
+\AtBeginDocument{\RequirePackage[\@cvthemeoptions]{cvtheme\@cvtheme}}
+\newcommand*{\resumename}[1]{\def\@resumename{#1}}
+\newcommand*{\firstname}[1]{\def\@firstname{#1}}
+\newcommand*{\familyname}[1]{\def\@familyname{#1}}
+\renewcommand*{\title}[1]{\def\@title{#1}}
+\newcommand*{\address}[1]{\def\@address{#1}}
+\newcommand*{\mobile}[1]{\def\@mobile{#1}}
+\newcommand*{\phone}[1]{\def\@phone{#1}}
+\renewcommand*{\fax}[1]{\def\@fax{#1}}
+\newcommand*{\email}[1]{\def\@email{#1}}
+\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
+\def\@photowidth{0pt}
+\newcommand*{\photo}[2][64pt]{\def\@photowidth{#1}\def\@photo{#2}}
+\newcommand*{\quote}[1]{\def\@quote{#1}}
+\newlength{\quotewidth}
+\newlength{\hintscolumnwidth}
+\newlength{\separatorcolumnwidth}
+\setlength{\separatorcolumnwidth}{0.025\textwidth}
+\newlength{\maincolumnwidth}
+\newlength{\doubleitemmaincolumnwidth}
+\newlength{\listitemsymbolwidth}
+\settowidth{\listitemsymbolwidth}{\listitemsymbol{}~}
+\newlength{\listitemmaincolumnwidth}
+\newlength{\listdoubleitemmaincolumnwidth}
+\newcommand*{\recomputethemelengths}{}
+\newcommand*{\recomputelengths}{%
+\setlength{\quotewidth}{0.65\textwidth}%
+\setlength{\maincolumnwidth}{\textwidth}%
+\addtolength{\maincolumnwidth}{-\separatorcolumnwidth}%
+\addtolength{\maincolumnwidth}{-\hintscolumnwidth}%
+\setlength{\listitemmaincolumnwidth}{\maincolumnwidth}%
+\addtolength{\listitemmaincolumnwidth}{-\listitemsymbolwidth}%
+\setlength{\doubleitemmaincolumnwidth}{\maincolumnwidth}%
+\addtolength{\doubleitemmaincolumnwidth}{-\hintscolumnwidth}%
+\addtolength{\doubleitemmaincolumnwidth}{-\separatorcolumnwidth}%
+\setlength{\doubleitemmaincolumnwidth}{0.5\doubleitemmaincolumnwidth}%
+\setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth}%
+\addtolength{\listdoubleitemmaincolumnwidth}{-\listitemsymbolwidth}%
+\setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}%
+\renewcommand{\headwidth}{\textwidth}%
+\recomputethemelengths}
+\setlength{\hintscolumnwidth}{0.15\textwidth}
+\recomputelengths
+\title{}
+\renewcommand*{\maketitle}{}
+\newcommand*{\section}[1]{%
+\vspace*{2.5ex \@plus 1ex \@minus .2ex}%
+  \phantomsection{}%
+  \addcontentsline{toc}{part}{#1}%
+  \parbox[m]{\hintscolumnwidth}{\raggedleft\hintfont{\leavevmode\color{sectionrectanglecolor}\rule{\hintscolumnwidth}{1ex}}}%
+  \hspace{\separatorcolumnwidth}%
+  \parbox[m]{\maincolumnwidth}{\sectionstyle{#1}}\\[1ex]}
+\newcommand*{\subsection}[1]{%
+  \cvline[0.45em]{}{\subsectionstyle{#1}}}
+\newcommand*{\cvline}[3][.25em]{%
+  \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
+    \raggedleft\hintfont{#2} &{#3}%
+  \end{tabular}\\[#1]}
+\newcommand*{\cvdoubleitem}[4]{%
+ \cvline{#1}{\begin{minipage}[t]{\doubleitemmaincolumnwidth}#2\end{minipage}%
+ \hfill%
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintfont{#3}\end{minipage}\hspace*{\separatorcolumnwidth}\begin{minipage}[t]{\doubleitemmaincolumnwidth}#4\end{minipage}}}
+\newcommand*{\cvlistitem}[2][\listitemsymbol{}]{%
+  \cvline[0pt]{}{#1~\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}}
+\newcommand*{\cvlistdoubleitem}[3][\listitemsymbol{}]{%
+  \cvline[0pt]{}{#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}%
+  \hfill%
+  \ifthenelse{\equal{#3}{}}%
+    {}%
+    {#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}}
+\newcommand*{\cventry}[6]{%
+  \cvline{#1}{%
+    {\bfseries#2}%
+    \ifx#3\else{, {\slshape#3}}\fi%
+    \ifx#4\else{, #4}\fi%
+    \ifx#5\else{, #5}\fi%
+    .%
+    \ifx#6\else{\newline{}\begin{minipage}[t]{\linewidth}\small#6\end{minipage}}\fi
+    }}%
+\newcommand*{\cvlanguage}[3]{%
+  \cvline{#1}{\begin{minipage}[t]{.225\maincolumnwidth}\textbf{#2}\end{minipage}\hfill\begin{minipage}[t]{0.725\maincolumnwidth}\raggedleft\footnotesize\itshape #3\end{minipage}}}
+\newcommand*{\cvcomputer}[4]{%
+  \cvdoubleitem{#1}{\small#2}{#3}{\small#4}}
+\newcommand*{\link}[2][]{%
+  \ifthenelse{\equal{#1}{}}%
+    {\href{#2}{#2}}%
+    {\href{#2}{#1}}}
+\newcommand*{\httplink}[2][]{%
+  \ifthenelse{\equal{#1}{}}%
+    {\href{http://#2}{#2}}%
+    {\href{http://#2}{#1}}}
+\newcommand*{\emaillink}[2][]{%
+  \ifthenelse{\equal{#1}{}}%
+    {\href{mailto:#2}{#2}}%
+    {\href{mailto:#2}{#1}}}
+\newif\if@displaypagenumbers\@displaypagenumberstrue
+\newcommand*{\nopagenumbers}{\@displaypagenumbersfalse}
+\AtBeginDocument{%
+  \if@displaypagenumbers%
+    \@ifundefined{r@lastpage}{}{%
+      \ifthenelse{\pageref{lastpage} > 1}{%
+      \fancypagestyle{plain}{%
+        \fancyfoot[r]{\beginL\addressfont\@quotecolour\footnotesize\thepage\beginL/\endL\pageref{lastpage}\endL}}%
+      \pagestyle{plain}}{}}%
+  \AtEndDocument{\label{lastpage}}%
+  \fi}
+\newlength{\bibindent}
+\setlength{\bibindent}{1.5em}
+\newcommand*{\bibliographyitemlabel}{\includegraphics{bibitem.pdf}}
+\newenvironment{thebibliography}[1]%
+  {%
+    \section{\refname}%
+    \small%
+    \begin{list}{\bibliographyitemlabel}%
+      {%
+        \setlength{\topsep}{0pt}%
+        \setlength{\labelwidth}{\hintscolumnwidth}%
+        \setlength{\labelsep}{\separatorcolumnwidth}%
+        \leftmargin\labelwidth%
+        \advance\leftmargin\labelsep%
+        \@openbib@code%
+        \usecounter{enumiv}%
+        \let\p@enumiv\@empty%
+        \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+        \sloppy\clubpenalty4000\widowpenalty4000%
+  }%
+  {%
+    \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
+    \end{list}%
+  }
+\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}
+\let\@openbib@code\@empty
+
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `bidimoderncv.cls'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
index 06f83b9c3f4..e4ff25a26cd 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bidipoem}%
-[2010/03/01 Environments for typesetting Persian traditional and modern poems]
+[2010/07/25 Environments for typesetting Persian traditional and modern poems]
 \def\poemcolsepskip{.1\versewidth plus .1\versewidth minus .05\versewidth}
 \def\poemmarginskip{1em plus 1fil minus 1em}
 \def\poemextrabaselineskip{0\baselineskip}
diff --git a/Master/texmf-dist/tex/xelatex/bidi/book-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def
index 7adaa49516b..5113e120d38 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/book-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `book-bidi.def',
+%% This is file `book-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,8 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{book-bidi.def}[2010/03/01 v0.2 adaptations for standard book class]
+\ProvidesFile{book-xetex-bidi.def}[2010/07/25 v0.5 bidi adaptations for standard book class for XeTeX engine]
+\@ifclassloaded{bookest}{}{%
   \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -102,7 +103,7 @@
   \end{center}%
   \par
   \vskip 1.5em}
-\fi
+\fi}
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
@@ -152,25 +153,6 @@
     \Huge \bfseries  #1\par\nobreak
     \vskip 40\p@
   }}
-\renewenvironment{thebibliography}[1]
-     {\chapter*{\bibname}%
-      \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
-      \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\@biblabel{#1}}%
-            \rightmargin\labelwidth
-            \advance\rightmargin\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}
 \renewcommand\backmatter{%
   \if@openright
     \cleardoublepage
@@ -178,51 +160,6 @@
     \clearpage
   \fi
   \@mainmatterfalse}
-
-\if@twoside
-  \def\ps@headings{%
-      \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\leftmark\if@RTLmain\endR\fi}%
-      \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markboth {\MakeUppercase{%
- \if@RTLmain\beginR\fi\@chapapp\ \thechapter.\,\,\if@RTLmain\endR\fi%
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-           \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
-          \fi
-        \fi
-        }}{}}%
-    \def\ps@plain{\ps@empty
-\def\@oddfoot{\hfil\thepage\hfil}%
-\let\@evenfoot\@oddfoot
-}
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-\if@RTLmain\beginR\fi\thesection\if@RTLmain\endR\fi\,
-        \ifnum \c@secnumdepth >\z@
-          \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi \ %
-        \fi
-        }}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi}%
-    \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markright {\MakeUppercase{%
-       \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \if@RTLmain\endR\fi %
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-            \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
-          \fi
-        \fi
-        }}}}
-
-\fi
-\pagestyle{headings}
-\def\@idxitem{\par\hangindent -40\p@}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
 %% 
@@ -237,4 +174,4 @@
 %% 
 %% 
 %%
-%% End of file `book-bidi.def'.
+%% End of file `book-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bookest-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/bookest-bidi.def
deleted file mode 100644
index 9969102163e..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/bookest-bidi.def
+++ /dev/null
@@ -1,90 +0,0 @@
-%%
-%% This is file `bookest-bidi.def',
-
-%% 
-%%   __________________________________
-%%   Copyright © 2009-2010 Vafa Khalighi
-%% 
-%%   License information appended.
-%% 
-%% 
-\ProvidesFile{bookest-bidi.def}[2010/03/01 v0.2 adaptations for bookest class]
-\AtBeginDocument{
-\def\@makechapterhead#1{%
-  \vspace*{20\p@}
-  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi \normalfont
-    \ifnum \c@secnumdepth >\m@ne
-      \if@mainmatter
-        {\colorA\huge\scshape \@chapapp\space \thechapter}
-        \par\nobreak
-        \vskip 10\p@
-      \fi
-    \fi
-    \interlinepenalty\@M
-  {\colorB\hrule}
-  \vskip 15\p@
-   \begin{flushleft}
-     {\colorA\Huge \bfseries #1}\par\nobreak
-   \end{flushleft}
-  \vskip 5\p@
-  {\colorB\hrule}
-  \vskip 30\p@
-  }}
-\def\@makeschapterhead#1{%
-  \vspace*{20\p@}
-  {\parindent \z@ \raggedright \normalfont
-  {\colorB\hrule}
-  \vskip 15\p@
-   \begin{center}
-     {\colorA\Huge \bfseries #1}\par\nobreak
-   \end{center}
-  \vskip 5\p@
-  {\colorB\hrule}
-  \vskip 30\p@
-  }}
-\renewcommand{\setevenhead}[1]{\def\@evenhead{#1}}
-\renewcommand{\setoddhead}[1]{\def\@oddhead{#1}}
-\renewcommand{\setevenfoot}[1]{\def\@evenfoot{#1}}
-\renewcommand{\setoddfoot}[1]{\def\@oddfoot{#1}}
-\renewcommand{\oddheadtext}{{\colorA{\slshape\rightmark}\hfill\thepage}}
-\renewcommand{\setoddheadtext}[1]{\renewcommand{\oddheadtext}{#1}}
-\renewcommand{\evenheadtext}{\oddheadtext}
-\renewcommand{\setevenheadtext}[1]{\renewcommand{\evenheadtext}{#1}}
-\renewcommand{\evenfoottext}{}
-\renewcommand{\setevenfoottext}[1]{\renewcommand{\evenfoottext}{#1}}
-\renewcommand{\oddfoottext}{}
-\renewcommand{\setoddfoottext}[1]{\renewcommand{\oddfoottext}{#1}}
-\renewcommand{\setleftmark}[1]{\renewcommand{\leftmark}{#1}}
-\renewcommand{\setrightmark}[1]{\renewcommand{\rightmark}{#1}}
-\renewcommand{\makeheadrule}{{\colorB\hrule\@width\textwidth \@height 0.4pt \vskip-0.4pt}}
-\renewcommand{\makefootrule}{\makeheadrule}
-\if@twoside
-  \setevenheadtext{{\colorA\thepage\hfill\slshape\leftmark}}
-\fi
-\setevenhead{\vbox{\evenheadtext \vskip 5\p@ \makeheadrule}}
-\setoddhead{\vbox{\oddheadtext \vskip 5\p@ \makeheadrule}}
-\let\UCase\MakeUppercase
-\renewcommand{\MakeUppercase}{}
-\def\ps@plain{%
-    \def\@oddfoot{{\hfil\colorA\thepage\hfil}}
-    \def\@evenfoot{{\hfil\colorA\thepage\hfil}}
-    \let\@oddhead\@empty
-    \let\@evenhead\@empty
-}
-}
-\NoHyper
-%% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
-%% 
-%% Distributable under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%% 
-%% This work is "maintained" (as per LPPL maintenance status)
-%% by Vafa Khalighi.
-%% 
-%% 
-%% 
-%% 
-%%
-%% End of file `bookest-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def
new file mode 100644
index 00000000000..382d639cf0f
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def
@@ -0,0 +1,58 @@
+%%
+%% This is file `bookest-xetex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{bookest-xetex-bidi.def}[2010/07/25 v0.4 bidi adaptations for bookest class for XeTeX engine]
+\def\@makechapterhead#1{%
+  \vspace*{20\p@}
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi \normalfont
+    \ifnum \c@secnumdepth >\m@ne
+      \if@mainmatter
+        {\colorA\huge\scshape \@chapapp\space \thechapter}
+        \par\nobreak
+        \vskip 10\p@
+      \fi
+    \fi
+    \interlinepenalty\@M
+  {\colorB\hrule}
+  \vskip 15\p@
+   \if@RTL\begin{flushleft}\else\begin{flushright}\fi
+     {\colorA\Huge \bfseries #1}\par\nobreak
+   \if@RTL\end{flushleft}\else\end{flushright}\fi
+  \vskip 5\p@
+  {\colorB\hrule}
+  \vskip 30\p@
+  }}
+\def\@makeschapterhead#1{%
+  \vspace*{20\p@}
+  {\parindent \z@ \raggedright \normalfont
+  {\colorB\hrule}
+  \vskip 15\p@
+   \begin{center}
+     {\colorA\Huge \bfseries #1}\par\nobreak
+   \end{center}
+  \vskip 5\p@
+  {\colorB\hrule}
+  \vskip 30\p@
+  }}
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `bookest-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/breqn-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def
index d5fd237e0c5..6854f373be3 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/breqn-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `breqn-bidi.def',
+%% This is file `breqn-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{breqn-bidi.def}[2010/03/01 v0.1 adaptations for breqn package]
+\ProvidesFile{breqn-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for breqn package for XeTeX engine]
 \def\@dmath[#1]{\if@RTL\@RTLfalse\fi%
   \everydisplay\expandafter{\the\everydisplay \display@setup}%
   \if@noskipsec \leavevmode \fi
@@ -77,4 +77,4 @@
 %% 
 %% 
 %%
-%% End of file `breqn-bidi.def'.
+%% End of file `breqn-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def
new file mode 100644
index 00000000000..4c9c7ba410a
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def
@@ -0,0 +1,27 @@
+%%
+%% This is file `caption-xetex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\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>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `caption-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/color-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def
index bf1612373c0..0f108ac0f87 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/color-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `color-bidi.def',
+%% This is file `color-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{color-bidi.def}[2010/03/01 v0.1 adaptations for color package]
+\ProvidesFile{color-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for color package for XeTeX engine]
 \long\def\color@b@x#1#2#3{%
  \leavevmode\if@RTL\beginL\fi
  \setbox\z@\hbox{\kern\fboxsep{\set@color\if@RTL\beginR\fi#3\if@RTL\endR\fi}\kern\fboxsep}%
@@ -63,4 +63,4 @@
 %% 
 %% 
 %%
-%% End of file `color-bidi.def'.
+%% End of file `color-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/colortbl-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def
index 1c60f587434..0b41e0c1520 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/colortbl-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `colortbl-bidi.def',
+%% This is file `colortbl-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{colortbl-bidi.def}[2010/03/01 v0.1 adaptations for colortbl package]
+\ProvidesFile{colortbl-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for colortbl package for XeTeX engine]
 \def\CT@setup{%
   \@tempdimb\col@sep
   \@tempdimc\col@sep
@@ -60,4 +60,4 @@
 %% 
 %% 
 %%
-%% End of file `colortbl-bidi.def'.
+%% End of file `colortbl-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
new file mode 100644
index 00000000000..7cf3de727d5
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
@@ -0,0 +1,124 @@
+%%
+%% This is file `cvthemebidicasual.sty',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{cvthemebidicasual}
+\DeclareOption{blue}{}
+\newif\if@colourorange\@colourorangefalse
+\DeclareOption{orange}{\@colourorangetrue}
+\newif\if@colourgreen\@colourgreenfalse
+\DeclareOption{green}{\@colourgreentrue}
+\newif\if@colourred\@colourredfalse
+\DeclareOption{red}{\@colourredtrue}
+\newif\if@colourgrey\@colourgreyfalse
+\DeclareOption{grey}{\@colourgreytrue}
+\DeclareOption*{
+  \PackageWarning{cvthemebidicasual}{Unknown option ‘\CurrentOption’}}
+\ExecuteOptions{colour}
+\ProcessOptions\relax
+\renewcommand*{\listitemsymbol}{\textbullet}
+\definecolor{firstnamecolor}{rgb}{0.65,0.65,0.65}
+\familynamecolour{808080}
+\firstnamecolour{A9A9A9}
+\quotecolour{696969}
+\addresscolour{696969}
+\definecolor{sectionrectanglecolor}{rgb}{0.25,0.50,0.75}
+\sectiontitlecolour{1E90FF}
+\subsectioncolour{4682B4}
+\definecolor{rulecolour}{gray}{0.6}
+\definecolor{footersymbolcolour}{rgb}{0.25,0.50,0.75}
+\definecolor{footersymbolcolor}{rgb}{0.25,0.50,0.75}
+\if@colourorange
+  \definecolor{sectionrectanglecolor}{rgb}{1.00,0.65,0.20}
+  \definecolor{sectionrectanglecolor}{rgb}{1.00,0.65,0.20}
+  \sectiontitlecolour{FF8C00}
+  \subsectioncolour{FF8C00}
+  \definecolor{footersymbolcolour}{rgb}{0.95,0.55,0.15}
+  \definecolor{footersymbolcolor}{rgb}{0.95,0.55,0.15}\fi
+\if@colourgreen
+  \definecolor{sectionrectanglecolor}{rgb}{0.55,0.85,0.35}
+  \definecolor{sectionrectanglecolour}{rgb}{0.55,0.85,0.35}
+  \sectiontitlecolour{008000}
+  \subsectioncolour{008000}
+  \definecolor{footersymbolcolour}{rgb}{0.30,0.65,0.15}
+  \definecolor{footersymbolcolor}{rgb}{0.30,0.65,0.15}\fi
+\if@colourred
+  \definecolor{sectionrectanglecolor}{rgb}{1.00,0.30,0.30}
+  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.30,0.30}
+  \sectiontitlecolour{FF0000}
+  \subsectioncolour{FF0000}
+  \definecolor{footersymbolcolour}{rgb}{0.95,0.20,0.20}
+  \definecolor{footersymbolcolor}{rgb}{0.95,0.20,0.20}\fi
+\if@colourgrey
+  \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75}
+  \definecolor{sectionrectanglecolour}{rgb}{0.75,0.75,0.75}
+  \sectiontitlecolour{808080}
+  \subsectioncolour{808080}
+  \definecolor{footersymbolcolour}{rgb}{0.35,0.35,0.35}
+  \definecolor{footersymbolcolor}{rgb}{0.35,0.35,0.35}\fi
+\renewcommand*{\ttdefault}{pcr}
+\renewcommand*{\firstnamefont}{\fontsize{38}{40}\mdseries\upshape}
+\renewcommand*{\familynamefont}{\firstnamefont}
+\renewcommand*{\addressfont}{\normalsize\mdseries\slshape}
+\renewcommand*{\quotefont}{\large\slshape}
+\renewcommand*{\sectionfont}{\Large\mdseries\upshape}
+\renewcommand*{\subsectionfont}{\large\mdseries\upshape}
+\renewcommand*{\maketitle}{%
+  {\beginL%
+    \ifthenelse{\isundefined{\@photo}}%
+      {}%
+      {{\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
+    \hfill%
+    \raggedleft{\if@RTL\beginR\fi\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}\if@RTL\endR\fi}\endL\\[-.35em]}%
+   {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}%
+  \ifthenelse{\isundefined{\@quote}}%
+    {}%
+    {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}%
+  }%
+\newif\if@firstfooterelement\@firstfooterelementtrue
+\providecommand*{\footersymbol}{}
+\renewcommand*{\footersymbol}{%
+  \if@firstfooterelement%
+  \else%
+    { ~~\color{footersymbolcolor}\textbullet~~~}\fi}
+\providecommand*{\makefooter}{}
+\renewcommand*{\makefooter}{%
+  \fancypagestyle{plain}{%
+    \fancyfoot[c]{%
+      \parbox{0.8\textwidth}{%
+      \centering%
+      \addressfont\@addresscolour%
+      \ifthenelse{\isundefined{\@address}}{}{%
+        \if@RTLmain\beginR\fi\addresssymbol~\@address\if@RTLmain\endR\fi\\%
+        \@firstfooterelementfalse}%
+      \if@RTLmain\beginR\fi\ifthenelse{\isundefined{\@mobile}}{}{\if@RTLmain\beginR\fi\mobilesymbol~\@mobile\if@RTLmain\endR\fi\@firstfooterelementfalse}%
+      \ifthenelse{\isundefined{\@phone}}{}{\footersymbol\if@RTLmain\beginR\fi\phonesymbol~\@phone\if@RTLmain\endR\fi\@firstfooterelementfalse}%
+      \ifthenelse{\isundefined{\@fax}}{}{\footersymbol\if@RTLmain\beginR\fi\faxsymbol~\@fax\if@RTLmain\endR\fi\@firstfooterelementfalse}%
+      \ifthenelse{\isundefined{\@email}}{}{\footersymbol\if@RTLmain\beginR\fi\emailsymbol~\emaillink{\@email}\if@RTLmain\endR\fi\@firstfooterelementfalse}%
+      \ifthenelse{\isundefined{\@extrainfo}}{}{\if@RTLmain\beginR\fi\footersymbol\@extrainfo\if@RTLmain\endR\fi\@firstfooterelementfalse}\if@RTLmain\endR\fi}}%
+  }%
+  \pagestyle{plain}}
+\AtBeginDocument{\makefooter}
+
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `cvthemebidicasual.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty
new file mode 100644
index 00000000000..d2ff4eed4d5
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty
@@ -0,0 +1,131 @@
+%%
+%% This is file `cvthemebidiclassic.sty',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{cvthemebidiclassic}
+\DeclareOption{blue}{}
+\newif\if@colourorange\@colourorangefalse
+\DeclareOption{orange}{\@colourorangetrue}
+\newif\if@colourgreen\@colourgreenfalse
+\DeclareOption{green}{\@colourgreentrue}
+\newif\if@colourred\@colourredfalse
+\DeclareOption{red}{\@colourredtrue}
+\newif\if@colourgrey\@colourgreyfalse
+\DeclareOption{grey}{\@colourgreytrue}
+\DeclareOption*{
+  \PackageWarning{cvthemebidiclassic}{Unknown option ‘\CurrentOption’}}
+\ExecuteOptions{colour}
+\ProcessOptions\relax
+\renewcommand*{\listitemsymbol}{\textbullet}
+\firstnamecolour{}
+\familynamecolour{}
+\titlecolour{808080}
+\quotecolour{696969}
+\addresscolour{696969}
+\definecolor{sectionrectanglecolour}{rgb}{0.25,0.50,0.75}
+\definecolor{sectionrectanglecolor}{rgb}{0.25,0.5,0.75}
+\sectiontitlecolour{1E90FF}
+\subsectioncolour{4682B4}
+\if@colourorange
+  \addresscolour{FF8C00}
+  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.65,0.20}
+  \definecolor{sectionrectanglecolor}{rgb}{1,0.65,0.20}
+  \sectiontitlecolour{FF8C00}
+  \subsectioncolour{FF8C00}\fi
+\if@colourgreen
+  \addresscolour{008000}
+  \definecolor{sectionrectanglecolour}{rgb}{0.55,0.85,0.35}
+  \definecolor{sectionrectanglecolor}{rgb}{0.55,0.85,0.35}
+  \sectiontitlecolour{008000}
+  \subsectioncolour{008000}\fi
+\if@colourred
+  \addresscolour{FF0000}
+  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.30,0.30}
+  \definecolor{sectionrectanglecolor}{rgb}{1.00,0.30,0.30}
+  \sectiontitlecolour{FF0000}
+  \subsectioncolour{FF0000}\fi
+\if@colourgrey
+  \addresscolour{808080}
+  \definecolor{sectionrectanglecolour}{rgb}{0.75,0.75,0.75}
+  \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75}
+  \sectiontitlecolour{808080}
+  \subsectioncolour{808080}\fi
+\renewcommand*{\ttdefault}{pcr}
+\renewcommand*{\firstnamefont}{\fontsize{34}{36}\mdseries\upshape}
+\renewcommand*{\titlefont}{\LARGE\mdseries\slshape}
+\renewcommand*{\addressfont}{\normalsize\mdseries\slshape}
+\renewcommand*{\familynamefont}{\firstnamefont}
+\renewcommand*{\quotefont}{\large\slshape}
+\renewcommand*{\sectionfont}{\Large\mdseries\upshape}
+\renewcommand*{\subsectionfont}{\large\mdseries\upshape}
+\newlength{\maketitlenamemaxwidth}
+\setlength{\maketitlenamemaxwidth}{.525\textwidth}
+\newlength{\maketitlenamefullwidth}
+\settowidth{\maketitlenamefullwidth}{\firstnamestyle{\@firstname~}\familynamestyle{\@familyname}}
+\newlength{\maketitlenamewidth}
+\ifnum\maketitlenamemaxwidth<\maketitlenamefullwidth\setlength{\maketitlenamewidth}{\maketitlenamemaxwidth}\else\setlength{\maketitlenamewidth}{\maketitlenamefullwidth}\fi
+\newlength{\maketitlepicturewidth}
+\setlength{\maketitlepicturewidth}{\@photowidth}
+\newlength{\maketitledetailswidth}
+\renewcommand*{\recomputethemelengths}{%
+  \setlength{\maketitledetailswidth}{\textwidth}%
+  \addtolength{\maketitledetailswidth}{-\maketitlenamewidth}%
+  \addtolength{\maketitledetailswidth}{-\separatorcolumnwidth}%
+  \addtolength{\maketitledetailswidth}{-\maketitlepicturewidth}}
+\recomputethemelengths
+\newif\if@firstdetailselement\@firstdetailselementtrue
+\newcommand*{\maketitledetailsnewline}{
+  \if@firstdetailselement%
+    \@firstdetailselementfalse%
+  \else%
+    \\[.2em]\fi}
+\renewcommand*{\maketitle}{%
+  % name and title
+  \begin{minipage}[b]{\maketitlenamewidth}%
+    \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}%
+    \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
+  \end{minipage}%
+  % optional data
+  \begin{minipage}[b]{\maketitledetailswidth}%
+    \raggedleft\addressfont\@addresscolour%
+   \ifthenelse{\isundefined{\@address}}{}{%
+      \maketitledetailsnewline%
+      \addresssymbol~\\\@address}%
+    \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol~\@mobile}%
+    \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol~\@phone}%
+    \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol~\@fax}%
+    \ifthenelse{\isundefined{\@email}}{}{\maketitledetailsnewline\emailsymbol~\emaillink{\@email}}%
+    \ifthenelse{\isundefined{\@extrainfo}}{}{\maketitledetailsnewline\@extrainfo}%
+  \end{minipage}%
+  % optional photo
+  \ifthenelse{\isundefined{\@photo}}%
+    {}%
+    {\hspace*{\separatorcolumnwidth}\color{firstnamecolor}\framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}}\\[3em]%
+  % optional quote
+  \ifthenelse{\isundefined{\@quote}}%
+    {}%
+    {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}%
+  }
+
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `cvthemebidiclassic.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def
index 51ec5a6fb31..4cd997a2ec4 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `draftwatermark-bidi.def',
+%% This is file `draftwatermark-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{draftwatermark-bidi.def}[2010/03/01 v0.2 adaptations for draftwatermark package]
+\ProvidesFile{draftwatermark-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for draftwatermark package for XeTeX engine]
 \renewcommand\SetWatermarkText[1]{%
   \def\sc@wm@text{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi}}
 %% 
@@ -25,4 +25,4 @@
 %% 
 %% 
 %%
-%% End of file `draftwatermark-bidi.def'.
+%% End of file `draftwatermark-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extbook-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def
index 9f25e652eb1..c56e0893c8c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/extbook-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `extbook-bidi.def',
+%% This is file `extbook-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{extbook-bidi.def}[2010/03/01 v0.1 adaptations for extbook class]
+\ProvidesFile{extbook-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for extbook class for XeTeX engine]
   \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -152,25 +152,6 @@
     \Huge \bfseries  #1\par\nobreak
     \vskip 40\p@
   }}
-\renewenvironment{thebibliography}[1]
-     {\chapter*{\bibname}%
-      \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
-      \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\@biblabel{#1}}%
-            \rightmargin\labelwidth
-            \advance\rightmargin\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}
 \renewcommand\backmatter{%
   \if@openright
     \cleardoublepage
@@ -178,50 +159,6 @@
     \clearpage
   \fi
   \@mainmatterfalse}
-\if@twoside
-  \def\ps@headings{%
-      \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\leftmark\if@RTLmain\endR\fi}%
-      \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markboth {\MakeUppercase{%
- \if@RTLmain\beginR\fi\@chapapp\ \thechapter.\,\,\if@RTLmain\endR\fi%
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-           \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
-          \fi
-        \fi
-        }}{}}%
-    \def\ps@plain{\ps@empty
-\def\@oddfoot{\hfil\thepage\hfil}%
-\let\@evenfoot\@oddfoot
-}
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-\if@RTLmain\beginR\fi\thesection\if@RTLmain\endR\fi\,
-        \ifnum \c@secnumdepth >\z@
-          \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi \ %
-        \fi
-        }}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi}%
-    \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markright {\MakeUppercase{%
-       \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \if@RTLmain\endR\fi %
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-            \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
-          \fi
-        \fi
-        }}}}
-
-\fi
-\pagestyle{headings}
-\def\@idxitem{\par\hangindent -40\p@}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
 %% 
@@ -236,4 +173,4 @@
 %% 
 %% 
 %%
-%% End of file `extbook-bidi.def'.
+%% End of file `extbook-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def
index a8c0fb77c44..24be58e219e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `fancyhdr-bidi.def',
+%% This is file `fancyhdr-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{fancyhdr-bidi.def}[2010/03/01 v0.2 adaptations for fancyhdr package]
+\ProvidesFile{fancyhdr-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for fancyhdr package for XeTeX engine]
 \def\@fancyhead#1#2#3#4#5{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi\hbox to\headwidth{\fancy@reset
   \@fancyvbox\headheight{\hbox
     {\rlap{\parbox[b]{\headwidth}{\if@RTLmain\raggedleft\else\raggedright\fi\if@RTLmain\beginR\fi#2\if@RTLmain\endR\fi}}\hfill
@@ -33,4 +33,4 @@
 %% 
 %% 
 %%
-%% End of file `fancyhdr-bidi.def'.
+%% End of file `fancyhdr-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fleqn-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def
index cb0fb2e1765..42988d14205 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fleqn-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `fleqn-bidi.def',
+%% This is file `fleqn-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{fleqn-bidi.def}[2010/03/01 v0.1 adaptations for fleqn tag]
+\ProvidesFile{fleqn-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for fleqn tag for XeTeX engine]
 \renewcommand\[{\relax
                 \ifmmode\@badmath
                 \else
@@ -52,4 +52,4 @@
 %% 
 %% 
 %%
-%% End of file `fleqn-bidi.def'.
+%% End of file `fleqn-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/flowfram-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def
index ba1aca3f617..c466ca32872 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/flowfram-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `flowfram-bidi.def',
+%% This is file `flowfram-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{flowfram-bidi.def}[2010/03/01 v0.1 adaptations for flowfram package]
+\ProvidesFile{flowfram-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for flowfram package for XeTeX engine]
 \def\@outputdblcol{%
 \@nxtcol=\c@thisframe
 \c@curpg=\c@page
@@ -152,4 +152,4 @@
 %% 
 %% 
 %%
-%% End of file `flowfram-bidi.def'.
+%% End of file `flowfram-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pstricks-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/footnote-luatex-bidi.def
index 96e9fce73dd..f07784e623d 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pstricks-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/footnote-luatex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `pstricks-bidi.def',
+%% This is file `footnote-luatex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,8 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{pstricks-bidi.def}[2010/03/01 v0.1 adaptations for pstricks package]
-\def\pspicture{\begingroup\@RTLfalse\pst@ifstar\pst@picture}%
+\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>
 %% 
@@ -24,4 +23,4 @@
 %% 
 %% 
 %%
-%% End of file `pstricks-bidi.def'.
+%% End of file `footnote-luatex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnote-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def
index 9ce5054aeeb..855a34bf08e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/footnote-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `footnote-bidi.def',
+%% This is file `footnote-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{footnote-bidi.def}[2010/03/01 v0.4 footnote macros for bidi package]
+\ProvidesFile{footnote-xetex-bidi.def}[2010/07/25 v0.4 bidi footnote macros for XeTeX engine]
 \if@RTLmain\@RTL@footnotetrue\else\@RTL@footnotefalse\fi
 \def\bidi@footnote@output{{%
     \dimen0=\ht\footins
@@ -253,4 +253,4 @@
 %% 
 %% 
 %%
-%% End of file `footnote-bidi.def'.
+%% End of file `footnote-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/graphicx-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def
index 71b4c27904e..961aef11f4b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/graphicx-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `graphicx-bidi.def',
+%% This is file `graphicx-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{graphicx-bidi.def}[2010/03/01 v0.3 adaptations for graphicx package]
+\ProvidesFile{graphicx-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for graphicx package for XeTeX engine]
 \def\Grot@box@std#1#2{\ifmmode\else\if@RTL\beginL\fi\fi%
   \Grot@setangle{#1}%
   \setbox\z@\hbox{{\ifmmode\if@RTL\beginR\fi#2\if@RTL\endR\fi\else\if@RTL\beginR\fi#2\if@RTL\endR\fi\fi}}%
@@ -127,4 +127,4 @@
 %% 
 %% 
 %%
-%% End of file `graphicx-bidi.def'.
+%% End of file `graphicx-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/hyperref-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def
index a5e3d744ced..9abd39f87bb 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/hyperref-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `hyperref-bidi.def',
+%% This is file `hyperref-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{hyperref-bidi.def}[2010/03/01 v0.2 adaptations for hyperref package]
+\ProvidesFile{hyperref-xetex-bidi.def}[2010/07/25 v0.4 bidi adaptations for hyperref package for XeTeX engine]
 \AtBeginDocument{%
 \def\contentsline#1#2#3#4{%
   \ifx\\#4\\%
@@ -175,7 +175,7 @@
     \ifhmode\spacefactor\@x@sf\fi
     \relax
   }%
-  \let\maketitle\HyOrg@maketitle
+  \let\HyOrg@maketitle\maketitle
   \def\maketitle{%
     \let\Hy@saved@footnotemark\@footnotemark
     \let\Hy@saved@footnotetext\@footnotetext
@@ -249,4 +249,4 @@
 %% 
 %% 
 %%
-%% End of file `hyperref-bidi.def'.
+%% End of file `hyperref-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/leqno-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def
index c7beb947669..eb576128696 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/leqno-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `leqno-bidi.def',
+%% This is file `leqno-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{leqno-bidi.def}[2010/03/01 v0.1 adaptations for leqno tag]
+\ProvidesFile{leqno-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for leqno tag for XeTeX engine]
 \renewcommand\@eqnnum{\hb@xt@.01\p@{}%
                       \rlap{\normalfont\normalcolor
                         \hskip -\displaywidth\if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
@@ -26,4 +26,4 @@
 %% 
 %% 
 %%
-%% End of file `leqno-bidi.def'.
+%% End of file `leqno-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/letter-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def
index 8d1a312e2f8..0c0dce9fee8 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/letter-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `letter-bidi.def',
+%% This is file `letter-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{letter-bidi.def}[2010/03/01 v0.1 adaptations for standard letter class]
+\ProvidesFile{letter-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for standard letter class for XeTeX engine]
 \renewcommand*{\opening}[1]{\ifx\@empty\fromaddress
   \thispagestyle{firstpage}%
     {\if@RTL\raggedright\else\raggedleft\fi\@date\par}%
@@ -36,4 +36,4 @@
 %% 
 %% 
 %%
-%% End of file `letter-bidi.def'.
+%% End of file `letter-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/listings-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def
index 1d15dce14b0..9a2eee4a73a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/listings-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `listings-bidi.def',
+%% This is file `listings-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{listings-bidi.def}[2010/03/01 v0.2 adaptations for listings package]
+\ProvidesFile{listings-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for listings package for XeTeX engine]
 \long\def\@makecaption#1#2{%
  \vskip 10pt%
  \setbox\@tempboxa\hbox{#1: #2}%
@@ -17,6 +17,16 @@
 to\hsize{\if@RTLmain\beginR\fi\hfil\box\@tempboxa\hfil%
 \if@RTLmain\endR\fi}%
  \fi}
+\AtBeginDocument{
+\def\SepMark#1{\gdef\@SepMark{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi}}
+\SepMark{.}
+  \@ifundefined{thechapter}{\let\lst@ifnumberbychapter\iffalse}{}
+  \lst@ifnumberbychapter
+      \gdef\thelstlisting%
+           {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@lstlisting}
+  \else
+      \gdef\thelstlisting{\@arabic\c@lstlisting}
+  \fi}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
 %% 
@@ -31,4 +41,4 @@ to\hsize{\if@RTLmain\beginR\fi\hfil\box\@tempboxa\hfil%
 %% 
 %% 
 %%
-%% End of file `listings-bidi.def'.
+%% End of file `listings-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def
index dcfde485603..4ee1e07497a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{loadingorder-bidi.def}[2010/03/01 v0.1 making sure that bidi is the last package loaded]
+\ProvidesFile{loadingorder-bidi.def}[2010/07/25 v0.4 making sure that bidi is the last package loaded]
 \newcommand\bidi@isloaded[2][]{
   \expandafter\ifx\csname if@bidi@#2loaded@\endcsname\relax
     \expandafter\newif\csname if@bidi@#2loaded@\endcsname
@@ -19,6 +19,7 @@
 \bidi@isloaded{amsmath}
 \bidi@isloaded{amsthm}
 \bidi@isloaded{breqn}
+\bidi@isloaded{caption}
 \bidi@isloaded{color}
 \bidi@isloaded{xcolor}
 \bidi@isloaded{colortbl}
@@ -33,9 +34,11 @@
 \bidi@isloaded{pdfpages}
 \bidi@isloaded{listings}
 \bidi@isloaded{pstricks}
+\bidi@isloaded{pgf}
 \bidi@isloaded{tikz}
 \bidi@isloaded{array}
 \bidi@isloaded{stabular}
+\bidi@isloaded{subfigure}
 \bidi@isloaded{supertabular}
 \bidi@isloaded{xtab}
 \bidi@isloaded{longtable}
@@ -60,6 +63,9 @@
   \if@bidi@breqnloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package breqn after bidi package. Please load package breqn before bidi package, and then try to run xelatex on your document again}{}]{breqn}
   \fi%
+  \if@bidi@captionloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package caption after bidi package. Please load package caption before bidi package, and then try to run xelatex on your document again}{}]{caption}
+  \fi%
   \if@bidi@colorloaded@\else
   \@ifpackageloaded{hyperref}{}{%
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package color after bidi package. Please load package color before bidi package, and then try to run xelatex on your document again}{}]{color}}
@@ -103,6 +109,9 @@
   \if@bidi@pstricksloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pstricks after bidi package. Please load package pstricks before bidi package, and then try to run xelatex on your document again}{}]{pstricks}
   \fi%
+  \if@bidi@pgfloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pgf after bidi package. Please load package pgf before bidi package, and then try to run xelatex on your document again}{}]{pgf}
+  \fi%
   \if@bidi@tikzloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tikz after bidi package. Please load package tikz before bidi package, and then try to run xelatex on your document again}{}]{tikz}
   \fi%
@@ -112,6 +121,9 @@
   \if@bidi@stabularloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package stabular after bidi package. Please load package stabular before bidi package, and then try to run xelatex on your document again}{}]{stabular}
   \fi%
+  \if@bidi@subfigureloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package subfigure after bidi package. Please load package subfigure before bidi package, and then try to run xelatex on your document again}{}]{subfigure}
+  \fi%
   \if@bidi@supertabularloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package supertabular after bidi package. Please load package supertabular before bidi package, and then try to run xelatex on your document again}{}]{supertabular}
   \fi%
diff --git a/Master/texmf-dist/tex/xelatex/bidi/longtable-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def
index 53d583ecda0..fbadba5032e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/longtable-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `longtable-bidi.def',
+%% This is file `longtable-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{longtable-bidi.def}[2010/03/01 v0.2 adaptations for longtable package]
+\ProvidesFile{longtable-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for longtable package for XeTeX engine]
 \def\LT@makecaption#1#2#3{%
   \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{%
     \sbox\@tempboxa{\if@RTL\beginR\fi#1{#2: }#3\if@RTL\endR\fi}%
@@ -33,4 +33,4 @@
 %% 
 %% 
 %%
-%% End of file `longtable-bidi.def'.
+%% End of file `longtable-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/luatex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/luatex-bidi.def
new file mode 100644
index 00000000000..933132ac794
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/luatex-bidi.def
@@ -0,0 +1,30 @@
+%%
+%% This is file `luatex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{luatex-bidi.def}[2010/07/25 v0.1 bidi adaptations  for LuaTeX engine]
+\directlua { tex.enableprimitives('',tex.extraprimitives()) }
+
+\input{footnote-luatex-bidi.def}
+
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `luatex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/memoir-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/memoir-bidi.def
deleted file mode 100644
index 0f92a04494d..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/memoir-bidi.def
+++ /dev/null
@@ -1,80 +0,0 @@
-%%
-%% This is file `memoir-bidi.def',
-
-%% 
-%%   __________________________________
-%%   Copyright © 2009-2010 Vafa Khalighi
-%% 
-%%   License information appended.
-%% 
-%% 
-\ProvidesFile{memoir-bidi.def}[2010/03/01 v0.2 adaptations for memoir class]
-\renewcommand{\keepthetitle}{%
-  \@bsmtitlempty
-  \global\let\thanks\relax
-  \global\let\LTRthanks\relax
-  \global\let\RTLthanks\relax
-  \global\let\and\relax
-  \global\let\andnext\relax
-  \global\let\@thanks\@empty
-  \global\let\@title\@empty
-  \global\let\@author\@empty
-  \global\let\@date\@empty}
-\renewcommand{\maketitle}{\par
-  \begingroup
-    \@bsmarkseries
-    \def\@makefnmark{\@textsuperscript{%
-       \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}%
-    \long\def\@makefntext##1{\makethanksmark ##1}
-    \if@twocolumn
-      \ifnum \col@number=\@ne
-        \@maketitle
-      \else
-        \twocolumn[\@maketitle]%
-      \fi
-    \else
-      \ifdim\pagetotal>\z@
-        \newpage
-      \fi
-      \global\@topnum\z@
-      \@maketitle
-    \fi
-    \thispagestyle{title}\@thanks
-  \endgroup
-  \@bscontmark  %  \setcounter{footnote}{0}%
-  }
-\renewcommand*{\memRTLleftskip}{\if@RTL\rightskip\else\leftskip\fi}
-\renewcommand*{\memRTLrightskip}{\if@RTL\leftskip\else\rightskip\fi}
-\renewcommand*{\memRTLvleftskip}{\if@RTL\vrightskip\else\vleftskip\fi}
-\renewcommand*{\memRTLvrightskip}{\if@RTL\vleftskip\else\vrightskip\fi}
-\renewcommand*{\memRTLraggedright}{\if@RTL\raggedleft\else\raggedright\fi}
-\renewcommand*{\memRTLraggedleft}{\if@RTL\raggedright\else\raggedleft\fi}
-\renewcommand*{\thesection}{\thechapter\@SepMark\@arabic\c@section}
-\renewcommand*{\thesubsection}{%
-              \thesection\@SepMark\@arabic\c@subsection}
-\renewcommand*{\thesubsubsection}{%
-              \thesubsection\@SepMark\@arabic\c@subsubsection}
-\renewcommand*{\theparagraph}{%
-              \thesubsubsection\@SepMark\@arabic\c@paragraph}
-\renewcommand*{\thesubparagraph}{%
-              \theparagraph\@SepMark\@arabic\c@subparagraph}
-\renewcommand{\setthesection}{\thechapter\@SepMark\Alph{section}}
-\renewcommand{\theequation}{%
-  \ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
-\renewcommand{\thefigure}{\thechapter\@SepMark\@arabic\c@figure}
-\renewcommand{\thetable}{\thechapter\@SepMark\@arabic\c@table}
-%% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
-%% 
-%% Distributable under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%% 
-%% This work is "maintained" (as per LPPL maintenance status)
-%% by Vafa Khalighi.
-%% 
-%% 
-%% 
-%% 
-%%
-%% End of file `memoir-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def
new file mode 100644
index 00000000000..2286747db37
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def
@@ -0,0 +1,177 @@
+%%
+%% This is file `memoir-xetex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{memoir-xetex-bidi.def}[2010/07/25 v0.4 bidi adaptations for memoir class for XeTeX engine]
+\renewcommand{\keepthetitle}{%
+  \@bsmtitlempty
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\and\relax
+  \global\let\andnext\relax
+  \global\let\@thanks\@empty
+  \global\let\@title\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty}
+\renewcommand{\maketitle}{\par
+  \begingroup
+    \@bsmarkseries
+    \def\@makefnmark{\@textsuperscript{%
+       \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}%
+    \long\def\@makefntext##1{\makethanksmark ##1}
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \ifdim\pagetotal>\z@
+        \newpage
+      \fi
+      \global\@topnum\z@
+      \@maketitle
+    \fi
+    \thispagestyle{title}\@thanks
+  \endgroup
+  \@bscontmark  %  \setcounter{footnote}{0}%
+  }
+\renewcommand*{\memRTLleftskip}{\if@RTL\rightskip\else\leftskip\fi}
+\renewcommand*{\memRTLrightskip}{\if@RTL\leftskip\else\rightskip\fi}
+\renewcommand*{\memRTLvleftskip}{\if@RTL\vrightskip\else\vleftskip\fi}
+\renewcommand*{\memRTLvrightskip}{\if@RTL\vleftskip\else\vrightskip\fi}
+\renewcommand*{\memRTLraggedright}{\if@RTL\raggedleft\else\raggedright\fi}
+\renewcommand*{\memRTLraggedleft}{\if@RTL\raggedright\else\raggedleft\fi}
+\renewcommand*{\thesection}{\thechapter\@SepMark\@arabic\c@section}
+\renewcommand*{\thesubsection}{%
+              \thesection\@SepMark\@arabic\c@subsection}
+\renewcommand*{\thesubsubsection}{%
+              \thesubsection\@SepMark\@arabic\c@subsubsection}
+\renewcommand*{\theparagraph}{%
+              \thesubsubsection\@SepMark\@arabic\c@paragraph}
+\renewcommand*{\thesubparagraph}{%
+              \theparagraph\@SepMark\@arabic\c@subparagraph}
+\renewcommand{\setthesection}{\thechapter\@SepMark\Alph{section}}
+\renewcommand{\theequation}{%
+  \ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
+\renewcommand{\thefigure}{\thechapter\@SepMark\@arabic\c@figure}
+\renewcommand{\thetable}{\thechapter\@SepMark\@arabic\c@table}
+\ifartopt
+  \chapterstyle{article}
+  \counterwithout{figure}{chapter}
+  \counterwithout{table}{chapter}
+  \counterwithout{footnote}{chapter}
+  \counterwithout{equation}{chapter}
+  \renewcommand{\chaptername}{}
+  \renewcommand{\maketitlehookb}{%
+    \vskip -1.5\topsep\vskip -1.5\partopsep}
+  \renewcommand{\maketitlehookc}{%
+    \vskip -1.5\topsep\vskip -1.5\partopsep}
+\fi
+\long\def\@makecaption#1#2{\let\@memtempa\relax
+  \ifdim\prevdepth>-99\p@ \vskip\abovecaptionskip
+  \else \def\@memtempa{\vbox to\topskip{}}\fi
+  \let\@contfnote\footnote \renewcommand{\footnote}[2][]{}
+  \let\@contfmark\footnotemark \renewcommand{\footnotemark}[1][]{}
+  \sbox\@tempboxa{\@contnfont #1\@contdelim \@conttfont #2\@contfinal}
+  \let\footnote\@contfnote
+  \let\footnotemark\@contfmark
+  \ifdim\wd\@tempboxa<\linewidth \centering \fi
+  \if@contcw
+    \centering
+    \parbox{\@contcwidth}{%
+    \ifdim\wd\@tempboxa<\@contcwidth \centering \fi
+  \fi
+  \ifdim\wd\@tempboxa<\linewidth
+    \@contpre
+    {\@contnfont #1\@contdelim}\@memtempa
+    {\@contcshortstyle \@conttfont #2\@contfinal\par}
+  \else
+    \if@conthang
+      \sbox\@tempboxa{\@contnfont #1\@contdelim}
+      \@contpre%
+      {\@contcstyle\hangindent=\wd\@tempboxa
+       \noindent\box\@tempboxa\@memtempa \@conttfont #2\@contfinal\par}
+    \else
+      \if@contindent
+        \@contpre%
+        {\@contnfont #1\@contdelim}\@memtempa
+        {\@contcstyle\hangindent=\@contindw
+                     \hangafter=\@ne\@conttfont #2\@contfinal\par}% <- v1.4
+      \else
+        \@contpre%
+        {\@contnfont #1\@contdelim}\@memtempa
+        {\@contcstyle \@conttfont #2\@contfinal\par}
+      \fi
+    \fi
+  \fi
+  \@contpost
+  \if@contcw
+    \par
+    }  % end of the \parbox
+  \fi
+  \vskip\belowcaptionskip}
+\@ifpackageloaded{caption}{%
+\AtBeginPackage{caption}{
+\ClassWarningNoLine{memoir}{%
+  You are using the caption package with the memoir \MessageBreak
+  class. This may cause unexpected or inconsistent \MessageBreak
+  results if you use any of memoir's captioning facilities}
+
+\long\def\@makecaption##1##2{%
+  \vskip\abovecaptionskip
+  \sbox\@tempboxa{\if@RTL\beginR\fi##1: ##2\if@RTL\endR\fi}%
+  \ifdim \wd\@tempboxa >\hsize
+    \if@RTL\beginR\fi##1: ##2\if@RTL\endR\fi\par
+  \else
+    \global \@minipagefalse
+    \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+  \fi
+  \vskip\belowcaptionskip}
+
+\def\caption{%
+   \ifx\@captype\@undefined
+     \@latex@error{\noexpand\caption outside float}\@ehd
+     \expandafter\@gobble
+   \else
+     \refstepcounter\@captype
+     \expandafter\@firstofone
+   \fi
+   {\@dblarg{\@caption\@captype}}%
+}
+
+\long\def\@caption##1[##2]##3{%
+  \par
+  \addcontentsline{\csname ext@##1\endcsname}{##1}%
+    {\protect\numberline{\csname the##1\endcsname}{\ignorespaces ##2}}%
+  \begingroup
+    \@parboxrestore
+    \if@minipage
+      \@setminipage
+    \fi
+    \normalsize
+    \@makecaption{\csname fnum@##1\endcsname}{\ignorespaces ##3}\par
+  \endgroup}
+}}{}
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `memoir-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/minitoc-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def
index 4713bc7d33f..2940b4355f2 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/minitoc-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `minitoc-bidi.def',
+%% This is file `minitoc-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{minitoc-bidi.def}[2010/03/01 v0.1 adaptations for minitoc package]
+\ProvidesFile{minitoc-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for minitoc package for XeTeX engine]
 \def\@undottedtocline#1#2#3#4#5{%
   \ifnum #1>\c@tocdepth\relax \else
   \vskip \z@ plus.2\p@
@@ -60,4 +60,4 @@
 %% 
 %% 
 %%
-%% End of file `minitoc-bidi.def'.
+%% End of file `minitoc-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/multicol-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
index 2d0545b0b53..b8bd151746f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/multicol-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `multicol-bidi.def',
+%% This is file `multicol-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{multicol-bidi.def}[2010/03/01 v0.1 adaptations for multicol package]
+\ProvidesFile{multicol-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for multicol package for XeTeX engine]
 \def\revprocess@cols#1#2{\count@\doublecol@number\relax
 \advance\count@ by -2
      \loop #2%
@@ -168,4 +168,4 @@
 %% 
 %% 
 %%
-%% End of file `multicol-bidi.def'.
+%% End of file `multicol-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def
index ed17f193b6a..14f2c086a1c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `pdfpages-bidi.def',
+%% This is file `pdfpages-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{pdfpages-bidi.def}[2010/03/01 v0.1 adaptations for pdfpages package]
+\ProvidesFile{pdfpages-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for pdfpages package for XeTeX engine]
 \renewcommand*{\includepdf}[2][]{%
   \begingroup
   \@RTLfalse
@@ -70,4 +70,4 @@
 %% 
 %% 
 %%
-%% End of file `pdfpages-bidi.def'.
+%% End of file `pdfpages-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pgf-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pgf-xetex-bidi.def
new file mode 100644
index 00000000000..1ec69559b88
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/pgf-xetex-bidi.def
@@ -0,0 +1,30 @@
+%%
+%% This is file `pgf-xetex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{pgf-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for pgf package for XeTeX engine]
+\let\origin@pgfpicture=\pgfpicture
+\let\origin@endpgfpicture=\endpgfpicture
+\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>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `pgf-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def
new file mode 100644
index 00000000000..b32ba381de0
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def
@@ -0,0 +1,27 @@
+%%
+%% This is file `pstricks-xetex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\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>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `pstricks-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def
index 5784b0222d1..f24799afeb7 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `ragged2e-bidi.def',
+%% This is file `ragged2e-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{ragged2e-bidi.def}[2010/03/01 v0.2 adaptations for ragged2e package]
+\ProvidesFile{ragged2e-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for ragged2e package for XeTeX engine]
 \renewcommand{\Centering}{%
    \ifx\\\@raggedtwoe@savedcr
       \let\\\@centercr
@@ -108,4 +108,4 @@
 %% 
 %% 
 %%
-%% End of file `ragged2e-bidi.def'.
+%% End of file `ragged2e-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport3-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def
index 24281980dfc..8d921bfcb4b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/rapport3-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `rapport3-bidi.def',
+%% This is file `rapport3-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{rapport3-bidi.def}[2010/03/01 v0.1 adaptations for rapport3 class]
+\ProvidesFile{rapport3-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for rapport3 class for XeTeX engine]
 \if@titlepage
 \renewcommand*\TitleFont{\rmfamily}
 \renewcommand*\maketitle{%
@@ -250,4 +250,4 @@
 %% 
 %% 
 %%
-%% End of file `rapport3-bidi.def'.
+%% End of file `rapport3-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/refrep-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def
index 8446921e028..4bc24e8486c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/refrep-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `refrep-bidi.def',
+%% This is file `refrep-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{refrep-bidi.def}[2010/03/01 v0.1 adaptations for refrep class]
+\ProvidesFile{refrep-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for refrep class for XeTeX engine]
 \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -155,4 +155,4 @@
 %% 
 %% 
 %%
-%% End of file `refrep-bidi.def'.
+%% End of file `refrep-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/report-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def
index 9f02d7c0b05..fd61108ff92 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/report-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `report-bidi.def',
+%% This is file `report-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{report-bidi.def}[2010/03/01 v0.2 adaptations for standard report class]
+\ProvidesFile{report-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for standard report class for XeTeX engine]
   \if@titlepage
   \renewcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
@@ -150,64 +150,6 @@
     \Huge \bfseries  #1\par\nobreak
     \vskip 40\p@
   }}
-\renewenvironment{thebibliography}[1]
-     {\chapter*{\bibname}%
-      \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
-      \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\@biblabel{#1}}%
-            \rightmargin\labelwidth
-            \advance\rightmargin\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}
-\if@twoside
-  \def\ps@headings{%
-      \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\leftmark\if@RTLmain\endR\fi}%
-      \def\@oddhead{\sl\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi\hfil\thepage}%
-      \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markboth {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\m@ne
-            \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \ \if@RTLmain\endR\fi%
-        \fi
-        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}{}}%
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\z@
-          \if@RTLmain\beginR\fi\thesection. \ \if@RTLmain\endR\fi%
-        \fi
-        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi\hfil\thepage}%
-    \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markright {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\m@ne
-            \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \ \if@RTLmain\endR\fi%
-        \fi
-        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}}
-\fi
-\def\ps@myheadings{%
-    \let\@oddfoot\@empty\let\@evenfoot\@empty
-    \def\@evenhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\leftmark\if@RTLmain\endR\fi}%
-    \def\@oddhead{\sl\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi\hfil\thepage}%
-    \let\@mkboth\@gobbletwo
-    \let\chaptermark\@gobble
-    \let\sectionmark\@gobble
-    }
-\pagestyle{plain}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
 %% 
@@ -222,4 +164,4 @@
 %% 
 %% 
 %%
-%% End of file `report-bidi.def'.
+%% End of file `report-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def
index 63091c1a5ce..951f7541b56 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `scrartcl-bidi.def',
+%% This is file `scrartcl-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrartcl-bidi.def}[2010/03/01 v0.1 adaptations for scrartcl class]
+\ProvidesFile{scrartcl-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrartcl class for XeTeX engine]
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
@@ -261,4 +261,4 @@
 %% 
 %% 
 %%
-%% End of file `scrartcl-bidi.def'.
+%% End of file `scrartcl-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrbook-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def
index 037d59efc81..8b5a7f83f4d 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrbook-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `scrbook-bidi.def',
+%% This is file `scrbook-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrbook-bidi.def}[2010/03/01 v0.1 adaptations for scrbook class]
+\ProvidesFile{scrbook-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrbook class for XeTeX engine]
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
@@ -317,4 +317,4 @@
 %% 
 %% 
 %%
-%% End of file `scrbook-bidi.def'.
+%% End of file `scrbook-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def
index 8893e6eee9a..efe0fa29c24 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `scrreprt-bidi.def',
+%% This is file `scrreprt-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrreprt-bidi.def}[2010/03/01 v0.1 adaptations for scrreprt class]
+\ProvidesFile{scrreprt-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrreprt class for XeTeX engine]
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
@@ -274,4 +274,4 @@
 %% 
 %% 
 %%
-%% End of file `scrreprt-bidi.def'.
+%% End of file `scrreprt-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/stabular-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def
index 58b3c837a9a..d64969296fe 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/stabular-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `stabular-bidi.def',
+%% This is file `stabular-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{stabular-bidi.def}[2010/03/01 v0.1 adaptations for stabular package]
+\ProvidesFile{stabular-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for stabular package for XeTeX engine]
 \def\@stabular{\if@RTL\global\@RTLtabtrue\fi
    \leavevmode \bgroup \if@RTLtab\beginR \fi
    \let\@acol\@tabacol
@@ -49,4 +49,4 @@
 %% 
 %% 
 %%
-%% End of file `stabular-bidi.def'.
+%% End of file `stabular-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def
new file mode 100644
index 00000000000..24dda09a62a
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def
@@ -0,0 +1,30 @@
+%%
+%% This is file `subfigure-xetex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{subfigure-xetex-bidi.def}[2010/03/01 v0.1 bidi adaptations for subfigure package for XeTeX engine]
+\AtBeginDocument{%
+\let\p@subfigure=\thefigure
+\let\p@subtable=\thetable%
+}
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `subfigure-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabls-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def
index caa17c1eed9..c0913650d74 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabls-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `tabls-bidi.def',
+%% This is file `tabls-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{tabls-bidi.def}[2010/03/01 v0.1 adaptations for tabls package]
+\ProvidesFile{tabls-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for tabls package for XeTeX engine]
 \def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup
                  \global\@RTLtabfalse}
 
@@ -57,4 +57,4 @@
 %% 
 %% 
 %%
-%% End of file `tabls-bidi.def'.
+%% End of file `tabls-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabulary-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def
index 266127839e9..83a57ae8eb1 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabulary-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `tabulary-bidi.def',
+%% This is file `tabulary-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{tabulary-bidi.def}[2010/03/01 v0.1 adaptations for tabulary package]
+\ProvidesFile{tabulary-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for tabulary package for XeTeX engine]
 \def\@testpach{\@chclass
  \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
   \ifnum \@lastchclass=7 5 \else
@@ -52,4 +52,4 @@
 %% 
 %% 
 %%
-%% End of file `tabulary-bidi.def'.
+%% End of file `tabulary-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tikz-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tikz-xetex-bidi.def
index b384fdc082f..dce434239c2 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tikz-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tikz-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `tikz-bidi.def',
+%% This is file `tikz-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,11 +8,11 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{tikz-bidi.def}[2010/03/01 v0.1 adaptations for tikz package]
+\ProvidesFile{tikz-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for tikz package for XeTeX engine]
 \let\origin@tikzpicture=\tikzpicture
 \let\origin@endtikzpicture=\endtikzpicture
-\def\tikzpicture{\LTR\origin@tikzpicture}
-\def\endtikzpicture{\origin@endtikzpicture\endLTR}
+\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>
 %% 
@@ -27,4 +27,4 @@
 %% 
 %% 
 %%
-%% End of file `tikz-bidi.def'.
+%% End of file `tikz-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def
index 81826afc359..152dd4df373 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `tocbibind-bidi.def',
+%% This is file `tocbibind-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{tocbibind-bidi.def}[2010/03/01 v0.1 adaptations for tocbibind package]
+\ProvidesFile{tocbibind-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for tocbibind package for XeTeX engine]
 \if@dotocbib
   \@ifpackageloaded{natbib}{}{% natbib not loaded
     \renewcommand{\bibsection}{\t@cb@bchapsec}
@@ -52,4 +52,4 @@
 %% 
 %% 
 %%
-%% End of file `tocbibind-bidi.def'.
+%% End of file `tocbibind-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocloft-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def
index 7bd3ce6a3d6..7e040da4025 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocloft-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `tocloft-bidi.def',
+%% This is file `tocloft-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{tocloft-bidi.def}[2010/03/01 v0.1 adaptations for tocloft package]
+\ProvidesFile{tocloft-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for tocloft package for XeTeX engine]
 \if@cfthaspart
 \renewcommand*{\l@part}[2]{
   \@cftdopartfalse
@@ -329,4 +329,4 @@
 %% 
 %% 
 %%
-%% End of file `tocloft-bidi.def'.
+%% End of file `tocloft-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def
index 8cfd05bf693..9bb376df52c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `tocstyle-bidi.def',
+%% This is file `tocstyle-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{tocstyle-bidi.def}[2010/03/01 v0.1 adaptations for tocstyle package]
+\ProvidesFile{tocstyle-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for tocstyle package for XeTeX engine]
 \renewcommand*{\tocstyle@dottedtocline}[5]{%
   \let\numberline\tocstyle@numberline
   \ifnum #1>\c@tocdepth \else
@@ -268,4 +268,4 @@
 %% 
 %% 
 %%
-%% End of file `tocstyle-bidi.def'.
+%% End of file `tocstyle-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def
index 37513381c86..b35f7733e31 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `wrapfig-bidi.def',
+%% This is file `wrapfig-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{wrapfig-bidi.def}[2010/03/01 v0.2 adaptations for wrapfig package]
+\ProvidesFile{wrapfig-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for wrapfig package for XeTeX engine]
 \let\WF@@everypar\n@everypar
 \def\WF@putfigmaybe{%
 \ifinner
@@ -98,4 +98,4 @@
 %% 
 %% 
 %%
-%% End of file `wrapfig-bidi.def'.
+%% End of file `wrapfig-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xcolor-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def
index b769811fcd0..3a33bbb25de 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xcolor-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `xcolor-bidi.def',
+%% This is file `xcolor-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{xcolor-bidi.def}[2010/03/01 v0.1 adaptations for xcolor package]
+\ProvidesFile{xcolor-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for xcolor package for XeTeX engine]
 \long\def\color@b@x#1#2#3%
  {\leavevmode\if@RTL\beginL\fi
   \setbox\z@\hbox{\kern\fboxsep{\set@color\if@RTL\beginR\fi#3\if@RTL\endR\fi}\kern\fboxsep}%
@@ -124,4 +124,4 @@
 %% 
 %% 
 %%
-%% End of file `xcolor-bidi.def'.
+%% End of file `xcolor-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xetex-bidi.def
new file mode 100644
index 00000000000..831687a69f2
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/xetex-bidi.def
@@ -0,0 +1,441 @@
+%%
+%% This is file `xetex-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations  for XeTeX engine]
+\ifx\TeXXeTstate\undefined\else%
+   \TeXXeTstate=1
+\fi
+\def\Bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\usebox\z@}\fi}
+   \let\o@everypar=\everypar
+   \newtoks\n@everypar
+   \n@everypar\expandafter{\the\o@everypar}
+   \o@everypar{\Bidi@RTL@everypar\the\n@everypar}
+   \let\everypar=\n@everypar
+\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{\if@RTL\par\@RTLfalse\@RTL@footnotefalse\fi}
+\def\rtl{\if@RTL\relax\else\par\@RTLtrue\@RTL@footnotetrue\fi}
+\def\setRTL{\@RTLtrue\@RTL@footnotetrue}
+\def\setLTR{\@RTLfalse\@RTL@footnotefalse}
+\let\unsetRTL=\setLTR
+\let\unsetLTR=\setRTL
+\let\LR=\LRE
+\let\RL=\RLE
+\def\@ensure@RTL#1{\if@RTL#1\else\RLE{#1}\fi}
+\def\@ensure@LTR#1{\if@RTL\LRE{#1}\else#1\fi}
+\let\@ensure@RL=\@ensure@RTL
+\let\@ensure@LR=\@ensure@LTR
+\def\@ensure@dir#1{\if@RTL\RLE{#1}\else{#1}\fi}
+\let\@ensure@maindir=\@ensure@dir
+\def\@@RTL{RTL}
+\def\@@LTR{LTR}
+\def\save@dir{\if@RTL\gdef\saved@@dir{RTL}\else\gdef\saved@@dir{LTR}\fi}
+\def\reset@dir{\ifx\saved@@dir\@@RTL\setRTL\else\ifx\saved@@dir\@@LTR\setLTR\else\relax\fi\fi}
+\let\@@TeX\TeX
+\def\TeX{\@ensure@LTR{\@@TeX}}
+\let\@@LaTeX\LaTeX
+\def\LaTeX{\@ensure@LTR{\@@LaTeX}}
+\let\@@LaTeXe\LaTeXe
+\def\LaTeXe{\@ensure@LTR{\@@LaTeXe}}
+\def\reflect#1{{\setbox0=\hbox{#1}\rlap{\kern0.5\wd0
+  \special{x:gsave}\special{x:scale -1 1}}\box0 \special{x:grestore}}}
+\def\XeTeX{\LR{\leavevmode$\smash{\hbox{X\lower.5ex
+  \hbox{\kern-.125em\reflect{E}}\kern-.1667em \TeX}}$}}
+\def\XeLaTeX{\LR{\leavevmode$\smash{\hbox{X\lower.5ex
+  \hbox{\kern-.125em\reflect{E}}\kern-.1667em \LaTeX}}$}}
+\let\setRL=\setRTL
+\let\setLR=\setLTR
+\let\unsetRL=\setLTR
+\DeclareOption{RTLdocument}{\@RTLtrue\@RTL@footnotetrue\autofootnoterule}
+\DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\autofootnoterule}
+\def\rcases#1{\left.\vcenter{\normalbaselines\m@th
+    \ialign{$##\hfil$&\quad{##}\hfil\crcr#1\crcr}}\,\right\}}
+\def\SepMark#1{\gdef\@SepMark{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
+\SepMark{.}
+\def\@thmcountersep{\@SepMark}
+\def\list#1#2{%
+  \ifnum \@listdepth >5\relax
+    \@toodeep
+  \else
+    \global\advance\@listdepth\@ne
+  \fi
+  \rightmargin\z@
+  \listparindent\z@
+  \itemindent\z@
+  \csname @list\romannumeral\the\@listdepth\endcsname
+  \def\@itemlabel{#1}%
+  \let\makelabel\@mklab
+  \@nmbrlistfalse
+  #2\relax
+  \@trivlist
+  \parskip\parsep
+  \parindent\listparindent
+  \advance\linewidth -\rightmargin
+  \advance\linewidth -\leftmargin
+  \if@RTL
+    \advance\@totalleftmargin \rightmargin
+  \else
+    \advance\@totalleftmargin \leftmargin
+  \fi
+  \parshape \@ne \@totalleftmargin \linewidth
+  \ignorespaces}
+\def\raggedright{%
+  \let\\\@centercr
+  \leftskip\z@skip\rightskip\@flushglue
+  \parindent\z@\parfillskip\z@skip}
+\let\@@raggedleft=\raggedleft
+\let\@@raggedright=\raggedright
+\renewcommand\raggedleft{\if@RTL\@@raggedright%
+                         \else\@@raggedleft\fi}
+\renewcommand\raggedright{\if@RTL\@@raggedleft%
+                          \else\@@raggedright\fi}
+\def\raggedright{%
+  \let\\\@centercr
+  \rightskip\z@skip\rightskip\@flushglue
+  \parindent\z@\parfillskip\z@skip}
+\renewcommand\raggedleft{\@@raggedleft}
+\renewcommand\raggedright{\@@raggedright}
+\def\centerline#1{%
+\if@RTL\@@line{\hss\beginR#1\endR\hss}
+\else\@@line{\hss#1\hss}\fi}
+\def\leftline#1{%
+\if@RTL\@@line{\beginR#1\endR\hss}
+\else\@@line{#1\hss}\fi}
+\def\rightline#1{%
+\if@RTL\@@line{\hss\beginR#1\endR}
+\else\@@line{\hss#1}\fi}
+\def\narrower{%
+  \advance\if@RTL\rightskip\else\leftskip\fi\parindent
+  \advance\if@RTL\leftskip\else\rightskip\fi\parindent}
+\def\underline#1{%
+  \relax
+  \ifmmode\@@underline{#1}%
+  \else
+\if@RTL $\@@underline{\hbox{\beginR#1\endR}}\m@th$\relax
+\else
+$\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
+\if@compatibility
+   \let\undertext=\underline
+\fi
+\global\@RTLtabfalse
+\def\@tabular{\if@RTL\global\@RTLtabtrue\fi
+   \leavevmode \hbox \bgroup \if@RTLtab\beginR \fi
+   $\let\@acol\@tabacol
+   \let\@classz\@tabclassz
+   \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
+\def\endtabular{\crcr\egroup\if@RTLtab\egroup\endR\egroup\fi
+                 \egroup $\if@RTLtab\endR\fi\egroup
+                 \global\@RTLtabfalse}
+\expandafter \let \csname endtabular*\endcsname = \endtabular
+\def\@array[#1]#2{%
+  \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi
+  \bgroup
+  \setbox\@arstrutbox\hbox{%
+    \vrule \@height\arraystretch\ht\strutbox
+           \@depth\arraystretch \dp\strutbox
+           \@width\z@}%
+  \@mkpream{#2}%
+  \edef\@preamble{%
+    \ialign \noexpand\@halignto
+      \bgroup \@arstrut \@preamble \tabskip\z@skip \cr}%
+  \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
+  \let\tabularnewline\\%
+    \let\par\@empty
+    \let\@sharp##%
+    \set@typeset@protect
+    \lineskip\z@skip\baselineskip\z@skip
+    \ifhmode \@preamerr\z@ \@@par\fi
+  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
+    \@preamble}
+\def\@testpach#1{\@chclass \ifnum \@lastchclass=\tw@ 4 \else
+    \ifnum \@lastchclass=3 5 \else
+     \z@ \if #1c\@chnum \z@ \else
+                              \if \if@RTLtab#1r\else#1l\fi\@chnum \@ne \else
+                              \if \if@RTLtab#1l\else#1r\fi\@chnum \tw@ \else
+          \@chclass \if #1|\@ne \else
+                    \if #1@\tw@ \else
+                    \if #1p3 \else \z@ \@preamerr 0\fi
+  \fi  \fi  \fi  \fi  \fi  \fi
+\fi}
+\def\@dottedtocline#1#2#3#4#5{%
+  \ifnum #1>\c@tocdepth \else
+    \vskip \z@ \@plus.2\p@
+    {\if@RTL\rightskip\else\leftskip\fi #2\relax \if@RTL\leftskip\else\rightskip\fi \@tocrmarg \parfillskip -\if@RTL\leftskip\else\rightskip\fi
+     \parindent #2\relax\@afterindenttrue
+     \interlinepenalty\@M
+     \leavevmode
+     \@tempdima #3\relax
+     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
+     {#4}\nobreak
+     \leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
+     \par}%
+  \fi}
+\def\RTL@outputdblcol{% 
+\if@firstcolumn \global\@firstcolumnfalse
+	\global\setbox\@leftcolumn \box\@outputbox
+\else \global\@firstcolumntrue
+	\setbox\@outputbox \vbox {\hbox to\textwidth {%
+		\hskip \columnwidth
+		\hfil \vrule width\columnseprule \hfil
+		\hbox to\columnwidth {\box\@leftcolumn \hss}%
+		\hskip -\textwidth
+		\hbox to\columnwidth{\box\@outputbox \hss}%
+		\hskip \columnsep
+		\hskip \columnwidth }}%
+	\@combinedblfloats \@outputpage 
+	\begingroup \@dblfloatplacement \@startdblcolumn
+	\@whilesw\if@fcolmade \fi
+	{\@outputpage \@startdblcolumn }\endgroup
+\fi}
+\def\LTR@outputdblcol{%
+  \if@firstcolumn
+    \global \@firstcolumnfalse
+    \global \setbox\@leftcolumn \box\@outputbox
+  \else
+    \global \@firstcolumntrue
+    \setbox\@outputbox \vbox {%
+                         \hb@xt@\textwidth {%
+                           \hb@xt@\columnwidth {%
+                             \box\@leftcolumn \hss}%
+                           \hfil
+                           {\normalcolor\vrule \@width\columnseprule}%
+                           \hfil
+                           \hb@xt@\columnwidth {%
+                             \box\@outputbox \hss}%
+                                             }%
+                              }%
+    \@combinedblfloats
+    \@outputpage
+    \begingroup
+      \@dblfloatplacement
+      \@startdblcolumn
+      \@whilesw\if@fcolmade \fi
+        {\@outputpage
+         \@startdblcolumn}%
+    \endgroup
+  \fi
+}
+\renewcommand{\@outputdblcol}{\if@RTLmain\RTL@outputdblcol\else\LTR@outputdblcol\fi}
+\newcommand{\RTLdblcol}{\renewcommand{\@outputdblcol}{\RTL@outputdblcol}}
+\newcommand{\LTRdblcol}{\renewcommand{\@outputdblcol}{\LTR@outputdblcol}}
+\def \@setminipage{%
+  \@minipagetrue
+  \everypar{\@minipagefalse\everypar{}\if@RTL\beginR\else\beginL\fi}%
+}
+\def\@arrayparboxrestore{%
+  \let\if@nobreak\iffalse
+  \let\if@noskipsec\iffalse
+  \let\par\@@par
+  \let\-\@dischyph
+  \let\'\@acci\let\`\@accii\let\=\@acciii
+  \parindent\z@ \parskip\z@skip
+  \everypar{\if@RTL\beginR\else\beginL\fi}%
+  \linewidth\hsize
+  \@totalleftmargin\z@
+  \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip
+  \parfillskip\@flushglue \lineskip\normallineskip
+  \baselineskip\normalbaselineskip
+  \sloppy}
+\def\@addmarginpar{\@next\@marbox\@currlist{\@cons\@freelist\@marbox
+    \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne
+    \if@twocolumn
+        \if@firstcolumn \@tempcnta\m@ne \fi
+    \else
+      \if@mparswitch
+         \ifodd\c@page \else\@tempcnta\m@ne \fi
+      \fi
+      \if@reversemargin \@tempcnta -\@tempcnta \fi
+    \fi
+    \ifnum\@tempcnta <\z@  \global\setbox\@marbox\box\@currbox \fi
+    \@tempdima\@mparbottom
+    \advance\@tempdima -\@pageht
+    \advance\@tempdima\ht\@marbox
+    \ifdim\@tempdima >\z@
+      \@latex@warning@no@line {Marginpar on page \thepage\space moved}%
+    \else
+      \@tempdima\z@
+    \fi
+    \global\@mparbottom\@pageht
+    \global\advance\@mparbottom\@tempdima
+    \global\advance\@mparbottom\dp\@marbox
+    \global\advance\@mparbottom\marginparpush
+    \advance\@tempdima -\ht\@marbox
+    \global\setbox \@marbox
+                   \vbox {\vskip \@tempdima
+                          \box \@marbox}%
+    \global \ht\@marbox \z@
+    \global \dp\@marbox \z@
+    \kern -\@pagedp
+    \nointerlineskip
+    \hb@xt@\columnwidth
+      {\if@RTL\beginR\fi\ifnum \@tempcnta >\z@
+          \hskip\columnwidth \hskip\marginparsep
+       \else
+          \hskip -\marginparsep \hskip -\marginparwidth
+       \fi
+       \box\@marbox \hss\if@RTL\endR\fi}%
+    \nointerlineskip
+    \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}}
+\def\@stopline{\unskip\@stopfield\if@rjfield \global\@rjfieldfalse
+   \@tempdima\@totalleftmargin \advance\@tempdima\linewidth
+\hbox to\@tempdima{\if@RTL\beginR\fi\@itemfudge\hskip\dimen\@curtabmar
+   \box\@curline\hfil\box\@curfield\if@RTL\endR\fi}\else\@addfield
+   \hbox to\linewidth{\if@RTL\beginR\fi\@itemfudge
+   \hskip\dimen\@curtabmar\box\@curline\hfil\if@RTL\endR\fi}%
+\fi}
+\def\@outputpage{%
+\begingroup           % the \endgroup is put in by \aftergroup
+  \let \protect \noexpand
+  \@resetactivechars
+  \global\let\@@if@newlist\if@newlist
+  \global\@newlistfalse
+  \@parboxrestore
+  \shipout \vbox{%
+    \set@typeset@protect
+    \aftergroup \endgroup
+    \aftergroup \set@typeset@protect
+                                % correct? or just restore by ending
+                                % the group?
+  \if@specialpage
+    \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
+  \fi
+  \if@twoside
+    \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
+         \let\@themargin\oddsidemargin
+    \else \let\@thehead\@evenhead
+       \let\@thefoot\@evenfoot \let\@themargin\evensidemargin
+    \fi
+    \ifx\@thehead\@empty \let\@thehead\hfil \fi
+    \ifx\@thefoot\@empty \let\@thefoot\hfil \fi
+    \else %% not @twoside
+    \ifx\@oddhead\@empty \let\@thehead\hfil \fi
+    \ifx\@oddfoot\@empty \let\@thefoot\hfil \fi
+  \fi
+  \reset@font
+  \normalsize
+  \normalsfcodes
+  \let\label\@gobble
+  \let\index\@gobble
+  \let\glossary\@gobble
+  \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
+    \@begindvi
+    \vskip \topmargin
+    \moveright\@themargin \vbox {%
+      \setbox\@tempboxa \vbox to\headheight{%
+        \vfil
+        \color@hbox
+          \normalcolor
+          \hb@xt@\textwidth{\if@RTLmain\beginR\fi\@thehead\if@RTLmain\endR\fi}%
+        \color@endbox
+        }%                        %% 22 Feb 87
+      \dp\@tempboxa \z@
+      \box\@tempboxa
+      \vskip \headsep
+      \box\@outputbox
+      \baselineskip \footskip
+      \color@hbox
+        \normalcolor
+        \hb@xt@\textwidth{\if@RTLmain\beginR\fi\@thefoot\if@RTLmain\endR\fi}%
+      \color@endbox
+      }%
+    }%
+  \global\let\if@newlist\@@if@newlist
+  \global \@colht \textheight
+  \stepcounter{page}%
+  \let\firstmark\botmark
+}
+\long\def\@makecaption#1#2{%
+  \vskip\abovecaptionskip
+  \sbox\@tempboxa{#1: #2}%
+  \ifdim \wd\@tempboxa >\hsize
+    \if@RTL\beginR\fi#1: #2\if@RTL\endR\fi\par
+  \else
+    \global \@minipagefalse
+    \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}
+\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}}{}
+\@iftagsloaded{fleqn}{\input{fleqn-xetex-bidi.def}}{}
+\@ifpackageloaded{amsmath}{\input{amsmath-xetex-bidi.def}}{}
+\@ifpackageloaded{amsthm}{\input{amsthm-xetex-bidi.def}}{}
+\@ifpackageloaded{breqn}{\input{breqn-xetex-bidi.def}}{}
+\@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{}
+\@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{}
+\@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{}
+\@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{}
+\@ifpackageloaded{flowfram}{\input{flowfram-xetex-bidi.def}}{}
+\@ifpackageloaded{xltxtra}{\input{xltxtra-xetex-bidi.def}}{}
+\@ifpackageloaded{wrapfig}{\input{wrapfig-xetex-bidi.def}}{}
+\@ifpackageloaded{graphicx}{\input{graphicx-xetex-bidi.def}}{}
+\@ifpackageloaded{hyperref}{\input{hyperref-xetex-bidi.def}}{}
+\@ifpackageloaded{fancyhdr}{\input{fancyhdr-xetex-bidi.def}}{}
+\@ifpackageloaded{draftwatermark}{\input{draftwatermark-xetex-bidi.def}}{}
+\@ifpackageloaded{pdfpages}{\input{pdfpages-xetex-bidi.def}}{}
+\@ifpackageloaded{listings}{\input{listings-xetex-bidi.def}}{}
+\@ifpackageloaded{pstricks}{\input{pstricks-xetex-bidi.def}}{}
+\@ifpackageloaded{pgf}{\input{pgf-xetex-bidi.def}}{}
+\@ifpackageloaded{tikz}{\input{tikz-xetex-bidi.def}}{}
+\@ifpackageloaded{array}{\input{array-xetex-bidi.def}}{}
+\@ifpackageloaded{stabular}{\input{stabular-xetex-bidi.def}}{}
+\@ifpackageloaded{subfigure}{\input{subfigure-xetex-bidi.def}}{}
+\@ifpackageloaded{longtable}{\input{longtable-xetex-bidi.def}}{}
+\@ifpackageloaded{arydshln}{\input{arydshln-xetex-bidi.def}}{}
+\@ifpackageloaded{multicol}{\input{multicol-xetex-bidi.def}}{}
+\@ifpackageloaded{minitoc}{\input{minitoc-xetex-bidi.def}}{}
+\@ifpackageloaded{ragged2e}{\input{ragged2e-xetex-bidi.def}}{}
+\@ifpackageloaded{tabls}{\input{tabls-xetex-bidi.def}}{}
+\@ifpackageloaded{tabulary}{\input{tabulary-xetex-bidi.def}}{}
+\@ifpackageloaded{tocstyle}{\input{tocstyle-xetex-bidi.def}}{}
+\@ifclassloaded{article}{\input{article-xetex-bidi.def}}{}
+\@ifclassloaded{amsart}{\input{amsart-xetex-bidi.def}}{}
+\@ifclassloaded{letter}{\input{letter-xetex-bidi.def}}{}
+\@ifclassloaded{memoir}{\input{memoir-xetex-bidi.def}}{}
+\@ifclassloaded{refrep}{\input{refrep-xetex-bidi.def}}{}
+\@ifclassloaded{report}{\@ifpackageloaded{flowfram}{}{\input{report-xetex-bidi.def}}}{}
+\@ifclassloaded{rapport3}{\input{rapport3-xetex-bidi.def}}{}
+\@ifclassloaded{scrartcl}{\input{scrartcl-xetex-bidi.def}}{}
+\@ifclassloaded{scrbook}{\input{scrbook-xetex-bidi.def}}{}
+\@ifclassloaded{scrreprt}{\input{scrreprt-xetex-bidi.def}}{}
+\@ifclassloaded{amsbook}{\input{amsbook-xetex-bidi.def}}{}
+\@ifclassloaded{extbook}{\input{extbook-xetex-bidi.def}}{}
+\@ifclassloaded{book}{\@ifpackageloaded{flowfram}{}{\input{book-xetex-bidi.def}}}{}
+\@ifclassloaded{bookest}{\input{bookest-xetex-bidi.def}}{}
+\@ifpackageloaded{tocbibind}{\@ifclassloaded{memoir}{}{\input{tocbibind-xetex-bidi.def}}}{}
+\@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xetex-bidi.def}}}{}
+
+
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def
index 208a8211f52..fbef2973005 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def
@@ -1,5 +1,5 @@
 %%
-%% This is file `xltxtra-bidi.def',
+%% This is file `xltxtra-xetex-bidi.def',
 
 %% 
 %%   __________________________________
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{xltxtra-bidi.def}[2010/03/01 v0.1 adaptations for xltxtra package]
+\ProvidesFile{xltxtra-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for xltxtra package for XeTeX engine]
 \let\@@XeTeX\XeTeX
 \def\XeTeX{\@ensure@LTR{\@@XeTeX}}
 \let\@@XeLaTeX\XeLaTeX
@@ -27,4 +27,4 @@
 %% 
 %% 
 %%
-%% End of file `xltxtra-bidi.def'.
+%% End of file `xltxtra-xetex-bidi.def'.