bidi update (6jan10)

git-svn-id: svn://tug.org/texlive/trunk@16674 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2010-01-11 18:46:44 +0000
committer: Karl Berry <karl@freefriends.org> 2010-01-11 18:46:44 +0000
commit: b2653703ac55bf05f550a80ffa1fe05c5fe8bd47 (patch)
tree: f1134c0157d1fefadb188b15f095c13674484ea9 /Master
parent: 47bbbc330ace9242ab5ee3af16c08d19a1496ac6 (diff)
83 files changed, 3885 insertions, 10087 deletions
diff --git a/Master/texmf-dist/doc/xelatex/bidi/README b/Master/texmf-dist/doc/xelatex/bidi/README
index aaf8713b131..f33ff8852d9 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/README
+++ b/Master/texmf-dist/doc/xelatex/bidi/README
@@ -1,38 +1,22 @@
 _________________
 The bidi package
-v1.0.3
+v1.0.4
 
 This package provides a convenient interface for typesetting
 bidirectional texts with XeLaTeX.
 
-This version fixes few bugs that were present in v1.0.2 and in
-addition it adds full support for hyperref package. Please note
-that in RTL mode, the fix does not support links spanning multiple
-lines  and that is due to XeTeX annoying limitations, bugs and super
-weak programming. In fact, what bidi can do at present is unbleiveable
-with considering XeTeX bugs and limitations and its super weak programming.
-We also have deleted bidimemoir class in this version and instead have added
-support for memoir class, therefore you will need to use memoir class.
+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).
 
-Please note that currently there is no user guide for the bidi package and
-you will need to study "XeTeX Companion" page 65 where bidi package is described
-very briefly.
 
-Please do not email me for any issue/question that you may have with the bidi
-package, because you just waste your own time and I will never response to your
-queries. Instead you can subscribe to the XeTeX mailing list at
-http://www.tug.org/mailman/listinfo/xetex and ask for help there. You may submit
-any bugs that you find in bidi package at http://developer.berlios.de/bugs/?group_id=10901
-with an example that demonstrates the bug. Bug reports without examples will be deleted
-immediately.
-
-Please also note that in the development of the bidi package, I have recieved no support
-(of any kind) at all from the developer of XeTeX (Jonathan Kew). In fact, bidi development
-has been done independently and it will continue to do so.
+To get help, please subscribe to the XeTeX mailing list and ask your question there.
 
 ______________
 Vafa Khalighi
 vafa@users.berlios.de
 
-Copyright 2007-2009
+Copyright 2007-2010
 Distributed under the LaTeX Project Public License
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bibitem.pdf b/Master/texmf-dist/doc/xelatex/bidi/bibitem.pdf
index 49191743021..49191743021 100755..100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bibitem.pdf
+++ b/Master/texmf-dist/doc/xelatex/bidi/bibitem.pdf
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf
new file mode 100644
index 00000000000..a1623eab8f4
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..f7d3bdb3034
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.tex
@@ -0,0 +1,473 @@
+\documentclass{article}
+\usepackage{fontspec}
+\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}}}
+\renewcommand\labelenumi{\theenumi}
+\renewcommand\labelitemi{\HandRight}
+\renewcommand\labelitemii{\HandRightUp}
+\renewcommand\labelitemiii{\HandCuffRight}
+\renewcommand\labelitemiv{\HandPencilLeft}
+\definecolor{mybrown}{rgb}{.6,0,0}
+\definecolor{mygreen}{rgb}{0,.43,0}
+\definecolor{Orange}{rgb}{1,.4,.2}
+\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}
+\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.
+\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\\
+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.
+\section{Basics}
+\subsection{Loading The Package}
+You can load the package in the ordinary way;
+\begin{BDef}
+\Lcs{usepackage}\OptArgs\Largb{bidi}
+\end{BDef}
+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 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]
+\documentclass{minimal}
+\usepackage{bidi}
+\usepackage{graphicx}
+\begin{document}
+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]
+! 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.
+
+See the bidi package documentation for explanation.
+Type  H <return>  for immediate help.
+ ...                                              
+                                                  
+l.4 \begin{document}
+                    
+? 
+
+\end{lstlisting}
+\end{enumerate}
+\subsection{Commands for Version, Subversion Revision and Date of The Package}
+\begin{BDef}
+\Lcs{bidiversion}\quad\Lcs{bidirevision}\quad\Lcs{bididate}
+\end{BDef}
+\begin{itemize}
+\item \Lcs{bidiversion} gives the current version of the package.
+\item \Lcs{bidirevision} gives the current subversion revision of the package.
+\item \Lcs{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}]
+\documentclass{article}
+\usepackage{bidi}
+\begin{document}
+This is typeset by \textsf{bidi} package, \bidiversion, \bidirevision, \bididate.
+\end{document}
+\end{lstlisting}
+\subsection{Options of The Package\label{options}}
+There are two options, namely \texttt{RTLdocument} and \texttt{rldocument}, which are essentialy equivalent. If you pass any of these options to the package, you will be typesetting a document containing mainly RTL texts with some LTR texts. These options activate \Lcs{setRTL} (explained in \autoref{PSC}), \Lcs{RTLdblcol} (explained in \autoref{twocolumn}) and \Lcs{autofootnoterule} (explained in \autoref{footnoterule}).
+
+It is clear that if you do not pass any of these options to the package, you will be typesetting a document containing mainly LTR texts with some RTL texts.
+\subsection{Paragraph Switching Commands\label{PSC}}
+\begin{BDef}
+\Lcs{setLTR}\quad\Lcs{setLR}\quad\Lcs{unsetRL}\quad\Lcs{unsetRTL}\\
+\Lcs{setRTL}\quad\Lcs{setRL}\quad\Lcs{unsetLTR}
+\end{BDef}
+\begin{itemize}
+\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}]
+\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.
+
+\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.
+\end{document}
+\end{lstlisting}
+\subsection{Pargraph Switching Environments}
+\begin{BDef}
+\LBEG{LTR}\quad\Larga{text}\quad\LEND{LTR}\\
+\LBEG{RTL}\quad\Larga{text}\quad\LEND{RTL}
+\end{BDef}
+\begin{itemize}
+\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}]
+\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.
+\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.
+\end{LTR}
+And we are still typesetting RTL.
+\end{RTL}
+\end{document}
+\end{lstlisting}
+\subsection{Typesetting Short LTR and RTL Texts}
+\begin{BDef}
+\Lcs{LRE}\Largb{\Larga{text}}\quad\Lcs{LR}\Largb{\Larga{text}}\\
+\Lcs{RLE}\Largb{\Larga{text}}\quad\Lcs{RL}\Largb{\Larga{text}}
+\end{BDef}
+\begin{itemize}
+\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{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.
+\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.
+\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{thanks}\Largb{\Larga{text}}\quad\Lcs{LTRthanks}\Largb{\Larga{text}}\quad\Lcs{RTLthanks}\Largb{\Larga{text}}
+\end{BDef}
+\begin{itemize}
+\item \Lcs{footnote} in RTL mode produces an RTL footnote while in LTR mode it produces an LTR footnote.
+\item \Lcs{LTRfootnote} will always produce an LTR footnote, independent on the current mode.
+\item \Lcs{RTLfootnote} will always produce an RTL footnote, independent on the current mode.
+\item Specifying a \Lcs{setfootnoteRL} command anywhere will make \Lcs{footnote} produce an RTL footnote.
+\item Specifying either a \Lcs{setfootnoteLR} or an \Lcs{unsetfootnoteRL} command anywhere will make \Lcs{footnote} produce an LTR footnote.
+\item \Lcs{thanks} (to be used only inside \Lcs{author} or \Lcs{title} argument) in RTL mode produces an RTL footnote while in LTR mode it produces an LTR footnote.
+\item \Lcs{LTRthanks} (to be used only inside \Lcs{author} or \Lcs{title} argument) will always produce an LTR footnote, independent on the current mode.
+\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}}
+\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.
+\item \Lcs{LTRfootnotetext} used in conjunction with \Lcs{footnotemark}, will always produce an LTR footnote, independent on the current mode.
+\item \Lcs{RTLfootnotetext} used in conjunction with \Lcs{footnotemark}, will always produce an RTL footnote, independent on the current mode.
+\end{itemize}
+\subsubsection{Footnote Rule\label{footnoterule}}
+The behavior of footnote rules can also be controlled.
+\begin{BDef}
+\Lcs{autofootnoterule}\quad\Lcs{rightfootnoterule}\quad\Lcs{leftfootnoterule}\\
+\Lcs{LRfootnoterule}\quad\Lcs{textwidthfootnoterule}
+\end{BDef}
+\begin{itemize}
+\item \Lcs{autofootnoterule} will draw the footnote rule right or left aligned based on the direction of the first footnote following the rule (i.e., put in the current page).
+\item \Lcs{rightfootnoterule} will put footnote rule on the right-hand side.
+\item \Lcs{leftfootnoterule} or \Lcs{LRfootnoterule} will put footnote rule on the left-hand side.
+\item \Lcs{textwidthfootnoterule} will draw the footnote rule with a width equal to \Lcs{textwidth}.
+\end{itemize}
+\subsection{Two Column Typesetting\label{twocolumn}}
+\begin{BDef}
+\Lcs{RTLdblcol}\quad\Lcs{LTRdblcol}
+\end{BDef}
+If you pass the \texttt{twocolumn} option to the class file and if the main direction of the document is RTL, then you get RTL two column and if the main direction of the document is LTR, then you get LTR two column. In addition, \Lcs{RTLdblcol} allows you to have RTL two column typesetting and \Lcs{LTRdblcol} allows you to have LTR two column typesetting as the options of the class file.
+\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}}
+\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}]
+\documentclass{article}
+\usepackage{amsmath}
+\usepackage{bidi}
+\begin{document}
+\setRTL
+\[\rcases{\text{men}\cr\text{women}}
+\text{Humans Beings}
+\]
+\end{document}
+\end{lstlisting}
+\subsection{Typesetting Logos}
+\begin{BDef}
+\Lcs{XeTeX}\quad\Lcs{XeLaTeX}
+\end{BDef}
+\textsf{bidi} defines \XeTeX\ and \XeLaTeX\ logos and in addition, it makes sure that logos, \TeX, \LaTeX, \LaTeXe\ are typeset LTR.
+\subsection{Separation Mark}
+\begin{BDef}
+\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}]
+\documentclass{article}
+\usepackage{bidi}
+\SepMark{-}
+\begin{document}
+\section{First}
+\subsection{Second}
+\subsubsection{Third}
+\end{document}
+\end{lstlisting}
+
+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}}]
+\documentclass{article}
+\usepackage{bidi}
+\SepMark{-}
+\makeatletter
+\renewcommand\theequation{\thesection\@SepMark\@arabic\c@equation}
+\makeatother
+\begin{document}
+\section{First}
+\begin{equation}
+x^2+y^2=z^2
+\end{equation}
+\end{document}
+\end{lstlisting}
+\subsection{\Lcs{raggedright}, \Lcs{raggedleft} commands, \texttt{flushleft} and \texttt{flushright} Environments}
+\Lcs{raggedright} command and \texttt{flushleft} environment put the text on the left hand side and \Lcs{raggedleft} command and \texttt{flushright} environment put the text on the right hand side, independent on the current mode.
+\subsection{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. 
+
+We now give some details that you should know about the supported packages or classes.
+\subsection{Color}
+You can use \textsf{color} and \textsf{xcolor} packages to typeset texts in colours and colour boxes produced by \Lcs{colorbox} and \Lcs{fcolorbox} commands. Please note that your Coloured text should not span more than a line, if your text  spans more than a line, you will be in trouble which means your whole document, page or paragraph may be coloured. If your texts spans more than a line, then you should use \textsf{xecolour} package.
+
+Also if you are going to use \Lcs{color} command to colour the text at the beginning of a paragraph, then you should have \Lcs{leavevmode} before \Lcs{color} command.
+
+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}
+In the previous versions of \textsf{bidi} package, it was recommended that you need to use \textsf{fmultico} package instead the original \textsf{multicol} package for RTL multicolumn typesetting. This is not the case any more and you should not use buggy \textsf{fmultico} package any more. Simply load the original \textsf{multicol} package before loading \textsf{bidi}. \textsf{bidi} now supports \textsf{multicol} package and you can typeset bidirectional multi columns.
+
+In addition, you also can use \textsf{vwcol} package for variable width bidirectional column typesetting.
+\section{Extra \textsf{bidi} Packages and Classes}
+\subsection{The Issue of Footnote}
+In standard \LaTeX\, you can not use footnotes inside \Lcs{chapter}, \Lcs{part}, \Lcs{section}, \Lcs{subsection}, \Lcs{subsection} and any other section-like commands, \Lcs{caption} and tabular environment.
+
+\textsf{bidi} package provides \textsf{bidiftnxtra} package that solves the issue of footnote in standard \LaTeX. \textsf{bidiftnxtra} package should be loaded after \textsf{bidi} package.
+\subsection{Typesetting Poems}
+The \textsf{bidi} package provides \textsf{bidipoem} package for typesetting Persian poems. It provides four environments, \texttt{traditionalpoem}, \texttt{modernpoem} and starred version of these. In the starred version of these environments you do not need to type {\ttfamily\symbol{92}\symbol{92}} and that is the only difference with the normal version of the environments. The \texttt{traditionalpoem} environment and its starred version are also useful for typesetting Classic Arabic poetry, in fact this package may also be useful for other RTL languages.
+
+When using \textsf{bidipoem} package, at least you need to run \texttt{xelatex} twice on your document. In fact, if you run \texttt{xelatex} just once on your document, you get a message saying ``Unjustified poem.  Rerun \texttt{XeLaTeX} to get poem right''.
+
+When you typeset your poems, you might get underfull \Lcs{hbox} messages. This is absolutely normal and if you want to get rid of these underfull \Lcs{hbox} messages, then you would need to use Kashida.
+
+If you need to change the default distance between two verses, you can do just that by:
+\begin{BDef}
+\Lcs{renewcommand}\Lcs{poemcolsepskip}\Largb{\Larga{length}}
+\end{BDef}
+\begin{BDef}
+\LBEG{traditionalpoem}\\
+\Larga{verse1}\texttt{\&}\Larga{verse2}{\ttfamily\symbol{92}\symbol{92}}\\
+\Larga{verse3}\texttt{\&}\Larga{verse4}{\ttfamily\symbol{92}\symbol{92}}\\
+\ldots\\
+\LEND{traditionalpoem}
+\end{BDef}
+\begin{BDef}
+\LBEG{traditionalpoem*}\\
+\Larga{verse1}\texttt{\&}\Larga{verse2}\\
+\Larga{verse3}\texttt{\&}\Larga{verse4}\\
+\ldots\\
+\LEND{traditionalpoem*}
+\end{BDef}
+\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.
+
+\subsection{Producing Presentations}
+At the moment, there is only one class that you can prepare your presentations
+with.
+
+\subsubsection{\textsf{bidipresentation} Class}
+\textsf{bidipresentation} is a simple class for presentations to be shown on
+screen or beamer. It is derived from \LaTeX's article class. The “virtual paper
+size” of documents produced by this class: width=128mm, height=96mm.
+\textsf{bidipresentation} requires that the \textsf{fancyhdr} and \textsf{geometry} packages
+are available on the system. Enhancements to the \textsf{bidipresentation}
+class are easily made available by other packages, these include slides with
+a background from a bitmap (\textsf{eso-pic} package).
+
+\paragraph{Usage:}
+The class is used with
+\begin{BDef}
+\Lcs{documentclass}\OptArgs\Largb{bidipresentation}
+\end{BDef}
+        Options of the article class are also available to \textsf{bidipresentation}, e. g.
+ 10pt, 11pt, 12pt for selection of font size. However, not all options of the
+        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}]
+ \documentclass[12pt]{bidipresentation}
+ \usepackage{eso-pic}
+ \usepackage[RTLdocument]{bidi}
+ \pagestyle{pres}
+ \AddToShipoutPicture{
+ \includegraphics{gradient2.png}
+}
+ \begin{document}
+ \begin{titlepage}
+\centering
+   \distance{1}
+   {
+\Huge \bfseries Title of the presentation \par
+}
+ \vspace{1.3ex} \large
+ Author\\[2ex]Institution
+ \distance{2}
+ \end{titlepage}
+ \begin{plainslide}[Title of Page]
+The first page
+\end{plainslide}
+\begin{rawslide}
+The second page
+ \end{rawslide}
+\end{document}
+\end{lstlisting}
+The title page can be created within the \texttt{titlepage} environment, the \Lcs{maketitle}
+command is not available. Slides may be created with the \texttt{plainslide} environment, you may add the title of the slide with the optional parameter. The
+contents of the slide are centered vertically. Another environment generating a slide is \texttt{rawslide}: slides are written without title, contents are not
+vertically centered.
+
+The \Lcs{distance}\Largb{\Larga{number}} command allows to introduce vertical space into
+slides constructed with the \texttt{rawslide} and \texttt{titlepage} environments. You should
+use pairs of \Lcs{distance}\Largb{} commands with numbers indicating the relative
+height of empty space, see the titlepage in the example above.
+
+Pictures can be included with the \Lcs{includegraphics} command of the \textsf{graphicx} package. Please be aware that the dimensions of the pages are 128mm $\times$
+96mm and therefore included graphics are scaled appropriately.
+
+\paragraph{Enhancements to \textsf{bidipresentation}:}
+
+\subparagraph{Fill background of a presentation with bitmaps:}
+\textsf{eso-pic} package allows you to paint the background with a picture:
+\begin{lstlisting}[morekeywords={AddToShipoutPicture,includegraphics}]
+\usepackage{eso-pic}
+...
+\AddToShipoutPicture{
+\includegraphics{gradient2.png}
+}
+\end{lstlisting}
+\Lcs{AddToShipoutPicture}\Largb{} puts the picture on every page, \Lcs{AddToShipoutPicture*}\Largb{}
+puts it on to the current page, \Lcs{ClearShipoutPicture} clears the background
+beginning with the current page. Details of \textsf{eso-pic}’s commands can be
+found in its own documentation.
+
+
+
+\section{Some Useful Internal Macros}
+There are some useful internal macros that might be helpful for you. This section, explains all these useful internals.
+\subsection{RTL Conditional}
+\begin{BDef}
+\Lcs{if@RTL}
+\end{BDef}
+\Lcs{if@RTL} conditional is true inside RTL mode and it is false in LTR mode. 
+\subsection{Main RTL Conditional}
+\begin{BDef}
+\Lcs{if@RTLmain}
+\end{BDef}
+If the main direction of the document is RTL, \Lcs{if@RTLmain} is true and if the main direction of the document is LTR, \Lcs{if@RTLmain} is false.
+\subsection{Latin Conditional}
+\begin{BDef}
+\Lcs{if@Latin}
+\end{BDef}
+\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}}
+\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}}\\
+\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.
+\subsection{Tabular Conditional}
+\begin{BDef}
+\Lcs{if@RTLtab}
+\end{BDef}
+If the tabular is typeset RTL, \Lcs{if@RTLtab} is true and if the tabular is typeset LTR, \Lcs{if@RTLtab} is false.
+\subsection{Footnote Conditional}
+\begin{BDef}
+\Lcs{if@RTL@footnote}
+\end{BDef}
+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@dir}\Largb{\Larga{text}}\quad\Lcs{@ensure@maindir}\Largb{\Larga{text}}
+\end{BDef}
+\begin{itemize}
+\item  \Lcs{@ensure@RTL} and \Lcs{@ensure@RL} internals make sure that \Larga{text} is always typeset RTL, independent on the current mode.
+\item  \Lcs{@ensure@LTR} and \Lcs{@ensure@LR} internals make sure that \Larga{text} is always typeset LTR, independent on the current mode.
+\item \Lcs{@ensure@dir} and \Lcs{@ensure@maindir} if used in RTL mode, they put \Larga{text} inside \Lcs{RLE} and if used in LTR mode, they put the text as it is.
+\end{itemize}
+\subsection{Reset Direction Macro}
+\begin{BDef}
+\Lcs{save@dir}\quad\Lcs{saved@@dir}\quad\Lcs{reset@dir}
+\end{BDef}
+\begin{itemize}
+\item \Lcs{save@dir}, if the direction of typesetting is RTL, defines \Lcs{saved@@dir} to be RTL and if the direction of typesetting is LTR, defines \Lcs{saved@@dir} to be LTR.
+\item \Lcs{reset@dir}, if \Lcs{saved@@dir} is defined as RTL, inserts \Lcs{setRTL} otherwise, if  \Lcs{saved@@dir} is defined as LTR, inserts \Lcs{setLTR}, otherwise does nothing.
+\end{itemize}
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/bidisample2e.tex b/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.tex
index 4f791ead282..4f791ead282 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/bidisample2e.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidisample2e.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/bidismall2e.tex b/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.tex
index 16a02e49240..16a02e49240 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/bidismall2e.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidismall2e.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/beamer-sample.tex b/Master/texmf-dist/doc/xelatex/bidi/examples/beamer-sample.tex
deleted file mode 100644
index 3a98ea7d7b2..00000000000
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/beamer-sample.tex
+++ /dev/null
@@ -1,94 +0,0 @@
-\documentclass{bidibeamer}
-\usetheme{Warsaw}
-\usepackage{fontspec}
-\setmainfont[Script=Arabic,Mapping=farsidigits]{XB Niloofar}
-\def\familydefault{\rmdefault}
-\newfontfamily\rmfamily[Mapping=tex-text]{Linux Libertine}
-\usepackage{bidi}
-\newenvironment{latin}{\begin{LTR}\rmfamily}{\end{LTR}}
-\def\biditheoremname{قضیه}
-\def\bidicorollaryname{نتیجه}
-\def\bidifactname{حقیقت}
-\def\bidilemmaname{لم}
-\def\bidiproblemname{مسئله}
-\def\bidisolutionname{پاسخ}
-\def\bididefinitionname{تعریف}
-\def\bididefinitionsname{تعریف‌ها}
-\def\bidiexamplename{مثال}
-\def\bidiexamplesname{مثال‌ها}
-\def\bidiproofname{اثبات}
-\title{عنوان اسلاید}
-\subtitle{این یک زیرعنوان است}
-\author{وفا خلیقی}
-\institute{دانشگاه تهران}
-\begin{document}
-\begin{frame}
-\titlepage
-\end{frame}
-
-\begin{frame}{این یک عنوان است}
-\framesubtitle{این زیرعنوان است}
-\begin{bidiexample}
-در این مثال به برسی توابعی خواهیم پرداخت که برای ما قابل استفاده هستند:
-\begin{equation}
-(x-y)^2=x^2-2xy+y^2
-\end{equation}
-\end{bidiexample}
-\begin{bidisolution}
-این یک پاسخ است
-\end{bidisolution}
-\begin{bidiproblem}
-این یک مسئله است.
-\end{bidiproblem}
-\end{frame}
-\begin{frame}{ادامهٔ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-\begin{biditheorem}
-این یک قضیه است.
-\end{biditheorem}
-\begin{bidiproof}
-این یک اثبات است
-\end{bidiproof}
-\begin{bidicorollary}
-این یک نتیجه است
-\end{bidicorollary}
-\begin{bidifact}
-این یک حقیقت است
-\end{bidifact}
-\end{frame}
-\begin{frame}{ادامهّ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-\begin{bidilemma}
-این یک لم است
-\end{bidilemma}
-\begin{bididefinition}
-این یک تعریف است
-\end{bididefinition}
-\begin{bididefinitions}
-این محیط مخصوص بیشتر از یک تعریف است
-\end{bididefinitions}
-\begin{bidiexamples}
-این محیط مخصوص بیشتر از یک مثال است.
-\end{bidiexamples}
-\end{frame}
-\begin{frame}{ادامهّ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-\begin{bidiblock}{محیط بلوک}
-این محیط بلوک است
-\end{bidiblock}
-\begin{bidiexampleblock}{محیط بلوک مثال}
-این محیط بلوک مثال است
-\end{bidiexampleblock}
-\begin{bidialertblock}{محیط بلوک هشدار}
-این محیط بلوک هشدار است.
-\end{bidialertblock}
-\end{frame}
-\begin{frame}{ادامهّ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-این هم مقداری متن معمولی می‌نویسم تا بتوانم به خط بعدی بروم و ببینم که آیا واقعاً \lr{beamer} دست از لجاجت برمی‌دارد یا نه
-\begin{latin}
-This is an English paragraph that I am writing here to see what happens after this, will I get a new bug or I am lucky enough?
-\end{latin}
-این دوباره متنی است فارسی که من آن را می‌نویسم و هنوز در حال آزمایش هستم تا بتوانم به خط بعدی بروم و نتیجه را مشاهده کنم.
-\end{frame}
-\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/bidicasual-samplecv.tex b/Master/texmf-dist/doc/xelatex/bidi/examples/bidicasual-samplecv.tex
deleted file mode 100644
index 0b5e36c0b70..00000000000
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/bidicasual-samplecv.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[11pt,a4paper]{bidimoderncv}
-\cvtheme[red]{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/examples/bidiclassic-samplecv.tex b/Master/texmf-dist/doc/xelatex/bidi/examples/bidiclassic-samplecv.tex
deleted file mode 100644
index f32b59bad1a..00000000000
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/bidiclassic-samplecv.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[11pt,a4paper]{bidimoderncv}
-\cvtheme[orange]{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/examples/picture.jpg b/Master/texmf-dist/doc/xelatex/bidi/examples/picture.jpg
deleted file mode 100644
index ef48e69ce85..00000000000
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/picture.jpg
+++ /dev/null
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/gull.jpg b/Master/texmf-dist/doc/xelatex/bidi/gull.jpg
index a77d1bd3421..a77d1bd3421 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/gull.jpg
+++ b/Master/texmf-dist/doc/xelatex/bidi/gull.jpg
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/presentation-sample.tex b/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex
index d95b3c41131..b7464609633 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/presentation-sample.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/presentation-sample.tex
@@ -3,7 +3,6 @@
 \usepackage{graphicx}
 \usepackage{fontspec}
 \setmainfont[Script=Arabic,Mapping=farsidigits]{XB Niloofar}
-\newfontfamily\rmfamily[Mapping=tex-text]{XB Niloofar}
 \usepackage[RTLdocument]{bidi}
 \pagestyle{pres}
 \AddToShipoutPicture{
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test-bidi.tex b/Master/texmf-dist/doc/xelatex/bidi/test-bidi.tex
index e81a1dc599b..e81a1dc599b 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test-bidi.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-bidi.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test-supertabular.tex b/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex
index 5e43860b849..5e43860b849 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test-supertabular.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-supertabular.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test-tabular.tex b/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex
index ffc08ac933a..ffc08ac933a 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test-tabular.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabular.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test-tabularx.tex b/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex
index 2867c7cd17a..2867c7cd17a 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test-tabularx.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabularx.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test-tabulary.tex b/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.tex
index 81067943c49..81067943c49 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test-tabulary.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test-tabulary.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test1-wrapfig.tex b/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.tex
index a0fd4b7f8e5..a0fd4b7f8e5 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test1-wrapfig.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test1-wrapfig.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test2-wrapfig.tex b/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.tex
index ab655dac412..ab655dac412 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test2-wrapfig.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test2-wrapfig.tex
diff --git a/Master/texmf-dist/doc/xelatex/bidi/examples/test3-wrapfig.tex b/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.tex
index 4a61ff65f76..4a61ff65f76 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/examples/test3-wrapfig.tex
+++ b/Master/texmf-dist/doc/xelatex/bidi/test3-wrapfig.tex
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
deleted file mode 100644
index 3dc92593673..00000000000
--- a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
+++ /dev/null
@@ -1,7023 +0,0 @@
-% \iffalse 
-%<*internal>
-\iffalse
-%</internal>
-%<*readme>
-_________________
-The bidi package
-v1.0.3
-
-This package provides a convenient interface for typesetting
-bidirectional texts with XeLaTeX.
-
-This version fixes few bugs that were present in v1.0.2 and in
-addition it adds full support for hyperref package. Please note 
-that in RTL mode, the fix does not support links spanning multiple
-lines  and that is due to XeTeX annoying limitations, bugs and super
-weak programming. In fact, what bidi can do at present is unbleiveable
-with considering XeTeX bugs and limitations and its super weak programming.
-We also have deleted bidimemoir class in this version and instead have added
-support for memoir class, therefore you will need to use memoir class.
-
-Please note that currently there is no user guide for the bidi package and
-you will need to study "XeTeX Companion" page 65 where bidi package is described 
-very briefly.
-
-Please do not email me for any issue/question that you may have with the bidi
-package, because you just waste your own time and I will never response to your
-queries. Instead you can subscribe to the XeTeX mailing list at
-http://www.tug.org/mailman/listinfo/xetex and ask for help there. You may submit
-any bugs that you find in bidi package at http://developer.berlios.de/bugs/?group_id=10901
-with an example that demonstrates the bug. Bug reports without examples will be deleted
-immediately.
-
-Please also note that in the development of the bidi package, I have recieved no support
-(of any kind) at all from the developer of XeTeX (Jonathan Kew). In fact, bidi development
-has been done independently and it will continue to do so.
-
-
-______________
-Vafa Khalighi
-vafa@users.berlios.de
-
-Copyright 2007-2009
-Distributed under the LaTeX Project Public License
-%</readme>
-%<*internal>
-\fi
-%
-%</internal>
-%
-%<*internal>
-\begingroup
-%</internal>
-%<*batchfile>
-\input docstrip.tex
-\keepsilent
-\preamble
-
-  __________________________________
-  Copyright © 2009 Vafa Khalighi
-
-  License information appended.
-
-
-\endpreamble
-\postamble
-
-Copyright © 2009      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.
-
-
-                             
-
-\endpostamble
-\askforoverwritefalse
-\generate{\file{amsart-bidi.def}{\from{bidi.dtx}{amsart-bidi.def}}}
-\generate{\file{amsbook-bidi.def}{\from{bidi.dtx}{amsbook-bidi.def}}}
-\generate{\file{amsthm-bidi.def}{\from{bidi.dtx}{amsthm-bidi.def}}}
-\generate{\file{array-bidi.def}{\from{bidi.dtx}{array-bidi.def}}}
-\generate{\file{article-bidi.def}{\from{bidi.dtx}{article-bidi.def}}}
-\generate{\file{bidibeamer-bidi.def}{\from{bidi.dtx}{bidibeamer-bidi.def}}}
-\generate{\file{bidibeamer.cls}{\from{bidi.dtx}{bidibeamer.cls}}}
-\generate{\file{bidibeamerbasetemplates.sty}{\from{bidi.dtx}{bidibeamerbasetemplates.sty}}}
-\generate{\file{bidibeamerbaseauxtemplates.sty}{\from{bidi.dtx}{bidibeamerbaseauxtemplates.sty}}}
-\generate{\file{beamerthemebidiJLTree.sty}{\from{bidi.dtx}{beamerthemebidiJLTree.sty}}}
-\generate{\file{bidi.sty}{\from{bidi.dtx}{bidi.sty}}}
-\generate{\file{bidi2in1.sty}{\from{bidi.dtx}{bidi2in1.sty}}}
-\generate{\file{bidicode.sty}{\from{bidi.dtx}{bidicode.sty}}}
-\generate{\file{bidimoderncv.cls}{\from{bidi.dtx}{bidimoderncv.cls}}}
-\generate{\file{bidipresentation.cls}{\from{bidi.dtx}{bidipresentation.cls}}}
-\generate{\file{book-bidi.def}{\from{bidi.dtx}{book-bidi.def}}}
-\generate{\file{bookest-bidi.def}{\from{bidi.dtx}{bookest-bidi.def}}}
-\generate{\file{cvthemebidicasual.sty}{\from{bidi.dtx}{cvthemebidicasual.sty}}}
-\generate{\file{cvthemebidiclassic.sty}{\from{bidi.dtx}{cvthemebidiclassic.sty}}}
-\generate{\file{draftwatermark-bidi.def}{\from{bidi.dtx}{draftwatermark-bidi.def}}}
-\generate{\file{extbook-bidi.def}{\from{bidi.dtx}{extbook-bidi.def}}}
-\generate{\file{fancyhdr-bidi.def}{\from{bidi.dtx}{fancyhdr-bidi.def}}}
-\generate{\file{footnote-bidi.def}{\from{bidi.dtx}{footnote-bidi.def}}}
-\generate{\file{graphicx-bidi.def}{\from{bidi.dtx}{graphicx-bidi.def}}}
-\generate{\file{hyperref-bidi.def}{\from{bidi.dtx}{hyperref-bidi.def}}}
-\generate{\file{listings-bidi.def}{\from{bidi.dtx}{listings-bidi.def}}}
-\generate{\file{longtable-bidi.def}{\from{bidi.dtx}{longtable-bidi.def}}}
-\generate{\file{minitoc-bidi.def}{\from{bidi.dtx}{minitoc-bidi.def}}}
-\generate{\file{memoir-bidi.def}{\from{bidi.dtx}{memoir-bidi.def}}}
-\generate{\file{pdfpages-bidi.def}{\from{bidi.dtx}{pdfpages-bidi.def}}}
-\generate{\file{pstricks-bidi.def}{\from{bidi.dtx}{pstricks-bidi.def}}}
-\generate{\file{ragged2e-bidi.def}{\from{bidi.dtx}{ragged2e-bidi.def}}}
-\generate{\file{refrep-bidi.def}{\from{bidi.dtx}{refrep-bidi.def}}}
-\generate{\file{report-bidi.def}{\from{bidi.dtx}{report-bidi.def}}}
-\generate{\file{rapport3-bidi.def}{\from{bidi.dtx}{rapport3-bidi.def}}}
-\generate{\file{scrartcl-bidi.def}{\from{bidi.dtx}{scrartcl-bidi.def}}}
-\generate{\file{scrbook-bidi.def}{\from{bidi.dtx}{scrbook-bidi.def}}}
-\generate{\file{scrreprt-bidi.def}{\from{bidi.dtx}{scrreprt-bidi.def}}}
-\generate{\file{stabular-bidi.def}{\from{bidi.dtx}{stabular-bidi.def}}}
-\generate{\file{tabls-bidi.def}{\from{bidi.dtx}{tabls-bidi.def}}}
-\generate{\file{tabulary-bidi.def}{\from{bidi.dtx}{tabulary-bidi.def}}}
-\generate{\file{tikz-bidi.def}{\from{bidi.dtx}{tikz-bidi.def}}}
-\generate{\file{tocbibind-bidi.def}{\from{bidi.dtx}{tocbibind-bidi.def}}}
-\generate{\file{tocloft-bidi.def}{\from{bidi.dtx}{tocloft-bidi.def}}}
-\generate{\file{tocstyle-bidi.def}{\from{bidi.dtx}{tocstyle-bidi.def}}}
-\generate{\file{xltxtra-bidi.def}{\from{bidi.dtx}{xltxtra-bidi.def}}}
-\generate{\file{wrapfig-bidi.def}{\from{bidi.dtx}{wrapfig-bidi.def}}}
-%</batchfile>
-%<batchfile>\endbatchfile
-%<*internal>
-\generate{\file{bidi.ins}{\from{bidi.dtx}{batchfile}}}
-\nopreamble\nopostamble
-\generate{\file{README.txt}{\from{bidi.dtx}{readme}}}
-\generate{\file{beamer-sample.tex}{\from{bidi.dtx}{beamer-sample.tex}}}
-\generate{\file{bidicasual-samplecv.tex}{\from{bidi.dtx}{bidicasual-samplecv.tex}}}
-\generate{\file{bidiclassic-samplecv.tex}{\from{bidi.dtx}{bidiclassic-samplecv.tex}}}
-\generate{\file{bidisample2e.tex}{\from{bidi.dtx}{bidisample2e.tex}}}
-\generate{\file{bidismall2e.tex}{\from{bidi.dtx}{bidismall2e.tex}}}
-\generate{\file{presentation-sample.tex}{\from{bidi.dtx}{presentation-sample.tex}}}
-\generate{\file{test-bidi.tex}{\from{bidi.dtx}{test-bidi.tex}}}
-\generate{\file{test-supertabular.tex}{\from{bidi.dtx}{test-supertabular.tex}}}
-\generate{\file{test-tabular.tex}{\from{bidi.dtx}{test-tabular.tex}}}
-\generate{\file{test-tabularx.tex}{\from{bidi.dtx}{test-tabularx.tex}}}
-\generate{\file{test-tabulary.tex}{\from{bidi.dtx}{test-tabulary.tex}}}
-\generate{\file{test1-wrapfig.tex}{\from{bidi.dtx}{test1-wrapfig.tex}}}
-\generate{\file{test2-wrapfig.tex}{\from{bidi.dtx}{test2-wrapfig.tex}}}
-\generate{\file{test3-wrapfig.tex}{\from{bidi.dtx}{test3-wrapfig.tex}}}
-\endgroup
-%</internal>
-%
-%<*driver>
-\documentclass{ltxdoc}
-\usepackage[sc,osf]{mathpazo}
-\usepackage{fvrb-ex}
-\EnableCrossrefs
-\CodelineIndex
-\RecordChanges
-\OnlyDescription
-
-\begin{document}
-  \DocInput{bidi.dtx}
-\end{document}
-%</driver>
-%
-%
-% \fi
-%
-% \GetFileInfo{bidi.sty}
-% \makeatletter
-%
-%\title{The \textsf{bidi} Package}
-%\author{Vafa Khalighi\\
-%\footnotesize\texttt{<vafa@users.berlios.de>}}
-%
-% \StopEventually{}
-% \section{Implementation}
-% \part{bidi.sty}
-%\iffalse
-%<*bidi.sty>
-% \fi
-%
-%
-%    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\def\bididate{2009/08/09}
-\def\bidiversion{v1.0.3}
-\def\bidirevision{revision 82}
-\ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidirevision>
-	Bidirectional typesetting in XeLaTeX]
-\AtBeginDocument{\special{pdf: docinfo <<
-/Creator (Bidi \bidiversion\space <\bidirevision> Copyright © 2009 Vafa Khalighi)
-         >>}}
-\newif\if@RTLmain
-\newif\if@RTL
-\newif\if@RTLtab
-\newif\if@sentdir
-\newif\if@RTL@footnote
-\let\if@rlmain=\if@RTLmain
-\let\@rlmaintrue=\@RTLmaintrue
-\let\@rlmainfalse=\@RTLmainfalse
-\let\if@rl=\if@RTL
-\let\@rltrue=\@RTLtrue
-\let\@rlfalse=\@RTLfalse
-\let\if@rl@footnote=\if@RTL@footnote
-\let\@rl@footnotetrue=\@RTL@footnotetrue
-\let\@rl@footnotefalse=\@RTL@footnotefalse
-\let\if@tab@rl=\if@RTLtab
-\let\@tab@rltrue=\@RTLtabtrue
-\let\@tab@rlfalse=\@RTLtabfalse
-\@RTLmainfalse
-\RequirePackage{amsmath}
-\newcommand\bidi@isloaded[2][]{
-  \expandafter\ifx\csname if@bidi@#2loaded@\endcsname\relax
-    \expandafter\newif\csname if@bidi@#2loaded@\endcsname
-  \fi
-  \@ifpackageloaded{#2}
-    {\csname @bidi@#2loaded@true\endcsname #1}
-    {\csname @bidi@#2loaded@false\endcsname}}
-\bidi@isloaded{xunicode}
-\AtBeginDocument{
-  \if@bidi@xunicodeloaded@
-    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xunicode before bidi package. Please load package xunicode after bidi package, and then try to run xelatex on your document again}{}]{xunicode}
-  \fi%
-}
-\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%
-    \else\@RTLmainfalse%
-    \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\RTLdblcol\autofootnoterule}
-\DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\RTLdblcol\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\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{\beginR\expandafter\@leftmark\botmark\@empty\@empty\endR}
-\def\rightmark{\beginR\expandafter\@rightmark\firstmark\@empty\@empty\endR}
-\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{%
-      \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}
-\newcommand{\RTLdblcol}{\renewcommand{\@outputdblcol}{\RTL@outputdblcol}}
-\newcommand{\LTRdblcol}{\renewcommand{\@outputdblcol}{\LTR@outputdblcol}}
-\long\def\@makecaption#1#2{%
- \vskip 10pt%
- \setbox\@tempboxa\hbox{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize \if@RTL\beginR\fi#1: #2\par%
- \else \hbox
-to\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil%
-\if@RTL\endR\fi}%
- \fi}
-\renewenvironment{equation}{%
-  \incr@eqnum
-  \mathdisplay@push
-  \st@rredfalse \global\@eqnswtrue
-  \beginL\mathdisplay{equation}%
-}{%
-  \endmathdisplay{equation}\endL%
-  \mathdisplay@pop
-  \ignorespacesafterend
-}
-\renewcommand{\numberwithin}[3][\arabic]{%
-  \@ifundefined{c@#2}{\@nocounterr{#2}}{%
-    \@ifundefined{c@#3}{\@nocnterr{#3}}{%
-      \@addtoreset{#2}{#3}%
-      \@xp\xdef\csname the#2\endcsname{%
-        \@xp\@nx\csname the#3\endcsname \@SepMark\@nx#1{#2}}}}%
-}
-\def\tagform@#1{\maketag@@@{\if@RTL)\else(\fi\ignorespaces\text{#1}\unskip\@@italiccorr\if@RTL(\else)\fi}}
-\renewcommand{\eqref}[1]{\beginL\textup{\tagform@{\ref{#1}}}\endL}
-\let\@@text=\text
-\def\text#1{\@@text{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
-\input{footnote-bidi.def}
-\@ifpackageloaded{amsthm}{\input{amsthm-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{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{memoir}{\input{memoir-bidi.def}}{}
-\@ifclassloaded{refrep}{\input{refrep-bidi.def}}{}
-\@ifclassloaded{report}{\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}{\input{book-bidi.def}}{}
-\@ifclassloaded{bidibeamer}{\input{bidibeamer-bidi.def}}{}
-\@ifpackageloaded{tocbibind}{\@ifclassloaded{memoir}{}{\input{tocbibind-bidi.def}}}{}
-\@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-bidi.def}}}{}
-\ProcessOptions
-
-%    \end{macrocode}
-% \iffalse
-%</bidi.sty>
-%<*amsart-bidi.def>
-% \fi
-% \part{amsart-bidi.def}
-%    \begin{macrocode}
-\def\@tocline#1#2#3#4#5#6#7{\relax
-  \ifnum #1>\c@tocdepth % then omit
-  \else
-    \par \addpenalty\@secpenalty\addvspace{#2}%
-    \begingroup \hyphenpenalty\@M
-    \@ifempty{#4}{%
-      \@tempdima\csname r@tocindent\number#1\endcsname\relax
-    }{%
-      \@tempdima#4\relax
-    }%
-    \parindent\z@ \if@RTL\rightskip\else\leftskip\fi#3\relax \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima\relax
-    \if@RTL\leftskip\else\rightskip\fi\@pnumwidth plus4em \parfillskip-\@pnumwidth
-    #5\leavevmode\hskip-\@tempdima #6\nobreak\relax
-    \hfil\hbox to\@pnumwidth{\@tocpagenum{#7}}\par
-    \nobreak
-    \endgroup
-  \fi}
-\renewcommand\thesubsection    {\thesection\@SepMark\arabic{subsection}}
-\renewcommand\thesubsubsection {\thesubsection \@SepMark\arabic{subsubsection}}
-\renewcommand\theparagraph     {\thesubsubsection\@SepMark\arabic{paragraph}}
-\renewcommand\thesubparagraph  {\theparagraph\@SepMark\arabic{subparagraph}}
-\def\part{\@startsection{part}{0}%
-  \z@{\linespacing\@plus\linespacing}{.5\linespacing}%
-  {\normalfont\bfseries\raggedleft}}
-\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
-}
-%    \end{macrocode}
-% \iffalse
-%</amsart-bidi.def>
-%<*amsbook-bidi.def>
-% \fi
-% \part{amsbook-bidi.def}
-%    \begin{macrocode}
-\def\@tocline#1#2#3#4#5#6#7{\relax
-  \ifnum #1>\c@tocdepth % then omit
-  \else
-    \par \addpenalty\@secpenalty\addvspace{#2}%
-    \begingroup \hyphenpenalty\@M
-    \@ifempty{#4}{%
-      \@tempdima\csname r@tocindent\number#1\endcsname\relax
-    }{%
-      \@tempdima#4\relax
-    }%
-    \parindent\z@ \if@RTL\rightskip\else\leftskip\fi#3\relax \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima\relax
-    \if@RTL\leftskip\else\rightskip\fi\@pnumwidth plus4em \parfillskip-\@pnumwidth
-    #5\leavevmode\hskip-\@tempdima #6\nobreak\relax
-    \hfil\hbox to\@pnumwidth{\@tocpagenum{#7}}\par
-    \nobreak
-    \endgroup
-  \fi}
-\renewcommand\thesubsection    {\thesection\@SepMark\arabic{subsection}}
-\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}}
-%    \end{macrocode}
-% \iffalse
-%</amsbook-bidi.def>
-%<*amsthm-bidi.def>
-% \fi
-% \part{amsthm-bidi.def}
-%    \begin{macrocode}
-\def\@thmcountersep{\@SepMark}
-%    \end{macrocode}
-% \iffalse
-%</amsthm-bidi.def>
-%<*array-bidi.def>
-% \fi
-% \part{array-bidi.def}
-%    \begin{macrocode}
-\def\@testpach{\@chclass
- \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
-  \ifnum \@lastchclass=7 5 \else
-   \ifnum \@lastchclass=8 \tw@ \else
-    \ifnum \@lastchclass=9 \thr@@
-   \else \z@
-   \ifnum \@lastchclass = 10 \else
-   \edef\@nextchar{\expandafter\string\@nextchar}%
-   \@chnum
-   \if \@nextchar c\z@ \else
-    \if \@nextchar \if@RTLtab r\else l\fi\@ne \else
-     \if \@nextchar \if@RTLtab l\else r\fi\tw@ \else
-   \z@ \@chclass
-   \if\@nextchar |\@ne \else
-    \if \@nextchar !6 \else
-     \if \@nextchar @7 \else
-      \if \@nextchar <8 \else
-       \if \@nextchar >9 \else
-  10
-  \@chnum
-  \if \@nextchar m\thr@@\else
-   \if \@nextchar p4 \else
-    \if \@nextchar b5 \else
-   \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi
-   \fi \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
-\def\tabular{\gdef\@halignto{}\@tabular}
-\def\@tabular{\if@RTL\global\@RTLtabtrue\fi%
- \leavevmode
- \hbox\bgroup \if@RTLtab\beginR \fi
-   $%
-   \@tabularinit
-   \@array
-}
-\renewcommand\@array[2][c]{%
-   \@tempdima \ht \strutbox
-   \advance \@tempdima by\extrarowheight
-   \setbox \@arstrutbox \hbox{%
-     \vrule \@height \arraystretch \@tempdima
-            \@depth  \arraystretch \dp \strutbox
-            \@width  \z@
-   }%
-   \begingroup
-     \@mkpream{#2}%
-     \xdef\@preamble{%
-       \noexpand \ialign \@halignto
-       \bgroup \@arstrut \@preamble
-         \tabskip \z@ \cr
-     }%
-   \endgroup
-   \@arrayleft
-   \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi
-   \bgroup
-     \@arrayinit
-     \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
-       \@preamble
-         % indent
-}
-%% environment body goes here
-\def\endtabular{%
-         \crcr
-       \egroup % \bgroup from \@preamble
-     \if@RTLtab\egroup\endR\egroup\fi % \vbox\hbox
-   \egroup
-   \gdef\@preamble{}%
-   $\if@RTLtab\endR\fi%
- \egroup % original \hbox
-\global\@RTLtabfalse}
-\def\@tabularinit{%
-   \col@sep\tabcolsep
-   \let \d@llarbegin \begingroup
-   \let \d@llarend \endgroup
-}
-\def\@arrayinit{%
-   \let \@sharp ##
-   \let \protect \relax
-   \lineskip \z@
-   \baselineskip \z@
-   \m@th
-   \let \\ \@arraycr
-   \let \tabularnewline \\%
-   \let \par \@empty
-}
-%    \end{macrocode}
-% \iffalse
-%</array-bidi.def>
-%<*article-bidi.def>
-% \fi
-% \part{article-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty\@secpenalty
-    \addvspace{2.25em \@plus\p@}%
-    \setlength\@tempdima{3em}%
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      {\leavevmode
-       \large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
-       \nobreak
-       \if@compatibility
-         \global\@nobreaktrue
-         \everypar{\global\@nobreakfalse\everypar{}}%
-      \fi
-    \endgroup
-  \fi}
-\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}
-\def\@part[#1]#2{%
-    \ifnum \c@secnumdepth >\m@ne
-      \refstepcounter{part}%
-      \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
-    \else
-      \addcontentsline{toc}{part}{#1}%
-    \fi
-    {\parindent \z@ \raggedleft
-     \interlinepenalty \@M
-     \normalfont
-     \ifnum \c@secnumdepth >\m@ne
-       \Large\bfseries \partname\nobreakspace\thepart
-       \par\nobreak
-     \fi
-     \huge \bfseries #2%
-     \markboth{}{}\par}%
-    \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\beginR\leftmark\endR\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
-      \let\@mkboth\markboth
-    \def\sectionmark##1{%
-      \markboth {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\z@
-          \thesection\quad
-        \fi
-        \beginR##1\endR}}{}}%
-    \def\subsectionmark##1{%
-      \markright {%
-        \ifnum \c@secnumdepth >\@ne
-          \beginR\thesubsection\quad\endR
-        \fi
-        \beginR##1\endR}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
-    \let\@mkboth\markboth
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\m@ne
-          \beginR\thesection\quad\endR
-        \fi
-        \beginR##1\endR}}}}
-\fi
-\def\ps@myheadings{%
-    \let\@oddfoot\@empty\let\@evenfoot\@empty
-    \def\@evenhead{\sl\thepage\hfil\beginR\leftmark\endR}%
-    \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-    \let\@mkboth\@gobbletwo
-    \let\sectionmark\@gobble
-    \let\subsectionmark\@gobble
-    }
-\pagestyle{plain}
-%    \end{macrocode}
-% \iffalse
-%</article-bidi.def>
-%<*bidibeamer-bidi.def>
-% \fi
-% \part{beamer-bidi.def}
-%    \begin{macrocode}
-\raggedleft
-\def\LTR{\bgroup\par\raggedright\@RTLfalse}
-\def\endLTR{\par\egroup}
-\def\RTL{\bgroup\par\raggedleft\@RTLtrue}
-\def\endRTL{\par\egroup}
-\long\def\beamer@@frametitle[#1]#2{%
-  \beamer@ifempty{#2}{}{%
-    \gdef\insertframetitle{\raggedleft\rightskip=2em{\beginR#2\endR\ifnum\beamer@autobreakcount>0\relax{}\space\usebeamertemplate*{frametitle continuation}\fi}}%
-  \gdef\beamer@frametitle{\beginR#2\endR}%
-  \gdef\beamer@shortframetitle{\beginR#1\endR}%
-}%
-}
-\def\@thm#1#2#3{%
-  \ifhmode\unskip\unskip\par\fi
-  \normalfont
-  \let\thmheadnl\relax
-  \let\thm@swap\@gobble
-  \thm@headpunct{.}% add period after heading
-  \thm@space@setup
-  #1% style overrides
-  \def\inserttheoremname{#3}
-  \def\inserttheorempunctuation{\the\thm@headpunct}
-  \def\@tempa{#2}%
-  \ifx\@empty\@tempa
-    \def\inserttheoremnumber{}
-  \else
-    \refstepcounter{#2}%
-    \expandafter\def\expandafter\inserttheoremnumber\expandafter{ \csname the#2\endcsname}
-  \fi
-  \beamer@begintheorem%
-\raggedleft\@RTLtrue
-}
- \ifbeamer@countsect
-      \newtheorem{biditheorem}{\raggedleft \biditheoremname}[section]
-    \else
-      \newtheorem{biditheorem}{\raggedleft \biditheoremname}
-    \fi
-    \newtheorem{bidicorollary}[theorem]{\raggedleft \bidicorollaryname}
-    \newtheorem{bidifact}[theorem]{\raggedleft \bidifactname}
-    \newtheorem{bidilemma}[theorem]{\raggedleft \bidilemmaname}
-    \newtheorem{bidiproblem}[theorem]{\raggedleft \bidiproblemname}
-    \newtheorem{bidisolution}[theorem]{\raggedleft \bidisolutionname}
-\theoremstyle{definition}
-    \newtheorem{bididefinition}[theorem]{\raggedleft \bididefinitionname}
-    \newtheorem{bididefinitions}[theorem]{\raggedleft \bididefinitionsname}
-\theoremstyle{example}
-    \newtheorem{bidiexample}[theorem]{\raggedleft \bidiexamplename}
-    \newtheorem{bidiexamples}[theorem]{\raggedleft \bidiexamplesname}
-\newenvironment<>{bidiproof}[1][\raggedleft \bidiproofname]{%
-  \par
-  \def\insertproofname{#1\@addpunct{}}%
-  \pushQED{\qed}
-  \usebeamertemplate{proof begin}\@RTLtrue#2}
-{\popQED\usebeamertemplate{proof end}}
- \newenvironment<>{bidiblock}[1]{%
-    \begin{actionenv}#2%
-      \def\insertblocktitle{\raggedleft#1}%
-      \par%
-      \usebeamertemplate{block begin}\raggedleft\@RTLtrue}
-    {\par%
-      \usebeamertemplate{block end}%
-    \end{actionenv}}
-  \newenvironment<>{bidialertblock}[1]{%
-    \begin{actionenv}#2%
-      \def\insertblocktitle{\raggedleft#1}%
-      \par%
-      \mode<presentation>{%\usebeamerfont{block}%
-        \setbeamercolor{local structure}{parent=alerted text}}%
-      \usebeamertemplate{block alerted begin}\raggedleft\@RTLtrue}
-    {\par%
-      \usebeamertemplate{block alerted end}%
-    \end{actionenv}}
-  \newenvironment<>{bidiexampleblock}[1]{%
-    \begin{actionenv}#2%
-      \def\insertblocktitle{\raggedleft#1}%
-      \par%
-      \mode<presentation>{%\usebeamerfont{block}%
-        \setbeamercolor{local structure}{parent=example text}}%
-      \usebeamertemplate{block example begin}\raggedleft\@RTLtrue}
-    {\par%
-      \usebeamertemplate{block example end}%
-    \end{actionenv}}
-\def\@listi{\if@RTL\rightmargin\leftmargini\else\leftmargin\leftmargini\fi
-            \topsep 3\p@ \@plus2\p@ \@minus2.5\p@
-            \parsep 0\p@
-            \itemsep3\p@ \@plus2\p@ \@minus3\p@}
-\let\@listI\@listi
-\def\@listii{\if@RTL\rightmargin\leftmarginii\else\leftmargin\leftmarginii\fi
-              \topsep    2\p@ \@plus1\p@ \@minus2\p@
-              \parsep    0\p@   \@plus\p@
-              \itemsep   \parsep}
-\def\@listiii{\if@RTL\rightmargin\leftmarginiii\else\leftmargin\leftmarginiii\fi
-              \topsep    2\p@ \@plus1\p@ \@minus2\p@
-              \parsep    0\p@   \@plus\p@
-              \itemsep   \parsep}
-\def\beamer@enum@{%
-  \beamer@computepref\@itemdepth% sets \beameritemnestingprefix
-  \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
-  \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
-  \usebeamertemplate{itemize/enumerate \beameritemnestingprefix body begin}%
-  \expandafter
-    \list
-      {\usebeamertemplate{\beamer@enumtempl}}
-      {\usecounter\@enumctr%
-        \def\makelabel##1{{\hss\llap{{%
-                \usebeamerfont*{enumerate \beameritemnestingprefix item}%
-                \usebeamercolor[fg]{enumerate \beameritemnestingprefix item}##1}}}}}%
-  \beamer@cramped%
-  \raggedleft%
-  \beamer@firstlineitemizeunskip%
-}
-\renewcommand{\itemize}[1][]{%
-  \beamer@ifempty{#1}{}{\def\beamer@defaultospec{#1}}%
-  \ifnum \@itemdepth >2\relax\@toodeep\else
-    \advance\@itemdepth\@ne
-    \beamer@computepref\@itemdepth% sets \beameritemnestingprefix
-    \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
-    \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
-    \usebeamertemplate{itemize/enumerate \beameritemnestingprefix body begin}%
-    \list
-      {\usebeamertemplate{itemize \beameritemnestingprefix item}}
-      {\def\makelabel##1{%
-          {%
-            \hss\llap{{%
-                \usebeamerfont*{itemize \beameritemnestingprefix item}%
-                \usebeamercolor[fg]{itemize \beameritemnestingprefix item}##1}}%
-          }%
-        }%
-      }
-  \fi%
-  \beamer@cramped%
-  \raggedleft%
-  \beamer@firstlineitemizeunskip%
-}
-\def\@@description{%
-  \advance\beamer@descdefault by \labelsep%
-  \list
-  {}
-  {\labelwidth\beamer@descdefault\leftmargin\beamer@descdefault\let\makelabel\beamer@descriptionitem}%
-  \beamer@cramped%
-  \raggedleft\rightskip=6em
-  \beamer@firstlineitemizeunskip%
-}
-\AtBeginDocument{\@RTLfalse}
-\renewenvironment{beamer@frameslide}{%
-  \ifbeamer@autobreak\else%
-    \ifx\beamer@againname\@empty%
-      {\let\@elt\beamer@restorecounter\beamer@overlaycounterresets}%
-    \else%
-      {\let\@elt\beamer@labelrestorecounter\beamer@overlaycounterresets}%      
-    \fi%
-  \fi%
-  \global\c@beamerpauses=1\relax%
-  \expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{%
-    \refstepcounter{subsectionslide}%
-    \xdef\beamer@framestartpage{\the\c@page}% only first time
-  }{\clearpage\beamer@notesactions}% cleanup from previous slide
-  \hypersetup{pdfpagetransition=R}%
-  \hypersetup{pdfpageduration=}%
-  \xdef\beamer@frameendpage{\the\c@page}% every time
-  \beamer@setuplinks%
-  \beamer@displaybreak%
-  \global\setbox\beamer@zoombox=\box\voidb@x%
-  \def\beamer@zoomer{}%
-  \beamer@slidehaszoomfalse%
-  \gdef\insertframetitle{}%
-  \gdef\insertframesubtitle{}%
-  \gdef\beamer@frametitle{}%
-  \gdef\beamer@shortframetitle{}%
-  \gdef\beamer@framesubtitle{}%
-  \let\beamer@startcomment=\beamer@startcommentinframe%
-  % Start slide:
-  \beamer@framenotesbegin\@RTLtrue%
-    \global\setbox\beamer@framebox=\vbox\bgroup%
-    \beamer@inframetrue%
-    \let\frame=\framelatex% inside frames, use LaTeX's \frame command
-    \begin{beamer@framepauses}%
-      \ifbeamer@shrink%
-        \hsize=\beamer@shrinkfactorinv\hsize%
-        \textwidth=\beamer@shrinkfactorinv\textwidth%
-        \linewidth=\beamer@shrinkfactorinv\linewidth%
-      \fi%
-      % Insert labels if necessary:
-      \ifx\beamer@againname\@empty\else%
-        \nointerlineskip\vbox to0pt{\vss%
-        \label<\the\beamer@slideinframe>{\beamer@againname<\the\beamer@slideinframe>}%
-        \ifnum\beamer@slideinframe=1\relax%
-          \label<1>{\beamer@againname}%
-        \fi%
-        }\nointerlineskip%
-      \fi%
-      \ifx\beamer@framehypertargets\@empty\else%
-        \nointerlineskip\vbox to0pt{\vss%
-          \beamer@framehypertargets%
-          \global\let\beamer@framehypertargets\@empty%
-        }\nointerlineskip%
-      \fi%
-      \vskip-\parskip\vbox{}%
-      \beamer@initfirstlineunskip%
-      \ifbeamer@plainframe\nointerlineskip\fi%
-    \beamer@checkframetitle}%
-    {\end{beamer@framepauses}%
-  \egroup%
-  \ifx\beamer@frametitle\@empty%
-    \setbox\beamer@frametitlebox=\box\voidb@x%
-  \else%
-    \setbox\beamer@frametitlebox=\vbox{%
-      \vbox{}%
-      {\parskip0pt\usebeamertemplate***{frametitle}\vskip0.25em}%
-    }%
-  \fi%
-  \ifbeamer@plainframe%
-    \beamer@frametextheight=\paperheight%
-  \else%
-    \beamer@frametextheight=\textheight%
-  \fi%
-  \advance\beamer@frametextheight by-\ht\beamer@frametitlebox%
-  \advance\beamer@frametextheight by-\dp\beamer@frametitlebox%
-  \advance\beamer@frametextheight by-\beamer@frametopskip%
-  \ifbeamer@shrink%
-    \beamer@shrinkframebox%
-  \fi%
-  \ifx\beamer@zoomer\@empty  
-    \setbox\beamer@framebox=\vbox{%
-      \nobreak\vbox{}\nobreak\par\nobreak\beamer@entrycode\nobreak%
-      \nointerlineskip\unvbox\beamer@frametitlebox%
-      \nobreak%
-      \ifbeamer@autobreak%
-        \vskip\beamer@frametopskipautobreak%
-      \else%
-        \vskip\beamer@frametopskip%
-      \fi%
-      \nobreak%
-      \nointerlineskip\box\beamer@zoombox\nointerlineskip%
-      \nobreak%
-      \ifbeamer@slidehaszoom\box\beamer@framebox\else\unvbox\beamer@framebox\fi%
-      % bottom skip is added in autobreakframebox
-    }%
-    \beamer@autobreakframebox%
-  \else%
-    \beamer@zoomer%
-  \fi%
-  \beamer@undolabels%
-  \beamer@framenotesend%
-  \box\beamer@framebox}
-\long\def\beamer@title[#1]#2{%
-  \def\inserttitle{\beginR#2\endR}%
-  \def\beamer@shorttitle{\beginR#1\endR}%
-  }
-\long\def\beamer@subtitle[#1]#2{%
-  \def\insertsubtitle{\beginR#2\endR}%
-  \def\beamer@shortsubtitle{\beginR#1\endR}%
-  }
-\long\def\beamer@date[#1]#2{%
-  \def\insertdate{\beginR#2\endR}%
-  \def\beamer@shortdate{\beginR#1\endR}%
-  }
-\long\def\beamer@author[#1]#2{%
-  \def\insertauthor{\def\inst{\beamer@insttitle}\def\and{\beamer@andtitle}\beginR#2\endR}%
-  \def\beamer@shortauthor{\beginR#1\endR}%
-  \ifbeamer@autopdfinfo%
-    \def\beamer@andstripped{}%
-    \beamer@stripands#2 \and\relax
-    {\let\inst=\@gobble\let\thanks=\@gobble\def\and{, }\hypersetup{pdfauthor={\beamer@andstripped}}}
-  \fi%
-}
-\long\def\beamer@institute[#1]#2{%
-  \def\beamer@temp{\beginR#2\endR}%
-  \ifx\beamer@temp\@empty
-    \def\insertinstitute{}
-  \else
-    \def\insertinstitute{\def\inst{\beamer@instinst}\def\and{\beamer@andinst}\beginR#2\endR}%
-  \fi
- \def\beamer@shortinstitute{\beginR#1\endR}}
-\renewenvironment{thebibliography}[1]
-{%\leavevmode\unskip%
-  \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\beamer@biblabeltemplate{\@biblabel{#1}}}%
-            \leftmargin\labelwidth
-            \advance\leftmargin\labelsep
-            \itemsep=0pt%
-            \partopsep=0pt%
-            \topsep=0pt%
-            \usecounter{enumiv}%
-            \let\p@enumiv\@empty
-            \renewcommand\theenumiv{\@arabic\c@enumiv}
-            \let\makelabel\beamer@biblabeltemplate}%
-      \sloppy\raggedleft
-      \clubpenalty10000
-      \@clubpenalty \clubpenalty
-      \widowpenalty10000%
-      \sfcode`\.\@m}
-     {\def\@noitemerr
-       {\@latex@warning{Empty `thebibliography' environment}}%
-      \ifhmode\unskip\fi\endlist}
-\long\def\beamer@@@section#1{\beamer@section[\beginR#1\endR]{#1}}
-\def\beamer@@@subsection#1{\beamer@subsection[\beginR#1\endR]{#1}}
-\def\beamer@@@subsubsection#1{\beamer@subsubsection[\beginR#1\endR]{#1}}
-\long\def\beamer@subsectionintoc#1#2#3#4#5#6{%
-  \ifnum\c@tocdepth>1%
-  \ifnum#5=\beamer@showpartnumber%
-  {
-    \beamer@saveanother%
-    \gdef\beamer@todo{}%
-    \beamer@slideinframe=#1\relax%
-    \expandafter\only\beamer@tocsections{\gdef\beamer@todo{%
-      \ifbeamer@pausesubsections\pause\fi%
-      \beamer@tempcount=#6%
-      \advance\beamer@tempcount by\beamer@sectionadjust%
-      \edef\inserttocsectionnumber{\the\beamer@tempcount}%
-      \def\inserttocsubsectionnumber{#2}%
-      \def\inserttocsubsection{\rightskip=1.5em\hyperlink{Navigation#4}{\beginR#3\endR\hfill}}%
-      \beamer@tocifnothide{\ifnum\c@section=#1\beamer@toc@oss\else\beamer@toc@ooss\fi}%
-      {%
-        \def\beamer@breakhere{\\}%              
-        \beamer@tocact{\ifnum\c@section=#1\ifnum\c@subsection=#2\beamer@toc@css\else\beamer@toc@oss\fi\else\beamer@toc@ooss\fi}
-        {subsection in toc}%
-      }%
-    }}%
-    \beamer@restoreanother%
-  }
-  \beamer@todo%
-  \fi\fi%
-}
-\long\def\beamer@subsubsectionintoc#1#2#3#4#5#6#7{%
-  \ifnum\c@tocdepth>2%
-  \ifnum#1=\beamer@showpartnumber%
-  {
-    \beamer@saveanother%
-    \gdef\beamer@todo{}%
-    \beamer@slideinframe=#2\relax%
-    \expandafter\only\beamer@tocsections{\gdef\beamer@todo{%
-      \ifbeamer@pausesubsections\pause\fi%
-      \beamer@tempcount=#6%
-      \advance\beamer@tempcount by\beamer@sectionadjust%
-      \edef\inserttocsectionnumber{\the\beamer@tempcount}%
-      \def\inserttocsubsectionnumber{#3}%
-      \def\inserttocsubsubsectionnumber{#4}%
-      \def\inserttocsubsubsection{\rightskip=3em\hyperlink{Navigation#5}{\beginR#7\endR\hfill}}%
-      \beamer@tocifnothide{\ifnum\c@section=#2\beamer@toc@oss\else\beamer@toc@ooss\fi}%
-      {%
-        \def\beamer@breakhere{\\}%              
-        \beamer@tocact{\ifnum\c@section=#2\ifnum\c@subsection=#3\beamer@toc@css\else\beamer@toc@oss\fi\else\beamer@toc@ooss\fi}
-        {subsubsection in toc}%
-      }%
-    }}%
-    \beamer@restoreanother%
-  }
-  \beamer@todo%
-  \fi\fi%
-}
-\long\def\beamer@makecaption#1#2{%
-  \def\insertcaptionname{\csname#1name\endcsname}%
-  \def\insertcaptionnumber{\csname the#1\endcsname}%
-  \def\insertcaption{#2}%
-  \nobreak\vskip\abovecaptionskip\nobreak
-  \sbox\@tempboxa{\usebeamertemplate**{caption}}%
-  \ifdim \wd\@tempboxa >\hsize
-    \usebeamertemplate**{caption}\par
-  \else
-    \global \@minipagefalse
-    \hb@xt@\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}%
-  \fi
-  \nobreak\vskip\belowcaptionskip\nobreak}
-\let\origin@alert=\alert
-\def\alert#1{\ifmmode\origin@alert{#1}\else\if@RTL\beginL\origin@alert{\beginR#1\endR}\endL\else\origin@alert{#1}\fi\fi}
-%    \end{macrocode}
-% \iffalse
-%</bidibeamer-bidi.def>
-%<*bidibeamer.cls>
-% \fi
-% \part{bidibeamer.cls}
-%    \begin{macrocode}
-% Copyright 2007 by Till Tantau
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/licenses/LICENSE for more details.
-
-\RequirePackage{beamerbasercs}
-\def\beamer@version{3.07}
-
-
-
-
-\RequirePackage{beamerbasemodes}
-% Setup modes and check for article option
-
-\beamer@transferifnecessary
-
-%
-% Ensure that \pdfoutput is defined. Might be removed at some point.
-%
-\ifx\pdfoutput\@undefined \newcount\pdfoutput \fi
-\ifx\pdfoutput\relax \newcount\pdfoutput \fi
-
-%
-%
-% Declarations used by beamer
-%
-%
-
-% Public
-\newdimen\headheight    % Total height of the headline (including depth)
-\newdimen\headdp        % Depth of the headline
-\newdimen\footheight    % Height of the footline
-\newdimen\sidebarheight % Height of the sidebars
-
-% Private
-\newdimen\beamer@tempdim
-\newdimen\beamer@finalheight
-\newdimen\beamer@animht
-\newdimen\beamer@animdp
-\newdimen\beamer@animwd
-\newdimen\beamer@leftmargin
-\newdimen\beamer@rightmargin
-\newdimen\beamer@leftsidebar
-\newdimen\beamer@rightsidebar
-\newdimen\beamer@boxsize
-\newdimen\beamer@vboxoffset
-\newdimen\beamer@descdefault
-\newdimen\beamer@descriptionwidth
-
-\newskip\beamer@lastskip
-
-\newbox\beamer@areabox
-\newbox\beamer@animcurrent
-\newbox\beamer@animshowbox
-\newbox\beamer@sectionbox
-\newbox\beamer@logobox
-\newbox\beamer@linebox
-
-\newcount\beamer@sectioncount
-\newcount\beamer@subsubsectionmax
-\newcount\beamer@subsectionmax
-\newcount\beamer@sectionmax
-\newcount\beamer@totalheads
-\newcount\beamer@headcounter
-\newcount\beamer@partstartpage
-\newcount\beamer@sectionstartpage
-\newcount\beamer@subsectionstartpage
-\newcount\beamer@animationtempa
-\newcount\beamer@animationtempb
-\newcount\beamer@xpos
-\newcount\beamer@ypos
-\newcount\beamer@showpartnumber
-\newcount\beamer@currentsubsection
-\newcount\beamer@coveringdepth
-\newcount\beamer@sectionadjust
-\newcount\beamer@tocsectionnumber
-
-
-\newif\ifbeamer@sansmath
-\newif\ifbeamer@altmode
-\newif\ifbeamer@notes
-\newif\ifbeamer@notesnormals
-\newif\ifbeamer@compress
-\newif\ifbeamer@centered
-\newif\ifbeamer@draftmode
-\newif\ifbeamer@suppressreplacements % decides whether fonts should be substituted
-\newif\ifbeamer@frameswithnotesonly
-\newif\ifbeamer@ignorenonframe
-\newif\ifbeamer@autopdfinfo
-
-\RequirePackage{beamerbaseoptions}
-% For option management
-
-
-
-%
-%
-% Document options
-%
-%
-
-\beamer@suppressreplacementsfalse
-\beamer@altmodefalse
-\beamer@notesfalse
-\beamer@notesnormalstrue
-\beamer@compressfalse
-\beamer@draftmodefalse
-\beamer@frameswithnotesonlyfalse
-\beamer@ignorenonframefalse
-\beamer@autopdfinfotrue
-
-\DeclareOptionBeamer{usepdftitle}[true]{\csname beamer@autopdfinfo#1\endcsname}
-\DeclareOptionBeamer{envcountsect}{\beamer@countsecttrue}
-\DeclareOptionBeamer{notheorems}{\beamer@blocksfalse}
-\DeclareOptionBeamer{noamsthm}{\beamer@blocksfalse\beamer@amsfalse}
-
-\DeclareOptionBeamer{compress}{\beamer@compresstrue}
-
-\DeclareOptionBeamer{t}{\beamer@centeredfalse}
-\DeclareOptionBeamer{c}{\beamer@centeredtrue}
-
-
-\DeclareOptionBeamer{leqno}{\input{leqno.clo}}
-\DeclareOptionBeamer{fleqn}{\input{fleqn.clo}}
-
-\def\beamer@currentmode{beamer}
-\DeclareOptionBeamer{handout}{\gdef\beamer@currentmode{handout}}
-\DeclareOptionBeamer{trans}{\gdef\beamer@currentmode{trans}}
-
-\DeclareOptionBeamer{pdftex}{}% Used by hyperref
-\DeclareOptionBeamer{nativepdf}{}% Used by hyperref
-\DeclareOptionBeamer{pdfmark}{}% Used by hyperref
-\DeclareOptionBeamer{dvips}{}% Used by hyperref
-\DeclareOptionBeamer{dviwindo}{}% Used by hyperref
-\DeclareOptionBeamer{dvipsone}{}% Used by hyperref
-\DeclareOptionBeamer{vtex}{}% Used by hyperref
-\DeclareOptionBeamer{ps2pdf}{}% Used by hyperref
-
-\DeclareOptionBeamer{ignorenonframetext}{\beamer@ignorenonframetrue}
-
-\def\beamer@size{{size11.clo}}
-\DeclareOptionBeamer{bigger}{\def\beamer@size{{size12.clo}}}
-\DeclareOptionBeamer{smaller}{\def\beamer@size{{size10.clo}}}
-
-\DeclareOptionBeamer{8pt}{\def\beamer@size{{size8.clo}}}
-\DeclareOptionBeamer{9pt}{\def\beamer@size{{size9.clo}}}
-\DeclareOptionBeamer{10pt}{\def\beamer@size{{size10.clo}}}
-\DeclareOptionBeamer{11pt}{\def\beamer@size{{size11.clo}}}
-\DeclareOptionBeamer{12pt}{\def\beamer@size{{size12.clo}}}
-\DeclareOptionBeamer{14pt}{\def\beamer@size{{size14.clo}}}
-\DeclareOptionBeamer{17pt}{\def\beamer@size{{size17.clo}}}
-\DeclareOptionBeamer{20pt}{\def\beamer@size{{size20.clo}}}
-
-\DeclareOptionBeamer{draft}{\beamer@draftmodetrue}
-\def\insertpagenumber{\thepage}
-
-\def\beamer@activecjk{}
-\def\beamer@hypercjk{}
-
-\DeclareOptionBeamer{CJK}{\ExecuteOptionsBeamer{cjk}}
-\DeclareOptionBeamer{cjk}{
-  \def\beamer@hypercjk{\hypersetup{CJKbookmarks=true}}
-
-  \def\beamer@activecjk{
-    % Activate all >=128 characters. 
-    \count@=127
-    \@whilenum\count@<254 \do{%
-      \advance\count@ by 1
-      \lccode`\~=\count@
-      \catcode\count@=\active
-      \lowercase{\def~{\kern1ex}}
-    }
-  }  
-}
-
-
-
-% obsolete options
-\DeclareOptionBeamer{notes}[show]{\csname beamer@notesaction@#1\endcsname}
-\def\beamer@notesaction@hide{%
-  \ClassWarning{beamer}{This option is obsolete. Use beamer option
-    ``hide notes'' instead.}%
-  \beamer@notesfalse}
-\def\beamer@notesaction@show{%
-  \ClassWarning{beamer}{This option is obsolete. Use beamer option
-    ``show notes'' instead.}%
-  \beamer@notestrue}
-\def\beamer@notesaction@only{%
-  \ClassWarning{beamer}{This option is obsolete. Use beamer option
-    ``show only notes'' instead.}%
-  \beamer@notestrue
-  \beamer@notesnormalsfalse
-  \nofiles
-}
-\def\beamer@notesaction@onlyslideswithnotes{%
-  \beamer@notestrue%
-  \beamer@frameswithnotesonlytrue%
-  \nofiles
-}
-\DeclareOptionBeamer{inrow}{
-  \ClassError{beamer}{``inrow'' no longer supported. Use ``compress'' instead.}{}}
-\DeclareOptionBeamer{compressnotes}{%
-  \ClassWarning{beamer}{``compressnotes'' is obsolete. Use
-    \noexpand\setbeamertemplate{note page}[compressed] instead}
-  \AtBeginDocument{\beamertemplatenotecompress}}
-\DeclareOptionBeamer{notesonly}{
-  \ClassWarning{beamer}{``notesonly'' is obsolete. Use beamer option
-    ``show only notes'' instead.}
-  \beamer@notesaction@only}
-\DeclareOptionBeamer{blue}{
-  \ClassWarning{beamer}{``blue'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.2,0.2,0.7}]{structure}}}
-\DeclareOptionBeamer{red}{
-  \ClassWarning{beamer}{``red'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.7,0.2,0.2}]{structure}}}
-\DeclareOptionBeamer{blackandwhite}{
-  \ClassWarning{beamer}{``blackandwhite'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.2,0.2,0.2}]{structure}}}
-\DeclareOptionBeamer{brown}{
-  \ClassWarning{beamer}{``brown'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.66,0.4,0.166}]{structure}}}
-\DeclareOptionBeamer{slidescentered}{
-  \ClassWarning{beamer}{``slidescentered'' is obsolete. Use ``c'' instead}
-  \beamer@centeredtrue}
-\DeclareOptionBeamer{slidestop}{
-  \ClassWarning{beamer}{``slidestop'' is obsolete. Use ``t'' instead}
-  \beamer@centeredfalse}
-\DeclareOptionBeamer{sans}{%
-  \ClassWarning{beamer}{``sans'' is obsolete. Just remove this option}  
-  \def\familydefault{\sfdefault}
-  \def\mathfamilydefault{\sfdefault}
-  \beamer@sansmathtrue
-}
-\DeclareOptionBeamer{serif}{%
-  \ClassWarning{beamer}{``serif'' is obsolete. Use font theme ``serif'' instead}
-  \def\familydefault{\rmdefault}
-  \def\mathfamilydefault{\rmdefault}
-  \beamer@sansmathfalse
-}
-\DeclareOptionBeamer{mathsans}{
-  \ClassWarning{beamer}{``mathsans'' is obsolete. Use font theme ``serif'' with option ``butsansserifmath''}  
-  \def\mathfamilydefault{\sfdefault}\beamer@sansmathtrue}
-\DeclareOptionBeamer{mathserif}{
-  \ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''}  
-  \def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse}
-\DeclareOptionBeamer{professionalfont}{
-  \ClassWarning{beamer}{``professionalfont'' is obsolete. Use font theme ``professionalfonts'' instead}
-  \beamer@suppressreplacementstrue}
-
-% has to be done here for compatibility
-\def\familydefault{\rmdefault}
-\def\mathfamilydefault{\sfdefault}
-\beamer@sansmathtrue
-
-
-
-\PassOptionsToPackage{bookmarks=true,%
-  bookmarksopen=true,%
-  pdfborder={0 0 0},%
-  pdfhighlight={/N},%
-  linkbordercolor={.5 .5 .5}}{hyperref}
-  
-\DeclareOptionBeamer{pgf}{\PassOptionsToPackage{#1}{pgf}}
-\DeclareOptionBeamer{hyperref}{\PassOptionsToPackage{#1}{hyperref}}
-\DeclareOptionBeamer{color}{\PassOptionsToPackage{#1}{color}}
-\DeclareOptionBeamer{xcolor}{\PassOptionsToPackage{#1}{xcolor}}
-
-\def\beamer@loaducs{}
-
-\DeclareOptionBeamer{ucs}{%
-  \ifcase\pdfoutput
-    \def\beamer@loaducs{
-      \RequirePackage{ucs}%
-      \AtBeginDocument{\PreloadUnicodePage{0}}%
-      \AtBeginDocument{\PreloadUnicodePage{1}}%
-    }
-  \or
-    \PassOptionsToPackage{pdftex,unicode}{hyperref}
-    \def\beamer@loaducs{
-      \RequirePackage[hyperref]{ucs}%
-      \AtBeginDocument{\PreloadUnicodePage{0}}%
-      \AtBeginDocument{\PreloadUnicodePage{1}}%
-    }
-  \fi
-}
-\DeclareOptionBeamer{utf8}{\ExecuteOptionsBeamer{ucs}%
-  \g@addto@macro\beamer@loaducs{\RequirePackage[utf8]{inputenc}}%
-}
-
-%
-% Process Options
-%
-
-\ExecuteOptionsBeamer{c}
-\ProcessOptionsBeamer
-
-% Filter class option list
-\beamer@filterclassoptions
-
-
-\RequirePackage{pgfcore,pgfbaseimage}
-% We need only the core and some image stuff for icons.
-
-\RequirePackage{xxcolor}
-% For color management.
-
-\RequirePackage{amssymb}
-% For \blacktriangleright
-
-\RequirePackage[%
-  papersize={12.80cm,9.60cm},
-  hmargin=1cm,%
-  vmargin=0cm,%
-  head=0.5cm,% will be changed later
-  headsep=0pt,%
-  foot=0.5cm% will be changed later
-  ]{geometry}
-% For the page layout
-
-\RequirePackage[implicit=false]{hyperref}
-% For hyperlinks
-
-\hypersetup{pdfcreator={LaTeX with beamer class version \beamer@version}}
-
-% Coding stuff
-\beamer@loaducs
-\beamer@hypercjk
-
-\expandafter\input\beamer@size
-\geometry{headsep=0pt}
-
-
-\RequirePackage{beamerbasecompatibility}
-% Fixes other packages
-
-\RequirePackage{beamerbasefont}
-% Font stuff
-
-% Defaults
-\normalfont
-\raggedleft
-
-\AtBeginDocument
-{
-  \addtocontents{toc}{\protect\beamer@endinputifotherversion{\beamer@version pt}}
-  \addtocontents{nav}{\protect\beamer@endinputifotherversion{\beamer@version pt}}
-}
-
-\RequirePackage{beamerbasemisc}
-% Miscellaneous commands
-
-\RequirePackage{beamerbasetwoscreens}
-% Stuff for using two screens
-
-\RequirePackage{beamerbaseoverlay}
-% Overlay stuff
-
-\RequirePackage{beamerbasetitle}
-% Commands for constructing the title page
-
-\RequirePackage{beamerbasesection}
-% Parts, sections, subsections, appendix
-
-\RequirePackage{beamerbaseframe}
-% Commands for constructing frames
-
-\RequirePackage{beamerbaseverbatim}
-% Commands for constructing frames
-
-\RequirePackage{beamerbaseframesize}
-% Commands for constructing frames
-
-\RequirePackage{beamerbaseframecomponents}
-% Headlines, sidebars, columns
-
-\RequirePackage{beamerbasecolor}
-% Color management
-
-\RequirePackage{beamerbasenotes}
-% Commands for adding notes
-
-\RequirePackage{beamerbasetoc}
-% Table of Contents Format
-
-\RequirePackage{bidibeamerbasetemplates}
-% For default templates
-
-\RequirePackage{beamerbaselocalstructure}
-% Commands for local structure like alert, itemize, etc.
-
-\RequirePackage{beamerbasenavigation}
-% Navigation buttons
-
-\RequirePackage{beamerbasetheorems}
-% Theorems
-
-\RequirePackage{beamerbasethemes}
-% Commands for including and building themes
-
-\usetheme{default}
-
-% Compatibility stuff:
-\csname beamer@loadlater\endcsname
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex"
-%%% End: 
-%    \end{macrocode}
-% \iffalse
-%</bidibeamer.cls>
-%<*bidibeamerbaseauxtemplates.sty>
-% \fi
-% \part{bidibeamerbaseauxtemplates.sty}
-%    \begin{macrocode}
-% Copyright 2007 by Till Tantau
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/licenses/LICENSE for more details.
-
-
-
-\mode<presentation>
-
-
-\RequirePackage{beamerbaseboxes}
-
-
-
-%
-% declare some balls
-%
-
-\normalsize
-\pgfdeclareradialshading[bg,parent.bg]{tocsphere}{\pgfpoint{-0.5ex}{0.6ex}}%
-{%
-  color(0cm)=(bg!35!white);
-  color(0.44ex)=(bg!75!white);
-  color(0.88ex)=(bg!70!black!90!parent.bg);
-  color(1.2ex)=(bg!50!black!90!parent.bg);
-  color(1.3ex)=(parent.bg)}
-
-\pgfdeclareradialshading[bg,parent.bg]{bigsphere}{\pgfpoint{-0.1849315ex}{.2260273ex}}%
-{%
-  color(0cm)=(bg!15);
-  color(0.1643835ex)=(bg!75);
-  color(0.3287671ex)=(bg!70!black);
-  color(0.4520547ex)=(bg!50!black);
-  color(0.53ex)=(parent.bg)}
-
-\pgfdeclareradialshading[bg,parent.bg]{smallsphere}{\pgfpoint{-0.1479452ex}{0.18287671ex}}%
-{%
-  color(0cm)=(bg!15); 
-  color(0.1315068ex)=(bg!75);
-  color(0.2630136ex)=(bg!70!black);
-  color(0.36164383ex)=(bg!50!black);
-  color(0.427ex)=(parent.bg)}
-
-\def\beamer@usesphere#1#2{%
-  \hbox{\usebeamercolor{#1}\normalsize\pgfuseshading{#2}}}
-
-
-
-
-
-
-
-
-
-
-
-%
-% Background templates
-%
-
-\define@key{beamer@backgroundgrid}{step}{\def\beamer@bggw{#1}}
-\define@key{beamer@backgroundgrid}{color}{\def\beamer@bggc{\color{#1}}}
-
-\defbeamertemplate{background}{grid}[1][]
-{%
-  \setkeys{beamer@backgroundgrid}{step=0.5cm,color=fg!10!bg}%
-  \setkeys{beamer@backgroundgrid}{#1}%
-  \begin{pgfpicture}{0cm}{0cm}{\the\paperwidth}{\the\paperheight}
-    \beamer@bggc
-    \pgfpathgrid[stepx=\beamer@bggw,stepy=\beamer@bggw]{\pgfpointorigin}{\pgfpoint{\the\paperwidth}{\the\paperheight}}
-    \pgfusepath{stroke}
-  \end{pgfpicture}%    
-}
-
-
-\define@key{beamer@backgroundshade}{top}{\def\beamer@bgst{#1}}
-\define@key{beamer@backgroundshade}{bottom}{\def\beamer@bgsb{#1}}
-\define@key{beamer@backgroundshade}{right}{\def\beamer@bgst{#1}}
-\define@key{beamer@backgroundshade}{left}{\def\beamer@bgsb{#1}}
-\define@key{beamer@backgroundshade}{middle}{\def\beamer@bgsm{#1}}
-\define@key{beamer@backgroundshade}{midpoint}{\def\beamer@bgsmp{#1}}
-
-\def\beamer@calcvertshading#1#2#3{%
-  {\usebeamercolor{palette primary}}
-  \usebeamercolor{normal text}
-  \setkeys{beamer@backgroundshade}{top=palette primary.bg!25!bg,bottom=bg,middle={},midpoint=0.5}%
-  \setkeys{beamer@backgroundshade}{#3}
-  \ifx\beamer@bgsm\@empty
-    \pgfdeclareverticalshading{#1}{#2}%
-      {color(0cm)=(\beamer@bgsb); color(\the\paperheight)=(\beamer@bgst)}
-    \colorlet{beamer@backgroundshadestart}{\beamer@bgsb}%
-    \colorlet{beamer@backgroundshadeend}{\beamer@bgst}%
-    \colorlet{beamer@average}{beamer@backgroundshadestart!50!beamer@backgroundshadeend}%
-  \else
-    \pgfdeclareverticalshading{#1}{#2}%
-      {color(0cm)=(\beamer@bgsb); color(\beamer@bgsmp\paperheight)=(\beamer@bgsm); color(\the\paperheight)=(\beamer@bgst)}
-    \colorlet{beamer@average}{\beamer@bgsm}
-  \fi%
-}
-
-\def\beamer@calchorishading#1#2#3{%
-  {\usebeamercolor{palette primary}}
-  \usebeamercolor{normal text}
-  \setkeys{beamer@backgroundshade}{left=palette primary.bg!25!bg,right=bg,middle={},midpoint=0.5}%
-  \setkeys{beamer@backgroundshade}{#3}
-  \ifx\beamer@bgsm\@empty
-    \pgfdeclarehorizontalshading{#1}{\the\paperheight}%
-      {color(0cm)=(\beamer@bgsb); color(#2)=(\beamer@bgst)}
-    \colorlet{beamer@backgroundshadestart}{\beamer@bgsb}%
-    \colorlet{beamer@backgroundshadeend}{\beamer@bgst}%
-    \colorlet{beamer@average}{beamer@backgroundshadestart!50!beamer@backgroundshadeend}%
-  \else
-    \pgfdeclarehorizontalshading{#1}{\the\paperheight}%
-      {color(0cm)=(\beamer@bgsb); color(\beamer@bgsmp#2)=(\beamer@bgsm); color(#2)=(\beamer@bgst)}
-    \colorlet{beamer@average}{\beamer@bgsm} 
-  \fi%
-}
-
-
-
-\defbeamertemplate{background canvas}{vertical shading}[1][]
-{%
-  \pgfuseshading{beamer@backgroundshading}%
-}
-[action]
-{
-  \beamer@calcvertshading{beamer@backgroundshading}{\the\paperwidth}{#1}
-  \colorlet{beamer@@average}{beamer@average}
-  \setbeamercolor{normal text}{bg=beamer@@average}
-}
-
-
-
-
-%
-% Side bars
-%
-
-\defbeamertemplate{sidebar canvas left}{vertical shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasleftshading}%
-}
-[action]
-{
-  \beamer@calcvertshading{beamer@sidebarcanvasleftshading}{\the\beamer@leftsidebar}{#1}
-}
-
-\defbeamertemplate{sidebar canvas right}{vertical shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasrightshading}%
-}
-[action]
-{
-  \beamer@calcvertshading{beamer@sidebarcanvasrightshading}{\the\beamer@rightsidebar}{#1}
-}
-
-\defbeamertemplate{sidebar canvas left}{horizontal shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasleftshading}%
-}
-[action]
-{
-  \beamer@calchorishading{beamer@sidebarcanvasleftshading}{\beamer@leftsidebar}{#1}
-}
-
-\defbeamertemplate{sidebar canvas right}{horizontal shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasrightshading}%
-}
-[action]
-{
-  \beamer@calchorishading{beamer@sidebarcanvasrightshading}{\beamer@rightsidebar}{#1}
-}
-
-
-
-
-
-
-% (sub-)section in toc: sections numbered
-
-\defbeamertemplate{section in toc}{sections numbered}
-{\leavevmode\inserttocsectionnumber\@SepMark \inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{sections numbered}
-{\leavevmode\if@RTL\rightskip=2.5em\else\leftskip=2.5em\fi\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{sections numbered}
-{\leavevmode\normalsize\usebeamerfont{subsection in toc}\if@RTL\rightskip=3.5em\else\leftskip=3.5em\fi\usebeamerfont{subsubsection in toc}%
-  \inserttocsubsubsection\par}
-
-
-
-
-
-% (sub-)section in toc: subsections numbered
-
-\defbeamertemplate{section in toc}{subsections numbered}
-{\leavevmode\if@RTL\rightskip=2em\else\leftskip=2em\fi\inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{subsections numbered}
-{\leavevmode\if@RTL\rightskip=2em\else\leftskip=2em\fi\rlap{\hskip-2em\inserttocsectionnumber\@SepMark\inserttocsubsectionnumber}\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{subsections numbered}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=3em\else\leftskip=3em\fi\usebeamerfont{subsubsection in toc}%
-  \inserttocsubsubsection\par}
-
-
-
-
-
-% (sub-)section in toc: circle
-
-\defbeamertemplate{section in toc}{circle}
-{\leavevmode\if@RTL\rightskip=2ex\else\leftskip=2ex\fi%
-  \llap{%
-    \usebeamerfont*{section number projected}%
-    \usebeamercolor{section number projected}%
-    \beginL\begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-      \color{bg}
-      \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-      \pgfusepath{fill}
-      \pgftext[base]{\color{fg}\inserttocsectionnumber}
-    \end{pgfpicture}\endL\kern1.25ex%
-  }%
-  \inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{circle}
-{\leavevmode\if@RTL\rightskip=2em\else\leftskip=2em\fi\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{circle}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=3em\else\leftskip=3em\fi\usebeamerfont{subsubsection in toc}%
-  \inserttocsubsubsection\par}
-
-
-
-
-% (sub-)section in toc: square
-
-\defbeamertemplate{section in toc}{square}
-{\leavevmode\if@RTL\rightskip=1.75ex\else\leftskip=1.75ex\fi%
-  \llap{%
-    \usebeamerfont*{section number projected}%
-    \usebeamercolor[bg]{section number projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{\hfil\color{fg}\inserttocsectionnumber\hfil}}%
-  \kern1.25ex\inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{square}
-{\leavevmode\if@RTL\rightskip=5ex\else\leftskip=5ex\fi\llap{%
-    \usebeamercolor[bg]{subsection number projected}%
-    \vrule width1ex height1ex\kern1ex}\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{square}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=7ex\else\leftskip=7ex\fi\usebeamerfont{subsubsection in toc}%
-  \llap{%
-    \usebeamercolor[bg]{subsubsection number projected}%
-    \vrule width0.75ex height0.75ex\kern1ex}\inserttocsubsubsection\par}
-
-
-
-
-% (sub-)section in toc: ball
-
-\defbeamertemplate{section in toc}{ball unnumbered}
-{\leavevmode\raise0.1ex\beamer@usesphere{section number projected}{bigsphere}\kern1.25ex\inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{ball unnumbered}
-{\leavevmode\if@RTL\rightskip=1.5em\else\leftskip=1.5em\fi\raise0.2ex\beamer@usesphere{subsection number projected}{smallsphere}%
-  \kern1ex\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{ball unnumbered}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=3em\else\leftskip=3em\fi\usebeamerfont{subsubsection in toc}%
-  \beamer@usesphere{subsubsection number projected}{smallsphere}%
-  \kern0.75ex\inserttocsubsubsection\par}
-
-
-
-
-% (sub-)section in toc: ball numbered
-
-\defbeamertemplate{section in toc}{ball}
-{\leavevmode\if@RTL\rightskip=2.75ex\else\leftskip=2.75ex\fi%
-  \llap{%
-    \normalsize%
-    \beginL\begin{pgfpicture}{-1ex}{-0.7ex}{1ex}{1ex}
-      \pgftext{\beamer@usesphere{section number projected}{tocsphere}}
-      \pgftext{%
-        \usebeamerfont*{section number projected}%
-        \usebeamercolor{section number projected}%
-        \color{fg!90!bg}%
-        \inserttocsectionnumber}
-    \end{pgfpicture}\endL%
-    \kern1.25ex}%
-  \inserttocsection\par
-}
-[action]
-{\setbeamerfont{section number projected}{size=\scriptsize}}
-
-\defbeamertemplate{subsection in toc}{ball}
-{\leavevmode\if@RTL\rightskip=5ex\else\leftskip=5ex\fi%
-  \llap{\raise0.1ex\beamer@usesphere{subsection number projected}{bigsphere}\kern1ex}%
-  \inserttocsubsection\par%
-}
-
-\defbeamertemplate{subsubsection in toc}{ball}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=7ex\else\leftskip=7ex\fi\usebeamerfont{subsubsection in toc}%
-  \llap{\beamer@usesphere{subsubsection number projected}{bigsphere}\kern0.75ex}%
-  \inserttocsubsubsection\par%
-}
-
-
-
-% Itemize items, circle
-
-\defbeamertemplatealias{itemize item}{triangle}{default}
-\defbeamertemplatealias{itemize subitem}{triangle}{default}
-\defbeamertemplatealias{itemize subsubitem}{triangle}{default}
-
-
-
-% Itemize items, circle
-
-\defbeamertemplate{itemize item}{circle}{\small\raise0.5pt\hbox{\textbullet}}
-\defbeamertemplate{itemize subitem}{circle}{\footnotesize\raise0.5pt\hbox{\textbullet}}
-\defbeamertemplate{itemize subsubitem}{circle}{\footnotesize\raise0.5pt\hbox{\textbullet}}
-
-
-
-
-% Itemize items, square
-
-\defbeamertemplate{itemize item}{square}{\hbox{\vrule width 1ex height 1ex}}
-\defbeamertemplate{itemize subitem}{square}{\small\hbox{\vrule width 1ex height 1ex}}
-\defbeamertemplate{itemize subsubitem}{square}{\small\hbox{\vrule width 1ex height 1ex}}
-
-
-
-
-% Itemize items, ball
-
-\defbeamertemplate{itemize item}{ball}{\raise0.2pt\beamer@usesphere{item projected}{bigsphere}}
-\defbeamertemplate{itemize subitem}{ball}{\raise0.2pt\beamer@usesphere{subitem projected}{smallsphere}}
-\defbeamertemplate{itemize subsubitem}{ball}{\raise0.2pt\beamer@usesphere{subsubitem projected}{smallsphere}}
-
-
-
-% Enumerate items, ball
-
-\defbeamertemplate{enumerate item}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.65ex}{1ex}{1ex}
-    \usebeamercolor[fg]{item projected}
-    {\pgftransformscale{1.75}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    {\pgftransformshift{\pgfpoint{0pt}{0.5pt}}
-      \pgftext{\usebeamerfont*{item projected}\insertenumlabel}}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate subitem}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.55ex}{1ex}{1ex}
-    \usebeamercolor[fg]{subitem projected}
-    {\pgftransformscale{1.4}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    \pgftext{%
-      \usebeamerfont*{subitem projected}%
-      \insertsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate subsubitem}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.55ex}{1ex}{1ex}
-    \usebeamercolor[fg]{subsubitem projected}
-    {\pgftransformscale{1.4}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    \pgftext{%
-      \usebeamerfont*{subitem projected}%
-      \insertsubsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate mini template}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.65ex}{1ex}{1ex}
-    \usebeamercolor[fg]{\beameritemnestingprefix item projected}
-    {\pgftransformscale{1.75}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    {\pgftransformshift{\pgfpoint{0pt}{0.5pt}}%
-     \usebeamerfont*{\beameritemnestingprefix item projected}%
-     \pgftext{\insertenumlabel}}
-  \end{pgfpicture}
-\endL}
-
-
-
-% Enumerate items, square
-
-\defbeamertemplate{enumerate item}{square}
-{
-  \hbox{%
-    \usebeamerfont*{item projected}%
-    \usebeamercolor[bg]{item projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertenumlabel%
-      \hfil}%
-  }%
-}
-[action]
-{\setbeamerfont{item projected}{size=\scriptsize}}
-
-\defbeamertemplate{enumerate subitem}{square}
-{
-  \hbox{%
-    \usebeamerfont*{subitem projected}%
-    \usebeamercolor[bg]{subitem projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertsubenumlabel%
-      \hfil}%
-  }%
-}
-
-\defbeamertemplate{enumerate subsubitem}{square}
-{
-  \hbox{%
-    \usebeamerfont*{subitem projected}%
-    \usebeamercolor[bg]{subsubitem projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertsubsubenumlabel%
-      \hfil}%
-  }%
-}
-
-\defbeamertemplate{enumerate mini template}{square}
-{
-  \hbox{%
-    \usebeamerfont*{\beameritemnestingprefix item projected}%
-    \usebeamercolor[bg]{\beameritemnestingprefix item projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertenumlabel%
-      \hfil}%
-  }%
-}
-
-
-  
-    
-% Enumerate items, circle
-  
-\defbeamertemplate{enumerate item}{circle}
-{\beginL
-  \usebeamerfont*{item projected}%
-  \usebeamercolor[bg]{item projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertenumlabel}
-  \end{pgfpicture}%
-\endL}
-[action]
-{\setbeamerfont{item projected}{size=\scriptsize}}
-
-\defbeamertemplate{enumerate subitem}{circle}
-{\beginL
-  \usebeamerfont*{subitem projected}%
-  \usebeamercolor[bg]{subitem projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate subsubitem}{circle}
-{\beginL
-  \usebeamerfont*{subsubitem projected}%
-  \usebeamercolor[bg]{subsubitem projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertsubsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate mini template}{circle}
-{\beginL
-  \usebeamerfont*{\beameritemnestingprefix item projected}%
-  \usebeamercolor[bg]{\beameritemnestingprefix item projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-
-
-%
-% Frame title continutations
-%
-
-\defbeamertemplatealias{frametitle continuation}{roman}{default}
-
-\defbeamertemplate{frametitle continuation}{from second}[1][\insertcontinuationtext]
-{\expandafter\ifnum\insertcontinuationcount>1\relax#1\fi}
-
-
-
-
-
-% Bibliography items
-
-\defbeamertemplatealias{bibliography item}{article}{default}
-
-\defbeamertemplate{bibliography item}{book}
-{\lower2pt\hbox{\pgfuseimage{beamericonbook}}}
-
-\defbeamertemplate{bibliography item}{text}
-{\insertbiblabel}
-
-\defbeamertemplate{bibliography item}{triangle}
-{\scriptsize\raise1.25pt\hbox{\donotcoloroutermaths$\if@RTL\blacktriangleleft\else\blacktriangleright\fi$}}
-
-
-
-% Headline
-
-\defbeamertemplate{headline}{text line}[1]
-{\hskip\Gm@lmargin\hbox to\@tempdima{\textwidth=\@tempdima\hsize=\textwidth\relax#1\hfil}\hskip\Gm@rmargin}
-
-
-% Footline
-
-\defbeamertemplate{footline}{text line}[1]
-{\hskip\Gm@lmargin\hbox to\@tempdima{\textwidth=\@tempdima\hsize=\textwidth\relax#1\hfil}\hskip\Gm@rmargin}
-
-\defbeamertemplate{footline}{page number}
-{%
-  \hfill%
-  \usebeamercolor[fg]{page number in head/foot}%
-  \usebeamerfont{page number in head/foot}%
-  \insertpagenumber\,/\,\insertpresentationendpage\kern1em\vskip2pt%
-}
-
-\defbeamertemplate{footline}{frame number}
-{
-  \hfill%
-  \usebeamercolor[fg]{page number in head/foot}%
-  \usebeamerfont{page number in head/foot}%
-  \insertframenumber\,/\,\inserttotalframenumber\kern1em\vskip2pt%
-}
-
-
-
-
-% Mini frames
-
-\defbeamertemplate{mini frame}{box}
-{%
-  \begin{pgfpicture}{0pt}{0pt}{.1cm}{.1cm}
-    \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\the\beamer@boxsize}{\the\beamer@boxsize}}
-    \pgfusepath{fill,stroke}
-  \end{pgfpicture}%
-}
-[action]
-{
-  \setbeamersize{mini frame size=.1cm,mini frame offset=.05cm}
-}
-
-\defbeamertemplate{mini frame in current subsection}{box}
-{%
-  \begin{pgfpicture}{0pt}{0pt}{.1cm}{.1cm}
-    \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\the\beamer@boxsize}{\the\beamer@boxsize}}
-    \pgfusepath{stroke}
-  \end{pgfpicture}%
-}
-
-\defbeamertemplate{mini frame}{tick}
-{%
-  \hskip-0.4pt\vrule height\beamer@boxsize width1.2pt%
-}
-[action]
-{
-  \setbeamersize{mini frame size=.1cm,mini frame offset=.05cm}
-}
-
-\defbeamertemplate{mini frame in current subsection}{tick}
-{%
-  \vrule height\beamer@boxsize width0.4pt%
-}
-
-
-
-
-
-%
-% Captions
-%
-
-\defbeamertemplate{caption}{numbered}
-{%
-  \raggedright
-  {%
-    \usebeamercolor[fg]{caption name}%
-    \usebeamerfont*{caption name}%
-    \insertcaptionname~\insertcaptionnumber:%
-  }
-  \insertcaption\par
-}
-
-\defbeamertemplate{caption}{caption name own line}
-{%
-  \begin{minipage}{\textwidth}
-    \raggedright
-  {%
-    \usebeamercolor[fg]{caption name}%
-    \usebeamerfont*{caption name}%
-    \insertcaptionname%
-    }\\
-      \insertcaption
-    \end{minipage}
-}
-
-
-
-
-
-%
-% Buttons
-%
-
-\newdimen\beamer@blockheadheight%
-
-
-\defbeamertemplate{navigation symbols}{only frame symbol}
-{\insertframenavigationsymbol}
-
-\defbeamertemplate{navigation symbols}{vertical}
-{%
-  \vbox{%
-  \hbox{\insertslidenavigationsymbol}
-  \hbox{\insertframenavigationsymbol}
-  \hbox{\insertsubsectionnavigationsymbol}
-  \hbox{\insertsectionnavigationsymbol}
-  \hbox{\insertdocnavigationsymbol}
-  \hbox{\insertbackfindforwardnavigationsymbol}}%
-}
-
-\defbeamertemplatealias{navigation symbols}{horizontal}{default}
-
-
-
-%
-% Blocks
-%
-
-\defbeamertemplateparent{blocks}[rounded]{block begin,block end,%
-  block alerted begin,block alerted end,%
-  block example begin,block example end}[1][]
-{[#1]}
-
-\defbeamertemplate{block begin}{rounded}[1][shadow=false]
-{
-  \par\vskip\medskipamount%
-  \begin{beamerboxesrounded}[upper=block title,lower=block body,#1]%
-    {\raggedright\usebeamerfont*{block title}\insertblocktitle}%
-    \raggedright%
-    \usebeamerfont{block body}%
-}
-\defbeamertemplate{block end}{rounded}[1][]
-{\end{beamerboxesrounded}\vskip\smallskipamount}
-
-\defbeamertemplate{block alerted begin}{rounded}[1][shadow=false]
-{
-  \par\vskip\medskipamount%
-  \begin{beamerboxesrounded}[upper=block title alerted,lower=block body alerted,#1]%
-    {\raggedright\usebeamerfont*{block title alerted}\insertblocktitle}%
-    \raggedright%
-    \usebeamerfont{block body alerted}%
-}%
-\defbeamertemplate{block alerted end}{rounded}[1][]
-{\end{beamerboxesrounded}\vskip\smallskipamount}
-
-\defbeamertemplate{block example begin}{rounded}[1][shadow=false]
-{
-  \par\vskip\medskipamount%
-  \begin{beamerboxesrounded}[upper=block title example,lower=block body example,#1]
-    {\raggedright\usebeamerfont*{block title example}\insertblocktitle}%
-    \raggedright%
-    \usebeamerfont{block body alerted}%
-}%
-\defbeamertemplate{block example end}{rounded}[1][]
-{\end{beamerboxesrounded}\vskip\smallskipamount}
-
-
-
-%
-% Note templates
-%
-
-\defbeamertemplate{note page}{plain}
-{\insertnote}
-
-\defbeamertemplate{note page}{compressed}
-{%
-  {%
-    \tiny
-    \let\\=\relax%
-    \insertvrule{0.125\paperheight}{white!90!black}%
-    \vskip-0.125\paperheight
-    \nointerlineskip
-    \vbox{\hfill\insertslideintonotes{0.125}\hskip-\Gm@rmargin\hskip0pt%
-      \vskip-0.125\paperheight\nointerlineskip}%
-    \nointerlineskip
-    \vbox to .125\paperheight{
-      \setbox\beamer@tempbox=\hbox{\hbox{\insertsection}}%
-      \ht\beamer@tempbox=1em
-      \box\beamer@tempbox
-      \nointerlineskip
-      \setbox\beamer@tempbox=\hbox{\hbox{\quad\insertsubsection}}%
-      \ht\beamer@tempbox=1em
-      \box\beamer@tempbox
-      \nointerlineskip
-      \setbox\beamer@tempbox=\hbox{\hbox{\quad\quad\insertshortframetitle}}%
-      \ht\beamer@tempbox=1em
-      \box\beamer@tempbox
-      \vfil
-    }\vskip0.5em
-  }
-  \nointerlineskip
-  \insertnote
-}
-
-
-
-%
-% Theorem templates
-%
-
-\defbeamertemplate{theorem begin}{ams style}
-{%
-  \begin{\inserttheoremblockenv}
-    {%
-      \inserttheoremheadfont
-      \inserttheoremname
-      \inserttheoremnumber
-      \ifx\inserttheoremaddition\@empty\else\ (\inserttheoremaddition)\fi%
-      \inserttheorempunctuation
-    }%
-}
-
-\defbeamertemplate{theorem end}{ams style}
-{\end{\inserttheoremblockenv}}
-
-
-\defbeamertemplate{theorem begin}{numbered}
-{%
-  \begin{\inserttheoremblockenv}
-    {%
-      \inserttheoremname
-      \inserttheoremnumber
-      \ifx\inserttheoremaddition\@empty\else\ (\inserttheoremaddition)\fi%
-    }%
-}
-
-\defbeamertemplate{theorem end}{numbered}
-{\end{\inserttheoremblockenv}}
-
-
-\defbeamertemplate{theorem begin}{normal font}
-{
-  \normalfont
-  \begin{\inserttheoremblockenv}
-  {%
-    \inserttheoremname
-    \ifx\inserttheoremaddition\@empty\else\ (\inserttheoremaddition)\fi%
-  }%
-}
-
-\defbeamertemplate{theorem end}{normal font}
-{\end{\inserttheoremblockenv}}
-
-
-
-\mode
-<all>
-
-%    \end{macrocode}
-% \iffalse
-%</bidibeamerbaseauxtemplates.sty>
-%<*bidibeamerbasetemplates.sty>
-% \fi
-% \part{bidibeamerbasetemplates.sty}
-%    \begin{macrocode}
-% Copyright 2007 by Till Tantau
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/licenses/LICENSE for more details.
-
-
-%
-% Template Installation Commands
-%
-
-\def\usebeamertemplate{\@ifstar{\beamer@usebeamertemplates}{\beamer@usebeamertemplatedo}}
-\def\beamer@usebeamertemplates{\@ifstar{\beamer@usebeamertemplatess}{\beamer@usebeamertemplatedos}}
-\def\beamer@usebeamertemplatess{\@ifstar{\beamer@usebeamertemplatedosss}{\beamer@usebeamertemplatedoss}}
-\def\beamer@usebeamertemplatedo#1{\csname beamer@@tmpl@#1\endcsname}
-\def\beamer@usebeamertemplatedos#1{{{\usebeamerfont{#1}\usebeamercolor[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
-\def\beamer@usebeamertemplatedoss#1{{{\usebeamerfont*{#1}\usebeamercolor[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
-\def\beamer@usebeamertemplatedosss#1{{{\usebeamerfont*{#1}\usebeamercolor*[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
-
-\long\def\beamer@@empty{}
-\def\expandbeamertemplate#1{\csname beamer@@tmpl@#1\endcsname}
-\def\ifbeamertemplateempty#1#2#3{%
-  \def\beamer@ifdo{#3}%
-  \expandafter\ifx\csname beamer@@tmpl@#1\endcsname\relax\def\beamer@ifdo{#2}\fi%
-  \expandafter\ifx\csname beamer@@tmpl@#1\endcsname\beamer@@empty\def\beamer@ifdo{#2}\fi%
-  \beamer@ifdo}
-
-
-\mode<article>
-{
-  % the following do the same in article mode:
-  \let\beamer@usebeamertemplatedosss=\beamer@usebeamertemplatedo
-  \let\beamer@usebeamertemplatedoss=\beamer@usebeamertemplatedo
-  \let\beamer@usebeamertemplatedos=\beamer@usebeamertemplatedo
-}
-
-
-\newif\ifbeamer@sbt
-\newtoks\beamer@sbttoks
-
-\newcommand<>\defbeamertemplate{
-  \beamer@ifempty{#1}
-  {\def\beamer@@oar{<presentation>}}
-  {\def\beamer@@oar{#1}}\beamer@defbeamertemplate}
-\def\beamer@defbeamertemplate{\@ifstar{\beamer@sbttrue\beamer@sbtoo}{\beamer@sbtfalse\beamer@sbtoo}}
-\def\beamer@sbtoo#1#2{\@ifnextchar[{\beamer@sbto{#1}{#2}}{\beamer@sbto{#1}{#2}[0]}}
-\def\beamer@sbto#1#2[#3]{\@ifnextchar[{\beamer@@sbto{#1}{#2}[#3]}{\def\beamer@sbtotemp{}\beamer@@@sbto{#1}{#2}[#3]}}
-\long\def\beamer@@sbto#1#2[#3][#4]{\long\def\beamer@sbtotemp{[#4]}\beamer@@@sbto{#1}{#2}[#3]}
-\long\def\beamer@@@sbto#1#2[#3]#4{%
-  \beamer@sbttoks={\beamer@@@@sbto{#1}{#2}[#3]{#4}}%
-  \@ifnextchar[{\the\beamer@sbttoks}{\the\beamer@sbttoks[action]{}}%
-}
-\long\def\beamer@@@@sbto#1#2[#3]#4[#5]#6{%
-  \edef\beamer@@sbtoarg{\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[#3]}%
-  \expandafter\expandafter\expandafter\newcommand\expandafter\beamer@@sbtoarg\beamer@sbtotemp{%
-    \expandafter\long\expandafter\def\csname beamer@@tmpl@#1\endcsname{#4}#6}%
-  \let\beamer@@next=\beamer@resetsbtoarg%
-  \expandafter\mode\beamer@@oar{\let\beamer@@next=\relax}%
-  \beamer@@next%
-  \ifbeamer@sbt\setbeamertemplate{#1}[#2]\relax\relax\relax\relax\relax\relax\relax\relax\relax\fi% 
-}
-\def\beamer@resetsbtoarg{%
-  \expandafter\expandafter\expandafter\renewcommand\expandafter\beamer@@sbtoarg\beamer@sbtotemp{}
-}
-
-\def\defbeamertemplatealias#1#2#3{%
-  \edef\beamer@@temp{\def\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname{\expandafter\noexpand\csname beamer@@tmpop@#1@#3\endcsname}}%
-  \beamer@@temp}
-
-
-\def\defbeamertemplateparent#1{\@ifnextchar[{\beamer@sbtoparo{#1}}{\beamer@sbtoparo{#1}[*]}}
-\def\beamer@sbtoparo#1[#2]#3{\@ifnextchar[{\beamer@sbtopar{#1}[#2]{#3}}{\beamer@sbtopar{#1}[#2]{#3}[0]}}
-\def\beamer@sbtopar#1[#2]#3[#4]{\@ifnextchar[
-  {\beamer@@sbtopar{#1}[#2]{#3}[#4]}
-  {\def\beamer@sbtotemp{}\beamer@@@sbtopar{#1}[#2]{#3}[#4]}}
-\long\def\beamer@@sbtopar#1[#2]#3[#4][#5]{\long\def\beamer@sbtotemp{[#5]}\beamer@@@sbtopar{#1}[#2]{#3}[#4]}
-\long\def\beamer@@@sbtopar#1[#2]#3[#4]#5{%
-  \expandafter\def\csname beamer@@tmpgrp@#1\endcsname{#3}%
-  \edef\beamer@@sbtoarg{\noexpand\newcommand\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[#4]}%
-  \expandafter\beamer@@sbtoarg\beamer@sbtotemp{%
-    \def\beamer@sbtlist{#3}%
-    \@for\beamer@templ:=\beamer@sbtlist\do
-    {\expandafter\expandafter\expandafter\setbeamertemplate
-      \expandafter\expandafter\expandafter{\expandafter\beamer@templ\expandafter}\expandafter[\beamer@@sbt@option]#5}}}
-
-
-\def\setbeamertemplate#1{%
-  \@ifnextchar[{\beamer@sbtchoose{#1}}{\beamer@sbtexec{#1}}}
-\long\def\beamer@sbtexec#1#2{%
-  \expandafter\long\expandafter\def\csname beamer@@tmpl@#1\endcsname{#2}%
-  \expandafter\ifx\csname beamer@@tmpgrp@#1\endcsname\relax%
-  \else%
-    \expandafter\expandafter\expandafter\def
-    \expandafter\expandafter\expandafter\beamer@sbt@group
-    \expandafter\expandafter\expandafter{\csname beamer@@tmpgrp@#1\endcsname}%
-    \@for\beamer@templ:=\beamer@sbt@group\do{\expandafter\setbeamertemplate\expandafter{\beamer@templ}{#2}}%
-  \fi%
-}
-\long\def\beamer@sbtchoose#1[#2]{\def\beamer@@sbt@option{#2}%
-  \expandafter\ifx\csname beamer@@tmpop@#1@#2\endcsname\relax%
-    \expandafter\let\expandafter\beamer@@next\csname beamer@@tmpop@#1@*\endcsname%
-  \else%
-    \expandafter\let\expandafter\beamer@@next\csname beamer@@tmpop@#1@#2\endcsname%
-  \fi%
-  \beamer@@next%
-}
-
-\newcommand\addtobeamertemplate[3]{%
-  \long\def\beamer@temp{#2}%
-  \expandafter\def\expandafter\beamer@@temp\expandafter{\expandafter\long\expandafter\def\csname beamer@@tmpl@#1\endcsname}%
-  \expandafter\expandafter\expandafter\long%
-  \expandafter\expandafter\expandafter\def%
-  \expandafter\expandafter\expandafter\beamer@@addtemplate%
-  \expandafter\expandafter\expandafter{\csname beamer@@tmpl@#1\endcsname}%
-  \expandafter\expandafter\expandafter\beamer@@temp%
-  \expandafter\expandafter\expandafter{\expandafter\beamer@temp\beamer@@addtemplate#3}%
-}
-
-
-
-\RequirePackage{bidibeamerbaseauxtemplates}
-
-
-\mode
-<all>
-
-%    \end{macrocode}
-% \iffalse
-%</bidibeamerbasetemplates.sty>
-%<*beamerthemebidiJLTree.sty>
-% \fi
-% \part{beamerthemebidiJLTree.sty}
-%    \begin{macrocode}
-\ProvidesPackage{beamerthemebidiJLTree}
-
-\newif\ifbeamer@tree@showhooks
-\beamer@tree@showhookstrue
-
-\DeclareOptionBeamer{hooks}[true]{\csname beamer@tree@showhooks#1\endcsname}
-
-\ProcessOptionsBeamer
-\mode
-<presentation>
-
-\setbeamertemplate{navigation symbols}{}
-\usecolortheme{rose} 
-\useinnertheme[shadow=true]{rounded}% les block
-
-
-\defbeamertemplate*{footline}{bidiJLTree theme}
-{
-  \begin{beamercolorbox}[colsep=1.5pt]{upper separation line foot}
-  \end{beamercolorbox}
-  \hbox{%
-    \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.25ex,dp=1ex,left]{date in head/foot}%
-      \usebeamerfont{date in head/foot}
-      \insertframenumber{} / \inserttotalframenumber\hspace*{2ex} 
-    \end{beamercolorbox}%
-    \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.25ex,dp=1ex,right]{title in head/foot}%
-      \usebeamerfont{title in head/foot}\beginR\hspace*{2ex}\insertauthor \hspace*{1ex} (\insertshortinstitute) \hspace*{2ex} \insertdate\endR
-    \end{beamercolorbox}}%
-}
-
-
-\defbeamertemplate*{sidebar right}{bidiJLTree theme}{}
-
-\usesectionheadtemplate
-{\hfil\insertsectionhead}
-{\hfill\color{fg!50!bg}\insertsectionhead}
-
-
-\usesubsectionheadtemplate
-{\hfil\insertsubsectionhead}
-{\hfill\color{fg!50!bg}\insertsubsectionhead}
-
-
-
-\defbeamertemplate*{headline}{bidiJLTree theme}
-{%
-  \leavevmode%
-  \begin{beamercolorbox}[wd=\paperwidth,colsep=1.5pt]{upper separation line head}
-  \end{beamercolorbox}
-  \@tempdimb=3.625ex% 2.4375ex%
-  \multiply\@tempdimb by\beamer@sectionmax%
-%%  \advance\@tempdimb by 1.125ex%
-  \advance\@tempdimb by -1.125ex%
-  \ifdim\@tempdimb<10.9ex% 3*(2.5+1.125)
-     \@tempdimb=10.9ex%
-  \fi
-  \begin{beamercolorbox}[wd=.45\paperwidth, ht=\@tempdimb]{left block}%
-    \usebeamerfont{section in head/foot}%
-    \vbox to\@tempdimb{\vfill\insertsectionnavigation{.45\paperwidth}\vfill}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=1.125ex,ht=\@tempdimb,dp=1.125ex]{middle separation line head}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=.44\paperwidth]{middle block}%
-    \vbox to\@tempdimb{\vfill%
-    \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
-      leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}%
-      \usebeamerfont{title in head/foot}\insertshorttitle
-    \end{beamercolorbox}
-    \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
-      leftskip=.3cm,rightskip=.3cm plus1fil]{section in head/foot}
-      \usebeamerfont{section in head/foot}%
-      \ifbeamer@tree@showhooks
-      \setbox\beamer@tempbox=\hbox{\insertsectionhead}%
-      \ifdim\wd\beamer@tempbox>1pt%
-      \hskip2pt\raise1.9pt\hbox{\vrule width0.4pt height1.875ex\vrule width 5pt height0.4pt}%
-      \hskip1pt%
-      \fi%
-      \else%
-      \hskip6pt%
-      \fi%
-      \insertsectionhead
-    \end{beamercolorbox}
-    \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
-      leftskip=.3cm,rightskip=.3cm plus1fil]{subsection in head/foot}
-      \usebeamerfont{subsection in head/foot}%
-      \ifbeamer@tree@showhooks
-      \setbox\beamer@tempbox=\hbox{\insertsubsectionhead}%
-      \ifdim\wd\beamer@tempbox>1pt%
-      \hskip9.4pt\raise1.9pt\hbox{\vrule width0.4pt height1.875ex\vrule width 5pt height0.4pt}%
-      \hskip1pt%
-      \fi%
-      \else%
-      \hskip12pt%
-      \fi%
-      \insertsubsectionhead
-    \end{beamercolorbox}%
-    \vfill}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=.1\paperwidth,ht=\@tempdimb,right]{right block}%
-    \vbox to\@tempdimb{\vfill\insertlogo\vfill}
-  \end{beamercolorbox}
-  \vfill
-  \begin{beamercolorbox}[wd=\paperwidth,colsep=1.5pt]{lower separation line head}
-  \end{beamercolorbox}
-}
-\setbeamercolor{separation line}{use=structure,bg=structure.fg!50!bg}
-
-
-\mode
-<all>
-%    \end{macrocode}
-% \iffalse
-%</beamerthemebidiJLTree.sty>
-%<*bidi2in1.sty>
-% \fi
-% \part{bidi2in1.sty}
-%    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bidi2in1}
-\pagestyle{plain}
-\newcount\evenpage
-\newcount\oddpage
-\twocolumn
-\def\@oddfoot{\evenpage=\thepage%
-\multiply\evenpage by 2%
-\oddpage=\the\evenpage%
-\advance\oddpage by -1%
-\hfil\the\evenpage\hfil\hfil\the\oddpage\hfil}%
-\def\@evenfoot{\evenpage=\thepage%
-\multiply\evenpage by 2%
-\oddpage=\the\evenpage%
-\advance\oddpage by -1%
-\hfil\the\oddpage\hfil\hfil\the\evenpage\hfil}%
-\textwidth 9.49in 
-\textheight 6.7in 
-\columnsep 0.9in
-\columnseprule 0.125pt
-\headheight 0cm 
-\topmargin 0in 
-\marginparwidth 0in 
-\marginparsep 0in 
-%\hoffset 0.1in %pageoffset is 1.0in by default
-\hoffset 0.05in % Corrected
-\voffset -0.5in %top margin space is 1.0in by default
-\oddsidemargin 0in 
-\evensidemargin 0in 
-\headsep 0cm 
-\topskip 0cm 
-%\parskip 0pt      %
-\parskip 0.15in       %
-\headsep 0pt    
-\special{papersize=11.69in,8.26in} 
-\renewcommand\maketitle{\par
-\begingroup
-\renewcommand\thefootnote{\@fnsymbol\c@footnote}%
-\def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-\long\def\@makefntext##1{\parindent 1em\noindent
-\hb@xt@1.8em{%
-\hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-\@maketitle
-\@thanks
-\endgroup
-\setcounter{footnote}{0}%
-\global\let\thanks\relax
-\global\let\maketitle\relax
-\global\let\@maketitle\relax
-\global\let\@thanks\@empty
-\global\let\@author\@empty
-\global\let\@date\@empty
-\global\let\@title\@empty
-\global\let\title\relax
-\global\let\author\relax
-\global\let\date\relax
-\global\let\and\relax
-}
-
-%    \end{macrocode}
-% \iffalse
-%</bidi2in1.sty>
-%<*bidicode.sty>
-% \fi
-% \part{bidicode.sty}
-%    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bidicode}
-\RequirePackage{pstricks}
-\RequirePackage{fvrb-ex}
-\RequirePackage{showexpl}
-\definecolor{Orange}{rgb}{1,.4,.2}
-\definecolor{myblue}{rgb}{0.02,0.04,0.48}
-\definecolor{lightblue}{rgb}{0.61,.8,.8}
-\definecolor{myred}{rgb}{0.65,0.04,0.07}
-\definecolor{mygreen}{rgb}{0,.43,0}
-\definecolor{blendedred}{rgb}{0.9,0.1,0.1} 
-\definecolor{blendedgreen}{rgb}{0.2,0.7,0.2}
-\definecolor{darkgray}{gray}{0.3}
-\definecolor{mygray}{gray}{0.6}
-\definecolor{skugga}{gray}{0.7} 
-\definecolor{mybackground}{rgb}{1,0.8,0.5}
-\lstset{%
-    language=[LaTeX]TEX,%
-    float=hbp,%
-    basicstyle=\ttfamily\small, %
-    identifierstyle=\color{black}, %
-    keywordstyle=\color{myred}, %
-    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=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},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
-    frame=single}
-\lstdefinestyle{code}{backgroundcolor=\color{red!20},numbers=left,xleftmargin=0pt,xrightmargin=0pt,
-    frame=single}
-
-
-\newcommand\Larg [1]{{\normalfont\itshape#1\/}}
-\newcommand\Larga[1]{$\langle$\Larg{#1}$\rangle$}
-\newcommand\Largb[1]{\lcb\Larg{#1}\rcb}          
-\newcommand\Largs[1]{\lsb\Larg{#1}\rsb}          
-\newcommand\Largr[1]{\lrb\Larg{#1}\rrb}          
-\newcommand\LBEG[1]{{\normalfont\ttfamily\bs{}begin\lcb#1\rcb}}
-\newcommand\LEND[1]{{\normalfont\ttfamily\bs{}end\lcb#1\rcb}}
-
-
-\DeclareRobustCommand\bs{{\normalfont\ttfamily\textbackslash}}  
-\DeclareRobustCommand\lcb{{\normalfont\ttfamily\textbraceleft}}
-\DeclareRobustCommand\rcb{{\normalfont\ttfamily\textbraceright}}
-\DeclareRobustCommand\lsb{{\normalfont\ttfamily[}}
-\DeclareRobustCommand\rsb{{\normalfont\ttfamily]}}
-\DeclareRobustCommand\lrb{{\normalfont\ttfamily(}}
-\DeclareRobustCommand\rrb{{\normalfont\ttfamily)}}
-
-
-
-
-
-\def\Lcs#1{\nxLcs{#1}}
-\def\LcsStar#1{\nxLcs{#1}\OptArg*{*}}
-\def\nxLcs#1{\texttt{\textbackslash#1}}
-
-\def\Coordx#1{$x_{#1}$}
-\def\Coordy#1{$y_{#1}$}
-\def\Coordz#1{$z_{#1}$}
-\def\Coord#1{\Coordx{#1},\kern 1pt\Coordy{#1}}
-\def\Coordn{\Coordx{n},\kern 1pt\Coordy{n}}
-\def\CoordIII#1{\Coordx{#1},\kern 1pt\Coordy{#1},\kern 1pt\Coordz{#1}}
-\def\CAny{\Coordx{},\kern 1pt\Coordy{}}
-\def\CIIIAny{\Coordx{},\kern 1pt\Coordy{},\kern 1pt\Coordz{}}
-\def\coord#1{(\Coordx{#1},\kern 1pt\Coordy{#1})}
-\def\coordn{(\Coordx{n},\kern 1pt\Coordy{n})}
-\def\coordiii#1{(\Coordx{#1},\kern 1pt\Coordy{#1},\kern 1pt\Coordz{#1})}
-\def\coordx#1{($x_{#1}$)}
-\def\coordy#1{($y_{#1}$)}
-\def\coordz#1{($z_{#1}$)}
-\def\cAny{(\Coordx{},\kern 1pt\Coordy{})}
-\def\ciiiAny{(\Coordx{},\kern 1pt\Coordy{},\kern 1pt\Coordz{})}
-
-\newsavebox{\boxdef}
-\newenvironment{BDef}
-  {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}
-      \begin{tabular}{@{}l@{}l@{}l@{}}
-  }
-  {\end{tabular}\end{lrbox}
-
-
-   {\BCmd\fbox{\usebox\boxdef}\endBCmd}
-   \aftergroup\@afterindentfalse\aftergroup\@afterheading
-  }
-
-\newenvironment{BDef*}
-  {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}
-      \begin{tabular}{@{}l@{}l@{}l@{}}
-  }
-  {\end{tabular}\end{lrbox}
-   {\begin{BCmd*}\fbox{\usebox\boxdef}\end{BCmd*}}
-   \aftergroup\@afterindentfalse\aftergroup\@afterheading
-  }
-\newenvironment{BCmd}{
-  \@beginparpenalty-\@lowpenalty
-  \topsep\BDefaboveskip
-  \fboxsep3pt
-  \flushleft}
- {\@endparpenalty\@M
-  \@topsepadd\BDefbelowskip
-  \endflushleft}
-
-\newenvironment{BCmd*}{
-  \@beginparpenalty\@M
-  \topsep\BDefinlineskip
-  \fboxsep3pt
-  \flushleft}
- {\@endparpenalty5000
-  \endflushleft}
-
-\newskip\BDefaboveskip
-\newskip\BDefbelowskip
-\newskip\BDefinlineskip
-\setlength\BDefaboveskip{10pt plus 4pt}      
-\setlength\BDefbelowskip{6pt}
-\setlength\BDefinlineskip{6pt}
-
-\def\OptArgs{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{[Options]}}\kern1pt}
-\def\OptArg{\@ifnextchar*\OptArg@i{\OptArg@ii*}}
-\def\OptArg@i*#1{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{#1}}\kern1pt}
-\def\OptArg@ii*#1{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{[#1]}}\kern1pt}
-
-
-%    \end{macrocode}
-% \iffalse
-%</bidicode.sty>
-%<*bidimoderncv.cls>
-% \fi
-% \part{bidimoderncv.cls}
-%    \begin{macrocode}
-\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{graphicx}
-\RequirePackage{pstricks}
-\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}
-\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}}}
-\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{\beginL\psline[linecolor=sectionrectanglecolour,linewidth=4pt](-2.5,0)(0,0)\endL}}%
-  \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}{}}%
-    {\beginL\href{#2}{\beginR#2\endR}\endL}%
-    {\beginL\href{#2}{\beginR#1\endR}\endL}}
-\newcommand*{\httplink}[2][]{%
-  \ifthenelse{\equal{#1}{}}%
-    {\beginL\href{http://#2}{\beginR#2\endR}\endL}%
-    {\beginL\href{http://#2}{\beginR#1\endR}\endL}}
-\newcommand*{\emaillink}[2][]{%
-  \ifthenelse{\equal{#1}{}}%
-    {\beginL\href{mailto:#2}{\beginR#2\endR}\endL}%
-    {\beginL\href{mailto:#2}{\beginR#1\endR}\endL}}
-\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
-
-%    \end{macrocode}
-% \iffalse
-%</bidimoderncv.cls>
-%<*bidipresentation.cls>
-% \fi
-% \part{bidipresentation.cls}
-%    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{bidipresentation}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-\ProcessOptions\relax
-\LoadClass{article}
-
-\RequirePackage[foot=10.2pt,head=0pt,paperwidth=128mm,paperheight=96mm,left=5mm,top=5mm,right=7mm,bottom=8mm]{geometry}
-
-\RequirePackage{fancyhdr}
-\renewcommand{\headrulewidth}{0mm}
-
-
-\renewcommand{\maketitle}%
-  {\ClassError{bidipresentation}{Caution: ``maketitle'' command not supported}%
-  {Please use ``titlepage'' environment instead}%
-}
-
-\fancypagestyle{pres}{%
-\fancyhf{}%
-\fancyfoot[RO,LE]{\footnotesize \thepage}%
-}
-
-\pagestyle{pres}
-
-\newcommand{\distance}[1]{\vspace*{\stretch{#1}}}
-\newcommand{\abstand}[1]{\vspace*{\stretch{#1}}}
-
-\setlength{\parskip}{0.6ex}
-\setlength{\parindent}{0mm}
-
-\newenvironment{plainslide}[1][]%
-   {{\raggedleft \large\bfseries #1\par}\par\vspace*{\stretch{1}}}%
-   {\par\vspace*{\stretch{1}}\newpage}
-
-
-\newenvironment{rawslide}{}{\newpage}%
-
-
-\def\itemize{%
-  \ifnum \@itemdepth >\thr@@\@toodeep\else
-    \advance\@itemdepth\@ne
-    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
-    \expandafter
-    \list
-      \csname\@itemitem\endcsname
-      {\def\makelabel##1{\hss\llap{##1}}}%
-  \fi
-    \setlength{\itemsep}{0ex}%
-    \setlength{\parskip}{0.1ex}%
-    \setlength{\parsep}{0ex}%
-    }%
-\let\enditemize =\endlist
-
-
-\def\enumerate{%
-  \ifnum \@enumdepth >\thr@@\@toodeep\else
-    \advance\@enumdepth\@ne
-    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
-      \expandafter
-      \list
-        \csname label\@enumctr\endcsname
-        {\usecounter\@enumctr\def\makelabel##1{\hss\llap{##1}}}%
-  \fi
-    \setlength{\itemsep}{0ex}%
-    \setlength{\parskip}{0.1ex}%
-    \setlength{\parsep}{0ex}%
-    }%
-\let\endenumerate =\endlist
-
-
-\renewenvironment{description}
-               {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-                        \let\makelabel\descriptionlabel}
- \setlength{\itemsep}{0ex}%
-    \setlength{\parskip}{0.1ex}%
-    \setlength{\parsep}{0ex}}
-               {\endlist}
-
-
-%    \end{macrocode}
-% \iffalse
-%</bidipresentation.cls>
-%<*book-bidi.def>
-% \fi
-% \part{book-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \setlength\@tempdima{3em}%
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      {\leavevmode
-       \large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
-       \nobreak
-         \global\@nobreaktrue
-         \everypar{\global\@nobreakfalse\everypar{}}%
-    \endgroup
-  \fi}
-\renewcommand\theequation
-  {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
-\renewcommand \thefigure
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@figure}
-\renewcommand \thetable
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@table}
-\renewcommand \thechapter {\@arabic\c@chapter}
-\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}
-\def\@makechapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft \normalfont
-    \ifnum \c@secnumdepth >\m@ne
-      \if@mainmatter
-        \huge\bfseries \@chapapp\space \thechapter
-        \par\nobreak
-        \vskip 20\p@
-      \fi
-    \fi
-    \interlinepenalty\@M
-    \Huge \bfseries #1\par\nobreak
-    \vskip 40\p@
-  }}
-\def\@makeschapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft
-    \normalfont
-    \interlinepenalty\@M
-    \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
-  \else
-    \clearpage
-  \fi
-  \@mainmatterfalse}
-
-\if@twoside
-  \def\ps@headings{%
-      \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\beginR\leftmark\endR}%
-      \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markboth {\MakeUppercase{%
-		 \beginR\@chapapp\ \thechapter.\,\,\endR%
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-          	\beginR##1\endR
-          \fi
-        \fi
-        }}{}}%
-    \def\ps@plain{\ps@empty
-	\def\@oddfoot{\hfil\thepage\hfil}%
-	\let\@evenfoot\@oddfoot
-}
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-		\beginR\thesection\endR\,
-        \ifnum \c@secnumdepth >\z@
-          \beginR##1\endR \ %
-        \fi
-        }}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
-    \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markright {\MakeUppercase{%
-      	\beginR\@chapapp\ \thechapter. \endR %
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-            \beginR##1\endR
-          \fi
-        \fi
-        }}}}
-   
-\fi
-\pagestyle{headings}
-\def\@idxitem{\par\hangindent -40\p@}
-%    \end{macrocode}
-% \iffalse
-%</book-bidi.def>
-%<*bookest-bidi.def>
-% \fi
-% \part{bookest-bidi.def}
-%    \begin{macrocode}
-\AtBeginDocument{
-\def\@makechapterhead#1{%
-  \vspace*{20\p@}
-  {\parindent \z@ \raggedleft \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
-%    \end{macrocode}
-% \iffalse
-%</bookest-bidi.def>
-%<*cvthemebidicasual.sty>
-% \fi
-% \part{cvthemebidicasual.sty}
-%    \begin{macrocode}
-\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}
-\familynamecolour{808080}
-\firstnamecolour{A9A9A9}
-\quotecolour{696969}
-\addresscolour{696969}
-\definecolor{sectionrectanglecolour}{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}
-\if@colourorange
-  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.65,0.20}
-  \sectiontitlecolour{FF8C00}
-  \subsectioncolour{FF8C00}
-  \definecolor{footersymbolcolour}{rgb}{0.95,0.55,0.15}\fi
-\if@colourgreen
-  \definecolor{sectionrectanglecolour}{rgb}{0.55,0.85,0.35}
-  \sectiontitlecolour{008000}
-  \subsectioncolour{008000}
-  \definecolor{footersymbolcolour}{rgb}{0.30,0.65,0.15}\fi
-\if@colourred
-  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.30,0.30}
-  \sectiontitlecolour{FF0000}
-  \subsectioncolour{FF0000}
-  \definecolor{footersymbolcolour}{rgb}{0.95,0.20,0.20}\fi
-\if@colourgrey
-  \definecolor{sectionrectanglecolour}{rgb}{0.75,0.75,0.75}
-  \sectiontitlecolour{808080}
-  \subsectioncolour{808080}
-  \definecolor{footersymbolcolour}{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}}%
-      {}%
-      {{\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
-    \hfill%
-%    
-    \raggedleft{\beginR\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}\endR}\endL\\[-.35em]}%
-  {\beginL\psline[linewidth=2pt,linecolor=rulecolour](-11.2,-0.2)(5.6,-0.2)\endL\\[2.5em]}%
-% optional quote
-  \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%
-    { ~~\beginL\psdot[linecolor=footersymbolcolour](0,0.1)\endL~~~}\fi}
-\providecommand*{\makefooter}{}
-\renewcommand*{\makefooter}{%
-  \fancypagestyle{plain}{%
-    \fancyfoot[c]{%
-      \parbox{0.8\textwidth}{%
-      \centering%
-      \addressfont\@addresscolour%
-      \ifthenelse{\isundefined{\@address}}{}{%
-        \beginR\addresssymbol~\@address\endR\\%
-        \@firstfooterelementfalse}%
-      \beginR\ifthenelse{\isundefined{\@mobile}}{}{\beginR\mobilesymbol~\@mobile\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@phone}}{}{\footersymbol\beginR\phonesymbol~\@phone\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@fax}}{}{\footersymbol\beginR\faxsymbol~\@fax\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@email}}{}{\footersymbol\beginR\emailsymbol~\emaillink{\@email}\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@extrainfo}}{}{\beginR\footersymbol\@extrainfo\endR\@firstfooterelementfalse}\endR}}%
-  }%
-  \pagestyle{plain}}
-\AtBeginDocument{\makefooter}
-
-%    \end{macrocode}
-% \iffalse
-%</cvthemebidicasual.sty>
-%<*cvthemebidiclassic.sty>
-% \fi
-% \part{cvthemebidiclassic.sty}
-%    \begin{macrocode}
-\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}
-\sectiontitlecolour{1E90FF}
-\subsectioncolour{4682B4}
-\if@colourorange
-  \addresscolour{FF8C00}
-  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.65,0.20}
-  \sectiontitlecolour{FF8C00}
-  \subsectioncolour{FF8C00}\fi
-\if@colourgreen
-  \addresscolour{008000}
-  \definecolor{sectionrectanglecolour}{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}
-  \sectiontitlecolour{FF0000}
-  \subsectioncolour{FF0000}\fi
-\if@colourgrey
-  \addresscolour{808080}
-  \definecolor{sectionrectanglecolour}{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
-%   other lengths
-\newlength{\maketitlepicturewidth}
-\setlength{\maketitlepicturewidth}{\@photowidth}
-\newlength{\maketitledetailswidth}
-%   recompute theme-specific lengths, called by class to recompute all lengths
-\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}\framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}}\\[3em]%
-  % optional quote
-  \ifthenelse{\isundefined{\@quote}}%
-    {}%
-    {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}%
-  }
-
-%    \end{macrocode}
-% \iffalse
-%</cvthemebidiclassic.sty>
-%<*draftwatermark-bidi.def>
-% \fi
-% \part{draftwatermark-bidi.def}
-%    \begin{macrocode}
-\renewcommand\SetWatermarkText[1]{%
-  \def\sc@wm@text{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
-%    \end{macrocode}
-% \iffalse
-%</draftwatermark-bidi.def>
-%<*extbook-bidi.def>
-% \fi
-% \part{extbook-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      {\leavevmode
-       \large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
-       \nobreak
-         \global\@nobreaktrue
-         \everypar{\global\@nobreakfalse\everypar{}}%
-    \endgroup
-  \fi}
-\renewcommand\theequation
-  {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
-\renewcommand \thefigure
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@figure}
-\renewcommand \thetable
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@table}
-\renewcommand \thechapter {\@arabic\c@chapter}
-\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}
-\def\@makechapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft \normalfont
-    \ifnum \c@secnumdepth >\m@ne
-      \if@mainmatter
-        \huge\bfseries \@chapapp\space \thechapter
-        \par\nobreak
-        \vskip 20\p@
-      \fi
-    \fi
-    \interlinepenalty\@M
-    \Huge \bfseries #1\par\nobreak
-    \vskip 40\p@
-  }}
-
-
-\def\@makeschapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft
-    \normalfont
-    \interlinepenalty\@M
-    \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
-  \else
-    \clearpage
-  \fi
-  \@mainmatterfalse}
-\if@twoside
-  \def\ps@headings{%
-      \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\beginR\leftmark\endR}%
-      \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markboth {\MakeUppercase{%
-		 \beginR\@chapapp\ \thechapter.\,\,\endR%
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-          	\beginR##1\endR
-          \fi
-        \fi
-        }}{}}%
-    \def\ps@plain{\ps@empty
-	\def\@oddfoot{\hfil\thepage\hfil}%
-	\let\@evenfoot\@oddfoot
-}
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-		\beginR\thesection\endR\,
-        \ifnum \c@secnumdepth >\z@
-          \beginR##1\endR \ %
-        \fi
-        }}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
-    \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markright {\MakeUppercase{%
-      	\beginR\@chapapp\ \thechapter. \endR %
-        \ifnum \c@secnumdepth >\m@ne
-          \if@mainmatter
-            \beginR##1\endR
-          \fi
-        \fi
-        }}}}
-   
-\fi
-\pagestyle{headings}
-\def\@idxitem{\par\hangindent -40\p@}
-%    \end{macrocode}
-% \iffalse
-%</extbook-bidi.def>
-%<*fancyhdr-bidi.def>
-% \fi
-% \part{fancyhdr-bidi.def}
-%    \begin{macrocode}
-\def\@fancyhead#1#2#3#4#5{\beginR#1\endR\hbox to\headwidth{\fancy@reset
-  \@fancyvbox\headheight{\hbox
-    {\rlap{\parbox[b]{\headwidth}{\raggedright\beginR#2\endR}}\hfill
-      \parbox[b]{\headwidth}{\centering\beginR#3\endR}\hfill
-      \llap{\parbox[b]{\headwidth}{\raggedleft\beginR#4\endR}}}\headrule}}\beginR#5\endR}
-\def\@fancyfoot#1#2#3#4#5{\beginR#1\endR\hbox to\headwidth{\fancy@reset
-    \@fancyvbox\footskip{\footrule
-      \hbox{\rlap{\parbox[t]{\headwidth}{\raggedright\beginR#2\endR}}\hfill
-        \parbox[t]{\headwidth}{\centering\beginR#3\endR}\hfill
-        \llap{\parbox[t]{\headwidth}{\raggedleft\beginR#4\endR}}}}}\beginR#5\endR}
-%    \end{macrocode}
-% \iffalse
-%</fancyhdr-bidi.def>
-%<*footnote-bidi.def>
-% \fi
-% \part{footnote-bidi.def}
-%    \begin{macrocode}
-\if@RTLmain\@RTL@footnotetrue\else\@RTL@footnotefalse\fi
-\def\bidi@footnote@output{{%
-    \dimen0=\ht\footins
-    \advance\dimen0 by\dp\footins
-    \def\@elt##1##2{%
-      \ifx\bidi@footnoterule\relax\global\let\bidi@footnoterule##2\fi
-      \advance\dimen0 by -##1\relax
-      \ifdim\dimen0<\z@
-        {%
-	  \let\@elt\relax\let\right@footnote\relax\let\left@footnote\relax
-	  \dimen0=-\dimen0%
-	  \xdef\new@bidi@footnote@list{\new@bidi@footnote@list\noexpand\@elt{\the\dimen0}{##2}}%
-	}%
-      \fi
-      \ifdim\dimen0>\z@\else
-	\let\right@footnote\relax\let\left@footnote\relax
-	\def\@elt####1####2{%
-	  {\let\@elt\relax
-	  \xdef\new@bidi@footnote@list{\new@bidi@footnote@list\noexpand\@elt{####1}{####2}}}%
-	}%
-      \fi
-    }%
-    \def\new@bidi@footnote@list{}%
-    \bidi@footnote@list
-    \global\let\bidi@footnote@list\new@bidi@footnote@list
-  }}
-\def\right@footnote{%
-  \hbox to \columnwidth
-  {\beginR \vbox{\kern -3\p@
-   \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}}
-\def\left@footnote{%
-   \hrule width .4\columnwidth\kern 2.6\p@}
-\def\textwidth@footnote{\kern-3\p@
-  \hrule \@width \textwidth \kern 2.6\p@}
-\def\right@footnoterule{\bidi@footnote@output\right@footnote\global\let\bidi@footnoterule\relax}
-\def\left@footnoterule{\bidi@footnote@output\left@footnote\global\let\bidi@footnoterule\relax}
-\def\textwidth@footnoterule{\bidi@footnote@output\textwidth@footnote\global\let\bidi@footnoterule\relax}
-\def\auto@footnoterule{\bidi@footnote@output
-  \ifx\bidi@footnoterule\relax\if@RTL\right@footnote\else\left@footnote\fi\else\bidi@footnoterule\fi
-  \global\let\bidi@footnoterule\relax}
-\def\leftfootnoterule{\def\footnoterule{\left@footnoterule}}
-\let\LRfootnoterule=\leftfootnoterule
-\def\rightfootnoterule{\def\footnoterule{\right@footnoterule}}
-\def\textwidthfootnoterule{\def\footnoterule{\textwidth@footnoterule}}
-\def\autofootnoterule{\def\footnoterule{\auto@footnoterule}}
-\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
-\def\bidi@footnote@list{}
-\let\bidi@footnoterule\relax
-\def\RTLfootnote{\@ifnextchar[\@xRTLfootnote{\stepcounter\@mpfn
-     \protected@xdef\@thefnmark{\thempfn}%
-     \@footnotemark\@RTLfootnotetext}}
-\def\@xRTLfootnote[#1]{%
-   \begingroup
-     \csname c@\@mpfn\endcsname #1\relax
-     \unrestored@protected@xdef\@thefnmark{\thempfn}%
-   \endgroup
-   \@footnotemark\@RTLfootnotetext}
-\def\LTRfootnote{\@ifnextchar[\@xLTRfootnote{\stepcounter\@mpfn
-     \protected@xdef\@thefnmark{\thempfn}%
-     \@footnotemark\@LTRfootnotetext}}
-\def\@xLTRfootnote[#1]{%
-   \begingroup
-     \csname c@\@mpfn\endcsname #1\relax
-     \unrestored@protected@xdef\@thefnmark{\thempfn}%
-   \endgroup
-   \@footnotemark\@LTRfootnotetext}
-\def\insertRTL{\bgroup\beginR\@RTLtrue}
-\def\endinsertRTL{\endR\egroup}
-\def\insertLTR{\bgroup\beginL\@RTLfalse}
-\def\endinsertLTR{\endL\egroup}
-\DeclareRobustCommand\InLTR{\insertLTR}
-\DeclareRobustCommand\EInLTR{\endinsertLTR}
-\DeclareRobustCommand\InRTL{\insertRTL}
-\DeclareRobustCommand\EInRTL{\endinsertRTL}
-\def\parse@lsent#1#2\EInLTR#3#4#5\parse@end{\@sentdirfalse
-	\def\@tempa{\InLTR}\def\@tempb{\EInLTR}\def\@tempc{#1}\def\@tempd{#4}%
-	\ifx\@tempa\@tempc\ifx\@tempb\@tempd\@sentdirtrue\fi\fi}
-\def\parse@rsent#1#2\EInRTL#3#4#5\parse@end{\@sentdirfalse
-	\def\@tempa{\InRTL}\def\@tempb{\EInRTL}\def\@tempc{#1}\def\@tempd{#4}%
-	\ifx\@tempa\@tempc\ifx\@tempb\@tempd\@sentdirtrue\fi\fi}
-\def\iflsentence#1{\parse@lsent#1\EInLTR123\parse@end\if@sentdir}
-\def\ifrsentence#1{\parse@rsent#1\EInRTL123\parse@end\if@sentdir}
-\def\bidi@footnotetext@dir#1{%
-   \@tempswatrue
-   \ifrsentence{#1}\rtl\@tempswafalse\fi
-   \iflsentence{#1}\ltr\@tempswafalse\fi
-   \if@tempswa\if@RTL\rtl\else\ltr\fi\fi
-   \xdef\bidi@this@footnote{\if@RTL\noexpand\right@footnote\else\noexpand\left@footnote\fi}%
-}
-\def\bidi@footnotetext@after{%
-   {%
-     \let\@elt\relax\let\right@footnote\relax\let\left@footnote\relax
-     \dimen0=\ht\footins
-     \advance\dimen0 by\dp\footins
-     \xdef\bidi@footnote@list{\bidi@footnote@list\@elt{\the\dimen0}{\bidi@this@footnote}}%
-   }%
-}
-\def\setfootnoteRL{\@RTL@footnotetrue}
-\def\unsetfootnoteRL{\@RTL@footnotefalse}
-\def\setfootnoteLR{\unsetfootnoteRL}
-\long\def\@footnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
-    \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\strut}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
-\long\def\@RTLfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLtrue\reset@font\footnotesize
-    \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces #1\strut}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
-\long\def\@LTRfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLfalse\reset@font\footnotesize
-    \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\rmfamily #1\strut}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
-\long\def\@mpRTLfootnotetext#1{
-  \global\setbox\@mpfootins\vbox{\@RTLtrue
-    \unvbox\@mpfootins
-    \reset@font\footnotesize
-    \hsize\columnwidth
-    \@parboxrestore
-    \protected@edef\@currentlabel
-         {\csname p@mpfootnote\endcsname\@thefnmark}
-    \color@begingroup
-     \bidi@footnotetext@dir{#1}
-    \if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi
-      \@makefntext{
-        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}
-    \color@endgroup}}
-\long\def\@mpLTRfootnotetext#1{
-  \global\setbox\@mpfootins\vbox{\@RTLfalse
-    \unvbox\@mpfootins
-    \reset@font\footnotesize
-    \hsize\columnwidth
-    \@parboxrestore
-    \protected@edef\@currentlabel
-         {\csname p@mpfootnote\endcsname\@thefnmark}
-    \color@begingroup
-     \bidi@footnotetext@dir{#1}
-    \if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi
-      \@makefntext{
-        \rule\z@\footnotesep\ignorespaces\rmfamily#1\@finalstrut\strutbox}
-    \color@endgroup}}
-\long\def\@mpfootnotetext#1{
-  \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi
-    \unvbox\@mpfootins
-    \reset@font\footnotesize
-    \hsize\columnwidth
-    \@parboxrestore
-    \protected@edef\@currentlabel
-         {\csname p@mpfootnote\endcsname\@thefnmark}
-    \color@begingroup
-     \bidi@footnotetext@dir{#1}
-    \if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi
-      \@makefntext{
-        \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\@finalstrut\strutbox}
-    \color@endgroup}}
-\def\@iiiminipage#1#2[#3]#4{%
-  \leavevmode
-  \@pboxswfalse
-  \setlength\@tempdima{#4}%
-  \def\@mpargs{{#1}{#2}[#3]{#4}}%
-  \setbox\@tempboxa\vbox\bgroup
-    \color@begingroup
-      \hsize\@tempdima
-      \textwidth\hsize \columnwidth\hsize
-      \@parboxrestore
-      \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
-      \let\@footnotetext\@mpfootnotetext
-      \let\@LTRfootnotetext\@mpLTRfootnotetext
-      \let\@RTLfootnotetext\@mpRTLfootnotetext
-      \let\@listdepth\@mplistdepth \@mplistdepth\z@
-      \@minipagerestore
-      \@setminipage}
-%    \end{macrocode}
-% \iffalse
-%</footnote-bidi.def>
-%<*graphicx-bidi.def>
-% \fi
-% \part{graphicx-bidi.def}
-%    \begin{macrocode}
-\def\Gin@ii[#1]#2{%
-    \def\@tempa{[}\def\@tempb{#2}%
-    \ifx\@tempa\@tempb
-      \def\@tempa{\Gin@iii[#1][}%
-      \expandafter\@tempa
-    \else
-     \begingroup
-       \@tempswafalse
-       \toks@{\beginL\Ginclude@graphics{#2}\endL}%
-       \setkeys{Gin}{#1}%
-       \Gin@esetsize
-       \the\toks@
-     \endgroup
-     \fi}%
-%    \end{macrocode}
-% \iffalse
-%</graphicx-bidi.def>
-%<*hyperref-bidi.def>
-% \fi
-% \part{hyperref-bidi.def}
-%    \begin{macrocode}
-\AtBeginDocument{%
-\def\contentsline#1#2#3#4{%
-  \ifx\\#4\\%
-    \csname l@#1\endcsname{#2}{#3}%
-  \else
-    \ifcase\Hy@linktoc % none
-      \csname l@#1\endcsname{#2}{#3}%
-    \or % section
-      \csname l@#1\endcsname{%
-        \beginL\hyper@linkstart{link}{#4}{\if@RTL\beginR\fi#2\if@RTL\endR\fi}\hyper@linkend\endL
-      }{#3}%
-    \or % page
-      \csname l@#1\endcsname{{#2}}{%
-        \beginL\hyper@linkstart{link}{#4}{#3}\hyper@linkend\endL
-      }%
-    \else % all
-      \csname l@#1\endcsname{%
-        \beginL\hyper@linkstart{link}{#4}{\if@RTL\beginR\fi#2\if@RTL\endR\fi}\hyper@linkend\endL
-      }{%
-        \beginL\hyper@linkstart{link}{#4}{#3}\hyper@linkend\endL
-      }%
-    \fi
-  \fi
-}
-\ifHy@hyperfootnotes
-   \let\H@@footnotetext\@footnotetext
-   \let\HRTL@@RTLfootnotetext\@RTLfootnotetext
-   \let\HLTR@@LTRfootnotetext\@LTRfootnotetext
-    \def\@xfootnotenext[#1]{%
-    \begingroup
-      \csname c@\@mpfn\endcsname #1\relax
-      \unrestored@protected@xdef\@thefnmark{\thempfn}%
-    \endgroup
-    \ifx\@footnotetext\@mpfootnotetext
-      \expandafter\H@@mpfootnotetext
-    \else
-      \expandafter\H@@footnotetext
-    \fi
-  }%
-    \def\@xRTLfootnotenext[#1]{%
-    \begingroup
-      \csname c@\@mpfn\endcsname #1\relax
-      \unrestored@protected@xdef\@thefnmark{\thempfn}%
-    \endgroup
-    \ifx\@RTLfootnotetext\@mpRTLfootnotetext
-      \expandafter\HRTL@@mpRTLfootnotetext
-    \else
-      \expandafter\HRTL@@RTLfootnotetext
-    \fi
-  }%
-    \def\@xLTRfootnotenext[#1]{%
-    \begingroup
-      \csname c@\@mpfn\endcsname #1\relax
-      \unrestored@protected@xdef\@thefnmark{\thempfn}%
-    \endgroup
-    \ifx\@LTRfootnotetext\@mpLTRfootnotetext
-      \expandafter\HLTR@@mpLTRfootnotetext
-    \else
-      \expandafter\HLTR@@LTRfootnotetext
-    \fi
-  }%
-    \def\@xfootnotemark[#1]{%
-    \begingroup
-      \c@footnote #1\relax
-      \unrestored@protected@xdef\@thefnmark{\thefootnote}%
-    \endgroup
-    \H@@footnotemark
-  }%
-  \let\H@@mpfootnotetext\@mpfootnotetext
-  \let\HRTL@@mpRTLfootnotetext\@mpRTLfootnotetext
-  \let\HLTR@@mpLTRfootnotetext\@mpLTRfootnotetext
-    \long\def\@mpfootnotetext#1{%
-    \H@@mpfootnotetext{%
-      \ifHy@nesting
-        \hyper@@anchor{\Hy@footnote@currentHref}{#1}%
-      \else
-        \Hy@raisedlink{%
-          \hyper@@anchor{\Hy@footnote@currentHref}{\relax}%
-        }#1%
-      \fi
-    }%
-  }%
-  \long\def\@mpRTLfootnotetext#1{%
-    \HRTL@@mpRTLfootnotetext{%
-      \ifHy@nesting
-        \hyper@@anchor{\Hy@footnote@currentHref}{#1}%
-      \else
-        \Hy@raisedlink{%
-          \hyper@@anchor{\Hy@footnote@currentHref}{\relax}%
-        }#1%
-      \fi
-    }%
-  }%
-    \long\def\@mpLTRfootnotetext#1{%
-    \HLTR@@mpLTRfootnotetext{%
-      \ifHy@nesting
-        \hyper@@anchor{\Hy@footnote@currentHref}{#1}%
-      \else
-        \Hy@raisedlink{%
-          \hyper@@anchor{\Hy@footnote@currentHref}{\relax}%
-        }#1%
-      \fi
-    }%
-  }%
-    \long\def\@footnotetext#1{%
-    \H@@footnotetext{%
-      \ifHy@nesting
-        \hyper@@anchor{\Hy@footnote@currentHref}{#1}%
-      \else
-        \Hy@raisedlink{%
-          \hyper@@anchor{\Hy@footnote@currentHref}{\relax}%
-        }%
-        \let\@currentHlabel\Hy@footnote@currentHlabel
-        \let\@currentHref\Hy@footnote@currentHref
-        \let\@currentlabelname\@empty
-        #1%
-      \fi
-    }%
-  }%
-    \long\def\@RTLfootnotetext#1{%
-    \HRTL@@RTLfootnotetext{%
-      \ifHy@nesting
-        \hyper@@anchor{\Hy@footnote@currentHref}{#1}%
-      \else
-        \Hy@raisedlink{%
-          \hyper@@anchor{\Hy@footnote@currentHref}{\relax}%
-        }%
-        \let\@currentHlabel\Hy@footnote@currentHlabel
-        \let\@currentHref\Hy@footnote@currentHref
-        \let\@currentlabelname\@empty
-        #1%
-      \fi
-    }%
-  }%
-    \long\def\@LTRfootnotetext#1{%
-    \HLTR@@LTRfootnotetext{%
-      \ifHy@nesting
-        \hyper@@anchor{\Hy@footnote@currentHref}{#1}%
-      \else
-        \Hy@raisedlink{%
-          \hyper@@anchor{\Hy@footnote@currentHref}{\relax}%
-        }%
-        \let\@currentHlabel\Hy@footnote@currentHlabel
-        \let\@currentHref\Hy@footnote@currentHref
-        \let\@currentlabelname\@empty
-        #1%
-      \fi
-    }%
-  }%
-  \def\@footnotemark{%
-    \leavevmode
-    \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi
-    \stepcounter{Hfootnote}%
-    \global\let\Hy@saved@currentHlabel\@currentHlabel
-    \global\let\Hy@saved@currentHref\@currentHref
-    \hyper@makecurrent{Hfootnote}%
-    \global\let\Hy@footnote@currentHlabel\@currentHlabel
-    \global\let\Hy@footnote@currentHref\@currentHref
-    \global\let\@currentHlabel\Hy@saved@currentHlabel
-    \global\let\@currentHref\Hy@saved@currentHref
-    \beginL\hyper@linkstart{link}{\Hy@footnote@currentHref}%
-    \@makefnmark
-    \hyper@linkend\endL
-    \ifhmode\spacefactor\@x@sf\fi
-    \relax
-  }%
-  \let\maketitle\HyOrg@maketitle
-  \def\maketitle{%
-    \let\Hy@saved@footnotemark\@footnotemark
-    \let\Hy@saved@footnotetext\@footnotetext
-    \let\HyRTL@saved@RTLfootnotetext\@RTLfootnotetext
-    \let\HyLTR@saved@LTRfootnotetext\@LTRfootnotetext
-    \let\@footnotemark\H@@footnotemark
-    \let\@footnotetext\H@@footnotetext
-    \let\@RTLfootnotetext\HRTL@@RTLfootnotetext
-    \let\@LTRfootnotetext\HLTR@@LTRfootnotetext
-    \@ifnextchar[\Hy@maketitle@optarg{% ]
-      \HyOrg@maketitle
-      \Hy@maketitle@end
-    }%
-  }%
-  \def\Hy@maketitle@optarg[#1]{%
-    \HyOrg@maketitle[{#1}]%
-    \Hy@maketitle@end
-  }%
-  \def\Hy@maketitle@end{%
-    \ifx\@footnotemark\H@@footnotemark
-      \let\@footnotemark\Hy@saved@footnotemark
-    \fi
-    \ifx\@footnotetext\H@@footnotetext
-      \let\@footnotetext\Hy@saved@footnotetext
-    \fi
-    \ifx\@RTLfootnotetext\HRTL@@RTLfootnotetext
-      \let\@RTLfootnotetext\HyRTL@saved@RTLfootnotetext
-    \fi
-    \ifx\@LTRfootnotetext\HLTR@@LTRfootnotetext
-      \let\@LTRfootnotetext\HyLTR@saved@LTRfootnotetext
-    \fi
-  }%
-  \def\realfootnote{%
-    \@ifnextchar[\@xfootnote{%
-      \stepcounter{\@mpfn}%
-      \protected@xdef\@thefnmark{\thempfn}%
-      \H@@footnotemark\H@@footnotetext
-    }%
-  }%
-\fi
-\def\hyper@link#1#2#3{%
-  \beginL\hyper@linkstart{#1}{#2}\if@RTL\beginR\fi#3\if@RTL\endR\fi\hyper@linkend\endL
-}
-\let\origin@href=\href
-\renewcommand\href[2]{\beginL\origin@href{#1}{\if@RTL\beginR\fi#2\if@RTL\endR\fi}\endL}
-\let\origin@url=\url
-\renewcommand\url[1]{\beginL\origin@url{#1}\endL}%
-\def\hyper@natlinkstart#1{%
-  \Hy@backout{#1}%
-  \beginL\hyper@linkstart{cite}{cite.#1}%
-  \def\hyper@nat@current{#1}%
-}
-\def\hyper@natlinkend{%
-  \hyper@linkend\endL
-}
-\def\hyper@natlinkbreak#1#2{%
-  \hyper@linkend\endL#1\beginL\hyper@linkstart{cite}{cite.#2}%
-}%
-}
-%    \end{macrocode}
-% \iffalse
-%</hyperref-bidi.def>
-%<*listings-bidi.def>
-% \fi
-% \part{listings-bidi.def}
-%    \begin{macrocode}
-\long\def\@makecaption#1#2{%
- \vskip 10pt%
- \setbox\@tempboxa\hbox{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize \beginR#1: #2\par%
- \else \hbox
-to\hsize{\beginR\hfil\box\@tempboxa\hfil%
-\endR}%
- \fi}
-%    \end{macrocode}
-% \iffalse
-%</listings-bidi.def>
-%<*longtable-bidi.def>
-% \fi
-% \part{longtable-bidi.def}
-%    \begin{macrocode}
-\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}%
-    \ifdim\wd\@tempboxa>\hsize
-      #1{#2: }#3%
-    \else
-      \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
-    \fi
-    \endgraf\vskip\baselineskip}%
-  \hss}}}
-
-\def\longtable{\if@RTL\global\@RTLtabtrue\fi%
-  \par
-  \ifx\multicols\@undefined
-  \else
-     \ifnum\col@number>\@ne
-       \@twocolumntrue
-     \fi
-  \fi
-  \if@twocolumn
-    \LT@err{longtable not in 1-column mode}\@ehc
-  \fi
-  \begingroup \if@RTLtab\beginR \fi
-  \@ifnextchar[\LT@array{\LT@array[x]}}
-
-\def\LT@array[#1]#2{%
-  \refstepcounter{table}\stepcounter{LT@tables}%
-  \if l#1%
-    \LTleft\z@ \LTright\fill
-  \else\if r#1%
-    \LTleft\fill \LTright\z@
-  \else\if c#1%
-    \LTleft\fill \LTright\fill
-  \fi\fi\fi
-  \let\LT@mcol\multicolumn
-  \let\LT@@tabarray\@tabarray
-  \let\LT@@hl\hline
-  \def\@tabarray{%
-    \let\hline\LT@@hl
-    \LT@@tabarray}%
-  \let\\\LT@tabularcr\let\tabularnewline\\%
-  \def\newpage{\noalign{\break}}%
-  \def\pagebreak{\noalign{\ifnum`}=0\fi\@testopt{\LT@no@pgbk-}4}%
-  \def\nopagebreak{\noalign{\ifnum`}=0\fi\@testopt\LT@no@pgbk4}%
-  \let\hline\LT@hline \let\kill\LT@kill\let\caption\LT@caption
-  \@tempdima\ht\strutbox
-  \let\@endpbox\LT@endpbox
-  \ifx\extrarowheight\@undefined
-    \let\@acol\@tabacol
-    \let\@classz\@tabclassz \let\@classiv\@tabclassiv
-    \def\@startpbox{\vtop\LT@startpbox}%
-    \let\@@startpbox\@startpbox
-    \let\@@endpbox\@endpbox
-    \let\LT@LL@FM@cr\@tabularcr
-  \else
-    \advance\@tempdima\extrarowheight
-    \col@sep\tabcolsep
-    \let\@startpbox\LT@startpbox\let\LT@LL@FM@cr\@arraycr
-  \fi
-  \setbox\@arstrutbox\hbox{\vrule
-    \@height \arraystretch \@tempdima
-    \@depth \arraystretch \dp \strutbox
-    \@width \z@}%
-  \let\@sharp##\let\protect\relax
-   \begingroup
-    \@mkpream{#2}%
-    \xdef\LT@bchunk{%
-       \global\advance\c@LT@chunks\@ne
-       \global\LT@rows\z@\setbox\z@\vbox\bgroup
-       \LT@setprevdepth
-       \tabskip\LTleft \noexpand\halign to\hsize\bgroup
-      \tabskip\z@ \@arstrut \@preamble \tabskip\LTright \cr}%
-  \endgroup
-  \expandafter\LT@nofcols\LT@bchunk&\LT@nofcols
-  \LT@make@row
-  \m@th\let\par\@empty
-  \everycr{}\lineskip\z@\baselineskip\z@
-  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
-  \LT@bchunk}
-
-
-\def\endlongtable{%
-  \crcr
-  \noalign{%
-    \let\LT@entry\LT@entry@chop
-    \xdef\LT@save@row{\LT@save@row}}%
-  \LT@echunk
-  \LT@start
-  \unvbox\z@
-  \LT@get@widths
-  \if@filesw
-    {\let\LT@entry\LT@entry@write\immediate\write\@auxout{%
-      \gdef\expandafter\noexpand
-        \csname LT@\romannumeral\c@LT@tables\endcsname
-          {\LT@save@row}}}%
-  \fi
-  \ifx\LT@save@row\LT@@save@row
-  \else
-    \LT@warn{Column \@width s have changed\MessageBreak
-             in table \thetable}%
-    \LT@final@warn
-  \fi
-  \endgraf\penalty -\LT@end@pen
-  \if@RTLtab\egroup\endR\egroup\fi
-   \if@RTLtab\endR\fi \endgroup
-  \global\@mparbottom\z@
-  \pagegoal\vsize
-  \endgraf\penalty\z@\addvspace\LTpost
-  \ifvoid\footins\else\insert\footins{}\fi
-   \global\@RTLtabfalse}
-%    \end{macrocode}
-% \iffalse
-%</longtable-bidi.def>
-%<*minitoc-bidi.def>
-% \fi
-% \part{minitoc-bidi.def}
-%    \begin{macrocode}
-\def\@undottedtocline#1#2#3#4#5{%
-  \ifnum #1>\c@tocdepth\relax \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 \hbox{}%
-   \hskip -\if@RTL\rightskip\else\leftskip\fi
-    #4\nobreak\hfill \nobreak
-           \null\par}%
-  \fi}
-\def\@Undottedtocline#1#2#3#4#5{%
-  \ifnum #1>\c@tocdepth\relax \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
-     {\coffeefont #4}\nobreak \nobreak\null
-    \par}%
-  \fi}
-\def\@Undottedtoclinep#1#2#3#4#5{%
-  \ifnum #1>\c@tocdepth\relax \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 \hfill \nobreak\null
-     \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
-    \par}%
-  \fi}
-%    \end{macrocode}
-% \iffalse
-%</minitoc-bidi.def>
-%<*memoir-bidi.def>
-% \fi
-% \part{memoir-bidi.def}
-%    \begin{macrocode}
-\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}
-%    \end{macrocode}
-% \iffalse
-%</memoir-bidi.def>
-%<*pdfpages-bidi.def>
-% \fi
-% \part{pdfpages-bidi.def}
-%    \begin{macrocode}
-\renewcommand*{\includepdf}[2][]{%
-  \begingroup
-  \@RTLfalse
-  \let\AM@threadname\relax
-  \AM@split@options{pdfpages}{#1}%
-  \edef\AM@temp{{pdfpages}{\the\@temptokena}}%
-  \expandafter\setkeys\AM@temp
-  \ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
-    \let\AM@currentdocname\relax
-    \renewcommand\includegraphics[2][]{Survey in draft-mode}%
-    \def\AM@pagecount{0}%
-  }{%
-    \AM@findfile{#2}%
-    \if\AM@threadname\relax
-      \def\AM@threadname{\AM@currentdocname}%
-    \fi
-  }%
-  \ifAM@survey
-    \def\AM@pagestemp{}%
-    \@tempcnta=0
-    \def\foo{%
-      \@ifundefined{r@\AM@xrprefix pdfpages@page\the\@tempcnta}%
-         {\let\foo\relax}
-         {\expandafter\ifx\expandafter\\\AM@pagestemp\\
-             \edef\AM@pagestemp{%
-                \AM@pageref{\AM@xrprefix pdfpages@page\the\@tempcnta}}%
-          \else
-            \edef\AM@pagestemp{\AM@pagestemp,%
-               \AM@pageref{\AM@xrprefix pdfpages@page\the\@tempcnta}}%
-          \fi
-          \advance\@tempcnta 1\relax
-         }%
-      \foo
-    }%
-    \foo
-    \expandafter\ifx\expandafter\\\AM@pagestemp\\
-      \def\AM@pagestemp{1}%
-    \fi
-  \fi
-  \ifAM@output
-    \expandafter\AM@readlist\expandafter{\AM@pagestemp}%
-    \AM@output{#1}%
-  \fi
-  \AM@CheckAtEnd
-  \endgroup
-  \AM@ClearShipoutPicture
-}
-%    \end{macrocode}
-% \iffalse
-%</pdfpages-bidi.def>
-%<*pstricks-bidi.def>
-% \fi
-% \part{pstricks-bidi.def}
-%    \begin{macrocode}
-\def\pspicture{\begingroup\@RTLfalse\pst@ifstar\pst@picture}%
-%    \end{macrocode}
-% \iffalse
-%</pstricks-bidi.def>
-%<*refrep-bidi.def>
-% \fi
-% \part{refrep-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      {\leavevmode
-       \large \bfseries #1\hfil \hbox to\@pnumwidth{\hss #2}}\par
-       \nobreak
-         \global\@nobreaktrue
-         \everypar{\global\@nobreakfalse\everypar{}}%
-      \endgroup
-  \fi}
-\renewcommand\theequation
-{\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
-\renewcommand\thefigure
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@figure}
-\renewcommand\thetable%
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@table}
-\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}
-%    \end{macrocode}
-% \iffalse
-%</refrep-bidi.def>
-%<*report-bidi.def>
-% \fi
-% \part{report-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \setlength\@tempdima{3em}%
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      {\leavevmode
-       \large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
-       \nobreak
-         \global\@nobreaktrue
-         \everypar{\global\@nobreakfalse\everypar{}}%
-    \endgroup
-  \fi}
-\renewcommand\theequation
-  {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
-\renewcommand \thefigure
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@figure}
-\renewcommand \thetable
-     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@table}
-\renewcommand \thechapter {\@arabic\c@chapter}
-\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}
-\def\@makechapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft \normalfont
-    \ifnum \c@secnumdepth >\m@ne
-        \huge\bfseries \@chapapp\space \thechapter
-        \par\nobreak
-        \vskip 20\p@
-    \fi
-    \interlinepenalty\@M
-    \Huge \bfseries #1\par\nobreak
-    \vskip 40\p@
-  }}
-\def\@makeschapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft
-    \normalfont
-    \interlinepenalty\@M
-    \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\beginR\leftmark\endR}%
-      \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-      \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markboth {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\m@ne
-            \beginR\@chapapp\ \thechapter. \ \endR%
-        \fi
-        \beginR##1\endR}}{}}%
-    \def\sectionmark##1{%
-      \markright {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\z@
-          \beginR\thesection. \ \endR%
-        \fi
-        \beginR##1\endR}}}}
-\else
-  \def\ps@headings{%
-    \let\@oddfoot\@empty
-    \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-    \let\@mkboth\markboth
-    \def\chaptermark##1{%
-      \markright {\MakeUppercase{%
-        \ifnum \c@secnumdepth >\m@ne
-            \beginR\@chapapp\ \thechapter. \ \endR%
-        \fi
-        \beginR##1\endR}}}}
-\fi
-\def\ps@myheadings{%
-    \let\@oddfoot\@empty\let\@evenfoot\@empty
-    \def\@evenhead{\sl\thepage\hfil\beginR\leftmark\endR}%
-    \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-    \let\@mkboth\@gobbletwo
-    \let\chaptermark\@gobble
-    \let\sectionmark\@gobble
-    }
-\pagestyle{plain}
-%    \end{macrocode}
-% \iffalse
-%</report-bidi.def>
-%<*rapport3-bidi.def>
-% \fi
-% \part{rapport3-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\@regtocline[3]{%
-  \ifnum #1>\c@tocdepth
-  \else
-    \vskip\z@\@plus.2\p@
-    {\hangindent\z@ \@afterindenttrue \interlinepenalty\@M
-     \if@RTL\rightskip\else\leftskip\fi\unitindent
-     \if@RTL\leftskip\else\rightskip\fi\unitindent\@plus 1fil
-     \parfillskip\z@
-     \@tempdima\unitindent
-     \parindent\z@
-     \leavevmode
-     \hbox{}\hskip -\if@RTL\rightskip\else\leftskip\fi\relax#2\nobreak
-     \hskip 1em \nobreak{\slshape #3}\par
-     }%
-  \fi}
-\if@oldtoc
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \begingroup
-      \setlength\@tempdima{3em}%
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      {\leavevmode
-        \large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
-        \nobreak
-        \global\@nobreaktrue
-        \everypar{\global\@nobreakfalse\everypar{}}%
-    \endgroup
-  \fi}
-\else
-   \renewcommand*\l@part{%
-     \ifnum \c@tocdepth >-2\relax
-     \addpenalty{-\@highpenalty}%
-     \addvspace{2.25em \@plus \p@}%
-     \@regtocline{0}%
-   \fi}
-\fi
-\if@oldtoc
-\renewcommand*\l@chapter[2]{%
-    \addpenalty{-\@highpenalty}%
-    \vskip 1.0em \@plus\p@
-    \setlength\@tempdima{1.5em}%
-    \begingroup
-    \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-    \parfillskip -\@pnumwidth
-    \leavevmode \bfseries
-    \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima
-    \hskip -\if@RTL\rightskip\else\leftskip\fi
-    #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
-    \penalty\@highpenalty
-   \endgroup}
-\else
-  \renewcommand*\l@chapter{\@regtocline{0}}
-\fi
-\renewcommand*\head@style{%
-    \interlinepenalty \@M
-    \hyphenpenalty=\@M \exhyphenpenalty=\@M
-    \if@RTL\leftskip\else\rightskip\fi=0cm plus .7\hsize\relax}
-\if@titlepage
-  \renewenvironment{abstract}{%
-      \titlepage
-      \null\vfil
-      \hbox{\SectFont \abstractname}
-      \noindent\ignorespaces}
-     {\par\vfil\null\endtitlepage}
-\else
-  \renewenvironment{abstract}{%
-      \if@twocolumn
-        \section*{\abstractname}%
-      \else
-        \small
-        \bgroup\if@RTL\leftskip\else\rightskip\fi=\unitindent
-        \hbox{\SectFont \abstractname}%
-        \noindent\ignorespaces
-      \fi}
-      {\if@twocolumn\else\par\egroup\fi}
-\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*\thefigure{%
-  \ifnum\c@chapter>\z@\thechapter\@SepMark\fi\@arabic\c@figure}
-\renewcommand*\thetable{%
-  \ifnum\c@chapter>\z@\thechapter\@SepMark\fi\@arabic\c@table}
-\renewcommand*\theequation{%
-  \ifnum \c@chapter>\z@ \thechapter\@SepMark\fi\@arabic\c@equation}
-%    \end{macrocode}
-% \iffalse
-%</rapport3-bidi.def>
-%<*scrartcl-bidi.def>
-% \fi
-% \part{scrartcl-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >\m@ne\relax
-    \addpenalty{\@secpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \setlength{\@tempdima}{2em}%
-    \if@tocleft
-      \ifx\toc@l@number\@empty\else
-        \setlength\@tempdima{0\toc@l@number}%
-      \fi
-    \fi
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima
-      \hskip -\if@RTL\rightskip\else\leftskip\fi
-      \usekomafont{partentry}{#1\nobreak
-        \usekomafont{partentrypagenumber}{\hfil\nobreak
-          \hb@xt@\@pnumwidth{\hss#2}}}\par
-      \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
-      \endgroup
-      \penalty20010
-      \else
-        \if@compatibility
-          \global\@nobreaktrue
-          \everypar{\global\@nobreakfalse\everypar{}}%
-        \else
-          \penalty\@highpenalty
-         \fi
-      \endgroup
-    \fi
-  \fi
-}
-\renewcommand*\l@section[2]{%
-  \ifnum \c@tocdepth >\z@
-    \ifnum \lastpenalty<20009
-      \addpenalty{\@secpenalty}%
-    \fi
-    \addvspace{1.0em \@plus\p@}%
-    \setlength\@tempdima{1.5em}%
-     \if@tocleft
-      \ifx\toc@l@number\@empty\else
-        \setlength\@tempdima{0\toc@l@number}%
-      \fi
-    \fi
-   \begingroup
-      \raggedsectionentry
-      \parindent \z@ \advance\if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \interlinepenalty\@M
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-      \usekomafont{sectionentry}{#1\nobreak
-        \usekomafont{sectionentrypagenumber}{%
-          \hfill\nobreak
-          \hb@xt@\@pnumwidth{\hss#2}}}\par
-    \endgroup
-    \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
-      \penalty20008
-    \fi
-  \fi
-}
-\def\raggedsection{\if@RTL\raggedleft\else\raggedright\fi}
-\def\raggedpart{\if@RTL\raggedleft\else\raggedright\fi}
-\renewcommand*\autodot{\if@altsecnumformat\@SepMark\fi}
-\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
-}
-%    \end{macrocode}
-% \iffalse
-%</scrartcl-bidi.def>
-%<*scrbook-bidi.def>
-% \fi
-% \part{scrbook-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \setlength{\@tempdima}{2em}%
-    \if@tocleft
-      \ifx\toc@l@number\@empty\else
-        \setlength\@tempdima{0\toc@l@number}%
-      \fi
-    \fi
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima
-      \hskip -\if@RTL\rightskip\else\leftskip\fi
-      \usekomafont{partentry}{#1\nobreak
-        \usekomafont{partentrypagenumber}{\hfil\nobreak
-          \hb@xt@\@pnumwidth{\hss#2}}}\par
-      \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
-      \endgroup
-      \penalty20010
-      \else
-          \penalty\@highpenalty
-      \endgroup
-    \fi
-  \fi
-}\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \setlength{\@tempdima}{2em}%
-    \if@tocleft
-      \ifx\toc@l@number\@empty\else
-        \setlength\@tempdima{0\toc@l@number}%
-      \fi
-    \fi
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima
-      \hskip -\if@RTL\rightskip\else\leftskip\fi
-      \usekomafont{partentry}{#1\nobreak
-        \usekomafont{partentrypagenumber}{\hfil\nobreak
-          \hb@xt@\@pnumwidth{\hss#2}}}\par
-      \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
-      \endgroup
-      \penalty20010
-      \else
-          \penalty\@highpenalty
-      \endgroup
-    \fi
-  \fi
-}
-\renewcommand*\l@chapter[2]{%
-  \ifnum \c@tocdepth >\m@ne
-    \ifnum \lastpenalty<20010
-      \addpenalty{-\@highpenalty}%
-    \fi
-    \vskip 1.0em \@plus\p@
-    \setlength\@tempdima{1.5em}%
-    \if@tocleft
-      \ifx\toc@l@number\@empty\else
-        \setlength\@tempdima{0\toc@l@number}%
-      \fi
-    \fi
-    \begingroup
-      \raggedchapterentry
-      \parindent \z@ \advance\if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \interlinepenalty\@M
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-      \usekomafont{chapterentry}{#1\nobreak
-        \usekomafont{chapterentrypagenumber}{%
-          \hfill\nobreak
-          \hb@xt@\@pnumwidth{\hss#2}}}\par
-      \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
-      \endgroup
-      \penalty20009
-      \else
-        \penalty\@highpenalty
-      \endgroup
-    \fi
-  \fi
-}
-\def\raggedsection{\if@RTL\raggedleft\else\raggedright\fi}
-\renewcommand*\autodot{\if@altsecnumformat\@SepMark\fi}
-\renewcommand*\thesection{%
-  \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
-    \if@mainmatter\thechapter\@SepMark\fi
-  \else
-  \thechapter\@SepMark%
-  \fi
-  \@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*\thefigure{%
-  \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
-    \if@mainmatter\thechapter\@SepMark\fi
-  \else
-  \thechapter\@SepMark%
-  \fi
-  \@arabic\c@figure
-}
-\renewcommand*\thetable{%
-  \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
-    \if@mainmatter\thechapter\@SepMark\fi
-  \else
-  \thechapter\@SepMark%
-  \fi
-  \@arabic\c@table
-}
-\renewcommand*\theequation{%
-  \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
-    \if@mainmatter\thechapter\@SepMark\fi
-  \else
-  \thechapter\@SepMark%
-  \fi
-  \@arabic\c@equation
-}
-%    \end{macrocode}
-% \iffalse
-%</scrbook-bidi.def>
-%<*scrreprt-bidi.def>
-% \fi
-% \part{scrreprt-bidi.def}
-%    \begin{macrocode}
-\renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >-2\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{2.25em \@plus\p@}%
-    \setlength{\@tempdima}{2em}%
-    \if@tocleft
-      \ifx\toc@l@number\@empty\else
-        \setlength\@tempdima{0\toc@l@number}%
-      \fi
-    \fi
-    \begingroup
-      \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima
-      \hskip -\if@RTL\rightskip\else\leftskip\fi
-      \usekomafont{partentry}{#1\nobreak
-        \usekomafont{partentrypagenumber}{\hfil\nobreak
-          \hb@xt@\@pnumwidth{\hss#2}}}\par
-      \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
-      \endgroup
-      \penalty20010
-      \else
-          \penalty\@highpenalty
-      \endgroup
-    \fi
-  \fi
-}
-\renewcommand*\l@chapter[2]{%
-  \ifnum \c@tocdepth >\m@ne
-    \ifnum \lastpenalty<20010
-      \addpenalty{-\@highpenalty}%
-    \fi
-    \vskip 1.0em \@plus\p@
-    \setlength\@tempdima{1.5em}%
-    \if@tocleft
-      \ifx\toc@l@number\@empty\else
-        \setlength\@tempdima{0\toc@l@number}%
-      \fi
-    \fi
-    \begingroup
-      \raggedchapterentry
-      \parindent \z@ \advance\if@RTL\leftskip\else\rightskip\fi \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \interlinepenalty\@M
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-      \usekomafont{chapterentry}{#1\nobreak
-        \usekomafont{chapterentrypagenumber}{%
-          \hfill\nobreak
-          \hb@xt@\@pnumwidth{\hss#2}}}\par
-      \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
-      \endgroup
-      \penalty20009
-      \else
-        \penalty\@highpenalty
-      \endgroup
-    \fi
-  \fi
-}
-\def\raggedsection{\if@RTL\raggedleft\else\raggedright\fi}
-\renewcommand*\autodot{\if@altsecnumformat\@SepMark\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*\thefigure{%
-  \thechapter\@SepMark%
-  \@arabic\c@figure
-}
-\renewcommand*\thetable{%
-  \thechapter\@SepMark%
-  \@arabic\c@table
-}
-\renewcommand*\theequation{%
-  \thechapter\@SepMark%
-  \@arabic\c@equation
-}
-%    \end{macrocode}
-% \iffalse
-%</scrreprt-bidi.def>
-%<*stabular-bidi.def>
-% \fi
-% \part{stabular-bidi.def}
-%    \begin{macrocode}
-\def\@stabular{\if@RTL\global\@RTLtabtrue\fi
-   \leavevmode \bgroup \if@RTLtab\beginR \fi
-   \let\@acol\@tabacol
-   \let\@classz\@tabclassz
-   \let\@classiv\@tabclassiv \let\\\@tabularcr\@stabarray}
-\def\endstabular{\crcr\egroup\if@RTLtab\egroup\endR\egroup\fi
-                 \egroup \if@RTLtab\endR\fi\egroup
-                 \global\@RTLtabfalse}
-\expandafter \let \csname endstabular*\endcsname = \endstabular
-\def\@sarray[#1]#2{%
-  \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
-  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
-    \@preamble}
-%    \end{macrocode}
-% \iffalse
-%</stabular-bidi.def>
-%<*ragged2e-bidi.def>
-% \fi
-% \part{ragged2e-bidi.def}
-%    \begin{macrocode}
-\renewcommand{\Centering}{%
-   \ifx\\\@raggedtwoe@savedcr
-      \let\\\@centercr
-   \fi
-   \let\@gnewline\@raggedtwoe@gnewline
-   \if@RTL\rightskip\else\leftskip\fi\CenteringLeftskip
-   \@rightskip\CenteringRightskip
-   \if@RTL\leftskip\else\rightskip\fi\@rightskip
-   \parfillskip\CenteringParfillskip
-   \parindent\CenteringParindent
-   \@raggedtwoe@spaceskiptrue
-   \@raggedtwoe@everyselectfont
-   }
-\renewcommand{\RaggedLeft}{%
-   \ifx\\\@raggedtwoe@savedcr
-      \let\\\@centercr
-   \fi
-   \let\@gnewline\@raggedtwoe@gnewline
-   \if@RTL\rightskip\else\leftskip\fi\RaggedLeftLeftskip
-   \@rightskip\RaggedLeftRightskip
-   \if@RTL\leftskip\else\rightskip\fi\@rightskip
-   \parfillskip\RaggedLeftParfillskip
-   \parindent\RaggedLeftParindent
-   \@raggedtwoe@spaceskiptrue
-   \@raggedtwoe@everyselectfont
-   }
-\renewcommand{\RaggedRight}{%
-   \ifx\\\@raggedtwoe@savedcr
-      \let\\\@centercr
-   \fi
-   \let\@gnewline\@raggedtwoe@gnewline
-   \if@RTL\rightskip\else\leftskip\fi\RaggedRightLeftskip
-   \@rightskip\RaggedRightRightskip
-   \if@RTL\leftskip\else\rightskip\fi\@rightskip
-   \parfillskip\RaggedRightParfillskip
-   \parindent\RaggedRightParindent
-   \@raggedtwoe@spaceskiptrue
-   \@raggedtwoe@everyselectfont
-   }
-\renewcommand{\justifying}{%
-   \let\\\@raggedtwoe@savedcr
-   \let\@gnewline\@raggedtwoe@saved@gnewline
-   \if@RTL\rightskip\else\leftskip\fi\z@
-   \@rightskip\z@
-   \if@RTL\leftskip\else\rightskip\fi\@rightskip
-   \parfillskip\JustifyingParfillskip
-   \parindent\JustifyingParindent
-   \@raggedtwoe@spaceskipfalse
-   \@raggedtwoe@everyselectfont
-   }
-\renewcommand*{\@raggedtwoe@raggedrightboxes@opt}{
-  \CheckCommand*{\@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{}%
-    \linewidth\hsize
-    \@totalleftmargin\z@
-    \if@RTL\rightskip\else\leftskip\fi\z@skip \if@RTL\leftskip\else\rightskip\fi\z@skip \@rightskip\z@skip
-    \parfillskip\@flushglue \lineskip\normallineskip
-    \baselineskip\normalbaselineskip
-    \sloppy}%
-  \renewcommand{\@arrayparboxrestore}{%
-    \let\if@nobreak\iffalse
-    \let\if@noskipsec\iffalse
-    \let\par\@@par
-    \let\-\@dischyph
-    \let\'\@acci\let\`\@accii\let\=\@acciii
-    \parskip\z@skip
-    \everypar{}%
-    \linewidth\hsize
-    \@totalleftmargin\z@
-    \RaggedRight
-    \lineskip\normallineskip
-    \baselineskip\normalbaselineskip
-    \sloppy}%
-  \let\@raggedtwoe@raggedrightboxes@opt\relax
-  }
-\let\origin@RaggedLeft=\RaggedLeft
-\let\origin@RaggedRight=\RaggedRight
-\def\RaggedLeft{\if@RTL\origin@RaggedRight\else\origin@RaggedLeft\fi}
-\def\RaggedRight{\if@RTL\origin@RaggedLeft\else\origin@RaggedRight\fi}
-%    \end{macrocode}
-% \iffalse
-%</ragged2e-bidi.def>
-%<*tabls-bidi.def>
-% \fi
-% \part{tabls-bidi.def}
-%    \begin{macrocode}
-\def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup
-                 \global\@RTLtabfalse}
-
-\expandafter\let\csname endtabular*\endcsname=\endtabular
-
-\def\endarray{\ifvmode\csname crcr\endcsname % just do \crcr if \\ given
-  \else \\[\z@ \global\advance\@arstdepth-\@otarlinesep]% 
-  \fi\egroup\if@RTLtab\egroup\endR\egroup\fi\@unrecurse\egroup}
-
-\def\@array[#1]#2{%  remember global variables to allow recursion:
- \edef\@unrecurse{\global\@skip@bove\the\@skip@bove
-     \global\@arstheight\the\@arstheight\global\@arstdepth\the\@arstdepth}%
-%  Make the strut on the first line be shorter by the linesep outside
- \let\@otarlinesep\@tarlinesep \global\@skip@bove-\@otarlinesep
-%  This setup works for both tabular and array because of this test:
- \ifx\@classz\@arrayclassz \let\@tarlinesep\arraylinesep
- \else \let\@tarlinesep\tablinesep \fi
- \divide\@tarlinesep\tw@ % half sep is applied to height & depth
- \let\@seesize\relax \let\@rememsize\relax \@mkpream{#2}%
- \@tempdima\arraystretch\ht\strutbox \@tempdimb\arraystretch\dp\strutbox
- \ifdim\@tarlinesep>\z@ % (need \protect for \multicolumn)
-   \def\@rememsize{\protect\@r@m@msize}\let\@seesize\@s@@size
-   \advance\@tempdima-\@tarlinesep \advance\@tempdimb-\@tarlinesep
- \fi \setbox\@arstrutbox\hbox{% set up smaller strut
-    \vrule \@height\@tempdima \@depth\@tempdimb \@width\z@}%
- \let\protect\noexpand
- \edef\@preamble{\ialign \noexpand\@halignto \bgroup
- \unhcopy\@arstrutbox \@preamble \tabskip\z@skip &\@sharp \cr}%
-% I have added an extra column (&\@sharp) to take the smart strut.
- \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
- \if#1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi
- \bgroup \let\par\@empty
- \global\@arstheight\ht\@arstrutbox \global\@arstdepth\dp\@arstrutbox
- \advance\extrarulesep.5\arrayrulewidth
- \let\@sharp##\let\protect\relax \lineskip\z@skip \baselineskip\z@skip
- \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
- \@preamble}
-%    \end{macrocode}
-% \iffalse
-%</tabls-bidi.def>
-%<*tabulary-bidi.def>
-% \fi
-% \part{tabulary-bidi.def}
-%    \begin{macrocode}
-\def\@testpach{\@chclass
- \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
-  \ifnum \@lastchclass=7 5 \else
-   \ifnum \@lastchclass=8 \tw@ \else
-    \ifnum \@lastchclass=9 \thr@@
-   \else \z@
-   \ifnum \@lastchclass = 10 \else
-   \edef\@nextchar{\expandafter\string\@nextchar}%
-   \@chnum
-   \if \@nextchar c\z@ \else
-    \if \@nextchar \if@RTLtab r\else l\fi\@ne \else
-     \if \@nextchar \if@RTLtab l\else r\fi\tw@ \else
-   \if \@nextchar C7 \else
-    \if \@nextchar L8 \else
-     \if \@nextchar R9 \else
-     \if \@nextchar J10 \else
-   \z@ \@chclass
-   \if\@nextchar |\@ne \else
-    \if \@nextchar !6 \else
-     \if \@nextchar @7 \else
-      \if \@nextchar <8 \else
-       \if \@nextchar >9 \else
-  10
-  \@chnum
-  \if \@nextchar m\thr@@\else
-   \if \@nextchar p4 \else
-    \if \@nextchar b5 \else
-   \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi
-     \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
-%    \end{macrocode}
-% \iffalse
-%</tabulary-bidi.def>
-%<*tikz-bidi.def>
-% \fi
-% \part{tikz-bidi.def}
-%    \begin{macrocode}
-\let\origin@tikzpicture=\tikzpicture
-\let\origin@endtikzpicture=\endtikzpicture
-\def\tikzpicture{\LTR\origin@tikzpicture}
-\def\endtikzpicture{\origin@endtikzpicture\endLTR}
-%    \end{macrocode}
-% \iffalse
-%</tikz-bidi.def>
-%<*tocbibind-bidi.def>
-% \fi
-% \part{tocbibind-bidi.def}
-%    \begin{macrocode}
-\if@dotocbib
-  \@ifpackageloaded{natbib}{}{% natbib not loaded
-    \renewcommand{\bibsection}{\t@cb@bchapsec}
-    \renewenvironment{thebibliography}[1]{%
-      \bibsection
-      \begin{thebibitemlist}{#1}}{\end{thebibitemlist}}}
-  \renewenvironment{thebibitemlist}[1]{
-    \list{\@biblabel{\@arabic\c@enumiv}}%
-         {\settowidth\labelwidth{\@biblabel{#1}}%
-          \leftmargin\labelwidth
-          \advance\leftmargin\labelsep
-          \@openbib@code
-          \usecounter{enumiv}%
-          \let\p@enumiv\@empty
-          \renewcommand\theenumiv{\@arabic\c@enumiv}}%
-    \sloppy
-    \clubpenalty4000
-    \@clubpenalty \clubpenalty
-    \widowpenalty4000%
-    \sfcode`\.\@m}
-   {\def\@noitemerr
-     {\@latex@warning{Empty `thebibliography' environment}}%
-     \endlist}
-
-  \@ifpackagewith{chapterbib}{sectionbib}%
-    {\renewcommand{\sectionbib}[2]{}}%
-    {}
-
-\fi
-%    \end{macrocode}
-% \iffalse
-%</tocbibind-bidi.def>
-%<*tocloft-bidi.def>
-% \fi
-% \part{tocloft-bidi.def}
-%    \begin{macrocode}
-\if@cfthaspart
-\renewcommand*{\l@part}[2]{
-  \@cftdopartfalse
-  \ifnum \c@tocdepth >-2\relax
-    \if@cfthaschapter
-      \@cftdoparttrue
-    \fi
-    \ifnum \c@tocdepth >\m@ne
-      \if@cfthaschapter\else
-        \@cftdoparttrue
-      \fi
-    \fi
-  \fi
-  \if@cftdopart
-    \if@cfthaschapter
-      \addpenalty{-\@highpenalty}
-    \else
-      \addpenalty\@secpenalty
-    \fi
-    \addvspace{\cftbeforepartskip}
-    \begingroup
-      {\if@RTL\rightskip\else\leftskip\fi \cftpartindent\relax
-       \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-       \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-       \parindent \cftpartindent\relax\@afterindenttrue
-       \interlinepenalty\@M
-       \leavevmode
-       \@tempdima \cftpartnumwidth\relax
-       \let\@cftbsnum \cftpartpresnum
-       \let\@cftasnum \cftpartaftersnum
-       \let\@cftasnumb \cftpartaftersnumb
-       \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-       {\cftpartfont \cftpartpresnum #1}
-       \cftpartfillnum{#2}}
-      \nobreak
-      \if@cfthaschapter
-        \global\@nobreaktrue
-        \everypar{\global\@nobreakfalse\everypar{}}
-      \else
-        \if@compatibility
-          \global\@nobreaktrue
-          \everypar{\global\@nobreakfalse\everypar{}}
-        \fi
-      \fi
-    \endgroup
-  \fi}
-\fi
-\if@cfthaschapter
-\renewcommand*{\l@chapter}[2]{
-  \ifnum \c@tocdepth >\m@ne
-    \addpenalty{-\@highpenalty}
-    \vskip \cftbeforechapskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftchapindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftchapindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftchapnumwidth\relax
-     \let\@cftbsnum \cftchappresnum
-     \let\@cftasnum \cftchapaftersnum
-     \let\@cftasnumb \cftchapaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftchapfont #1}\nobreak
-     \cftchapfillnum{#2}}
-  \fi}
-\fi
-\renewcommand*{\l@section}[2]{%
-  \ifnum \c@tocdepth >\z@
-    \if@cfthaschapter
-      \vskip \cftbeforesecskip
-    \else
-      \addpenalty\@secpenalty
-      \addvspace{\cftbeforesecskip}
-    \fi
-    {\if@RTL\rightskip\else\leftskip\fi \cftsecindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftsecindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftsecnumwidth\relax
-     \let\@cftbsnum \cftsecpresnum
-     \let\@cftasnum \cftsecaftersnum
-     \let\@cftasnumb \cftsecaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftsecfont #1}\nobreak
-     \cftsecfillnum{#2}}
-  \fi}
-\renewcommand*{\l@subsection}[2]{%
-  \ifnum \c@tocdepth >\@ne
-    \vskip \cftbeforesubsecskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftsubsecindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftsubsecindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftsubsecnumwidth\relax
-     \let\@cftbsnum \cftsubsecpresnum
-     \let\@cftasnum \cftsubsecaftersnum
-     \let\@cftasnumb \cftsubsecaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftsubsecfont #1}\nobreak
-     \cftsubsecfillnum{#2}}
-  \fi}
-\renewcommand*{\l@subsubsection}[2]{%
-  \ifnum \c@tocdepth >\tw@
-    \vskip \cftbeforesubsubsecskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftsubsubsecindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftsubsubsecindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftsubsubsecnumwidth\relax
-     \let\@cftbsnum \cftsubsubsecpresnum
-     \let\@cftasnum \cftsubsubsecaftersnum
-     \let\@cftasnumb \cftsubsubsecaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftsubsubsecfont #1}\nobreak
-     \cftsubsubsecfillnum{#2}}
-  \fi}
-\renewcommand*{\l@paragraph}[2]{%
-  \ifnum \c@tocdepth >3\relax
-    \vskip \cftbeforeparaskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftparaindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftparaindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftparanumwidth\relax
-     \let\@cftbsnum \cftparapresnum
-     \let\@cftasnum \cftparaaftersnum
-     \let\@cftasnumb \cftparaaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftparafont #1}\nobreak
-     \cftparafillnum{#2}}
-  \fi}
-\renewcommand*{\l@subparagraph}[2]{%
-  \ifnum \c@tocdepth >4\relax
-    \vskip \cftbeforesubparaskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftsubparaindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftsubparaindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftsubparanumwidth\relax
-     \let\@cftbsnum \cftsubparapresnum
-     \let\@cftasnum \cftsubparaaftersnum
-     \let\@cftasnumb \cftsubparaaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftsubparafont #1}\nobreak
-     \cftsubparafillnum{#2}}
-  \fi}
-\renewcommand*{\l@figure}[2]{%
-  \ifnum \c@lofdepth >\z@
-    \vskip \cftbeforefigskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftfigindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftfigindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftfignumwidth\relax
-     \let\@cftbsnum \cftfigpresnum
-     \let\@cftasnum \cftfigaftersnum
-     \let\@cftasnumb \cftfigaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftfigfont #1}\nobreak
-     \cftfigfillnum{#2}}
-   \fi
-  }
-\renewcommand*{\l@table}[2]{%
-  \ifnum\c@lotdepth >\z@
-    \vskip \cftbeforetabskip
-    {\if@RTL\rightskip\else\leftskip\fi \cfttabindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cfttabindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cfttabnumwidth\relax
-     \let\@cftbsnum \cfttabpresnum
-     \let\@cftasnum \cfttabaftersnum
-     \let\@cftasnumb \cfttabaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cfttabfont #1}\nobreak
-     \cfttabfillnum{#2}}
-   \fi
-  }
-\renewcommand{\@cftl@subfig}{
-\renewcommand*{\l@subfigure}[2]{%
-  \ifnum \c@lofdepth > \toclevel@subfigure
-    \vskip \cftbeforesubfigskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftsubfigindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftsubfigindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftsubfignumwidth\relax
-     \let\@cftbsnum \cftsubfigpresnum
-     \let\@cftasnum \cftsubfigaftersnum
-     \let\@cftasnumb \cftsubfigaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftsubfigfont ##1}\nobreak
-     \cftsubfigfillnum{##2}}
-  \fi
-  }
-}
-\renewcommand{\@cftl@subtab}{
-\renewcommand*{\l@subtable}[2]{%
-  \ifnum \c@lotdepth > \toclevel@subtable
-    \vskip \cftbeforesubtabskip
-    {\if@RTL\rightskip\else\leftskip\fi \cftsubtabindent\relax
-     \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-     \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-     \parindent \cftsubtabindent\relax\@afterindenttrue
-     \interlinepenalty\@M
-     \leavevmode
-     \@tempdima \cftsubtabnumwidth\relax
-     \let\@cftbsnum \cftsubtabpresnum
-     \let\@cftasnum \cftsubtabaftersnum
-     \let\@cftasnumb \cftsubtabaftersnumb
-     \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-     {\cftsubtabfont ##1}\nobreak
-     \cftsubtabfillnum{##2}}
-  \fi
-  }
-}
-\renewcommand{\newlistentry}[4][\@empty]{%
-  \@ifundefined{c@#2}{%    check & set the counter
-    \ifx \@empty#1\relax
-      \newcounter{#2}
-    \else
-      \@ifundefined{c@#1}{\PackageWarning{tocloft}%
-                          {#1 has no counter for use as a `within'}
-        \newcounter{#2}}%
-      {\newcounter{#2}[#1]%
-       \expandafter\edef\csname the#2\endcsname{%
-         \expandafter\noexpand\csname the#1\endcsname.\noexpand\arabic{#2}}}
-    \fi
-    \setcounter{#2}{0}
-  }
-  {\PackageError{tocloft}{#2 has been previously defined}{\@eha}}
-
-  \@namedef{l@#2}##1##2{%
-    \ifnum \@nameuse{c@#3depth} > #4\relax
-      \vskip \@nameuse{cftbefore#2skip}
-      {\if@RTL\rightskip\else\leftskip\fi \@nameuse{cft#2indent}\relax
-       \if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-       \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-       \parindent \@nameuse{cft#2indent}\relax\@afterindenttrue
-       \interlinepenalty\@M
-       \leavevmode
-       \@tempdima \@nameuse{cft#2numwidth}\relax
-       \expandafter\let\expandafter\@cftbsnum\csname cft#2presnum\endcsname
-       \expandafter\let\expandafter\@cftasnum\csname cft#2aftersnum\endcsname
-       \expandafter\let\expandafter\@cftasnumb\csname cft#2aftersnumb\endcsname
-       \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi
-       {\@nameuse{cft#2font}##1}\nobreak
-       \@nameuse{cft#2fillnum}{##2}}
-    \fi
-  }  % end of \l@#2
-
-  \expandafter\newlength\csname cftbefore#2skip\endcsname
-    \setlength{\@nameuse{cftbefore#2skip}}{\z@ \@plus .2\p@}
-  \expandafter\newlength\csname cft#2indent\endcsname
-  \expandafter\newlength\csname cft#2numwidth\endcsname
-  \ifcase #4\relax  % 0
-    \setlength{\@nameuse{cft#2indent}}{0em}
-    \setlength{\@nameuse{cft#2numwidth}}{1.5em}
-  \or               % 1
-    \setlength{\@nameuse{cft#2indent}}{1.5em}
-    \setlength{\@nameuse{cft#2numwidth}}{2.3em}
-  \or               % 2
-    \setlength{\@nameuse{cft#2indent}}{3.8em}
-    \setlength{\@nameuse{cft#2numwidth}}{3.2em}
-  \or               % 3
-    \setlength{\@nameuse{cft#2indent}}{7.0em}
-    \setlength{\@nameuse{cft#2numwidth}}{4.1em}
-  \else             % anything else
-    \setlength{\@nameuse{cft#2indent}}{10.0em}
-    \setlength{\@nameuse{cft#2numwidth}}{5.0em}
-  \fi
-  \@namedef{cft#2font}{\normalfont}
-  \@namedef{cft#2presnum}{}
-  \@namedef{cft#2aftersnum}{}
-  \@namedef{cft#2aftersnumb}{}
-  \@namedef{cft#2dotsep}{\cftdotsep}
-  \@namedef{cft#2leader}{\normalfont\cftdotfill{\@nameuse{cft#2dotsep}}}
-  \@namedef{cft#2pagefont}{\normalfont}
-  \@namedef{cft#2afterpnum}{}
-  \@namedef{toclevel@#2}{#4}
-  \@namedef{cft#2fillnum}##1{%
-    {\@nameuse{cft#2leader}}\nobreak
-    \hb@xt@\@pnumwidth{\hfil\@nameuse{cft#2pagefont}##1}\@nameuse{cft#2afterpnum}\par}
-} % end \newlistentry
-\renewcommand{\cftchapterprecistoc}[1]{\addtocontents{toc}{%
-  {\if@RTL\rightskip\else\leftskip\fi \cftchapindent\relax
-   \advance\if@RTL\righskip\else\leftskip\fi \cftchapnumwidth\relax
-   \if@RTL\leftskip\else\rightskip\fi \@tocrmarg\relax
-   \textit{#1}\protect\par}}}
-%    \end{macrocode}
-% \iffalse
-%</tocloft-bidi.def>
-%<*tocstyle-bidi.def>
-% \fi
-% \part{tocstyle-bidi.def}
-%    \begin{macrocode}
-\renewcommand*{\tocstyle@dottedtocline}[5]{%
-  \let\numberline\tocstyle@numberline
-  \ifnum #1>\c@tocdepth \else
-    \if@tocstyle@penalties
-      \begingroup
-        \@tempcnta 20010
-        \advance \@tempcnta by -#1
-        \ifnum \@tempcnta>\lastpenalty
-          \aftergroup\penalty\aftergroup\@lowpenalty
-        \fi
-      \endgroup
-    \fi
-    \edef\tocstyledepth{#1}%
-    \tocstyle@activate@features
-    \ifx\tocstyle@feature@entryvskip\relax
-      \vskip \z@ \@plus.2\p@
-    \else
-      \addvspace{\tocstyle@feature@entryvskip}%
-    \fi
-    {%
-      \parskip \z@ \parindent \z@ \if@RTL\rightskip\else\leftskip\fi \z@ \if@RTL\leftskip\else\rightskip\fi \z@
-      \tocstyle@feature@raggedhook
-      \@tempdima #3\relax
-      \@tempdimb #2\relax
-      \typeout{m (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
-      \ifnum #1>\z@\relax
-        \@tempcnta #1\relax \advance\@tempcnta \m@ne
-        \ifcsname tocstyle@skipwidth@\tocstyleTOC @\the\@tempcnta\endcsname
-          \ifcsname tocstyle@numwidth@\tocstyleTOC @\the\@tempcnta\endcsname
-            \@tempdimb
-            \csname tocstyle@skipwidth@\tocstyleTOC @\the\@tempcnta\endcsname
-            \advance\@tempdimb
-            \csname tocstyle@numwidth@\tocstyleTOC @\the\@tempcnta\endcsname
-          \fi
-        \fi
-      \fi
-      \typeout{C (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
-      \ifcsname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname
-        \ifdim \@tempdimb>
-        \csname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname\relax
-          \expandafter\xdef\csname tocstyle@skipwidth@\tocstyleTOC
-          @#1\endcsname{\the\@tempdimb}%
-        \fi
-      \else
-        \expandafter\xdef\csname tocstyle@skipwidth@\tocstyleTOC
-        @#1\endcsname{\the\@tempdimb}%
-      \fi
-      \iftocstyle@autolength
-        \ifcsname tocstyle@maxskipwidth@\tocstyleTOC @#1\endcsname
-          \@tempdimb \csname tocstyle@maxskipwidth@\tocstyleTOC @#1\endcsname
-          \relax
-        \fi
-        \ifcsname tocstyle@maxnumwidth@\tocstyleTOC @#1\endcsname
-          \@tempdima \csname tocstyle@maxnumwidth@\tocstyleTOC @#1\endcsname
-          \relax
-        \fi
-        \typeout{a (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
-        \typeout{A (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
-      \else
-        \@tempdimb #2\relax
-        \typeout{M (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
-      \fi
-      \ifcsname tocstyle@unumwidth@\tocstyleTOC @\endcsname
-        \ifdim \@tempdima>
-        \csname tocstyle@unumwidth@\tocstyleTOC @\endcsname\relax
-          \expandafter\xdef\csname tocstyle@unumwidth@\tocstyleTOC
-          @\endcsname{\the\@tempdima}%
-        \fi
-      \else
-        \expandafter\xdef\csname tocstyle@unumwidth@\tocstyleTOC
-        @\endcsname{\the\@tempdima}%
-      \fi
-      \ifcase\tocstyle@indentstyle\relax\else
-        \@tempdimb \z@
-        \ifcsname tocstyle@maxunumwidth@\tocstyleTOC @\endcsname
-          \@tempdima \csname tocstyle@maxunumwidth@\tocstyleTOC @\endcsname
-          \relax
-        \fi
-        \typeout{s (\tocstyleTOC, \tocstyledepth): \the\@tempdima}%
-        \typeout{S (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}%
-      \fi
-      \advance\parindent \@tempdimb\@afterindenttrue
-      \advance\if@RTL\rightskip\else\leftskip\fi \parindent
-      \advance\if@RTL\leftskip\else\rightskip\fi \@tocrmarg
-      \parfillskip -\if@RTL\leftskip\else\rightskip\fi
-      \ifx\tocstyle@feature@parfillskip\relax\else
-        \advance\parfillskip \tocstyle@feature@parfillskip\relax
-      \fi
-      \interlinepenalty\@M
-      \leavevmode
-      \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima
-      \null\nobreak
-      \iftocstyle@indentnotnumbered\else
-        \hskip -\if@RTL\rightskip\else\leftskip\fi
-      \fi
-      \tocstyle@feature@entryhook
-      {#4}\nobreak
-      \ifx\tocstyle@feature@leaders\relax
-        \leaders\hbox{$\m@th
-          \mkern \@dotsep mu\hbox{\tocstyle@feature@dothook .}%
-          \mkern \@dotsep mu$}\hfill
-      \else
-        \tocstyle@feature@leaders
-      \fi
-      \nobreak
-      \ifx\tocstyle@feature@pagenumberbox\relax
-        \hb@xt@\@pnumwidth{\hfil\tocstyle@feature@pagenumberhook #5}%
-      \else
-        \tocstyle@feature@pagenumberbox{\tocstyle@feature@pagenumberhook #5}%
-      \fi
-      \par
-    }%
-    \if@tocstyle@penalties
-      \bgroup
-        \@tempcnta 20009
-        \advance\@tempcnta by -#1
-        \edef\reserved@a{\egroup\penalty\the\@tempcnta\relax}%
-      \reserved@a
-    \fi
-  \fi}
-\renewcommand*{\tocstyle@numberline}[1]{%
-  \begingroup
-    \ifx\tocstyle@feature@spaceafternumber\relax
-      \settowidth\@tempdima{\tocstyle@@numberline{#1}\enskip}%
-    \else
-      \settowidth\@tempdima{\tocstyle@@numberline{#1}}%
-      \advance \@tempdima \tocstyle@feature@spaceafternumber\relax
-    \fi
-    \ifcsname tocstyle@numwidth@\tocstyleTOC @\tocstyledepth\endcsname
-      \ifdim \@tempdima >
-      \csname tocstyle@numwidth@\tocstyleTOC @\tocstyledepth\endcsname\relax
-        \expandafter\xdef\csname tocstyle@numwidth@\tocstyleTOC
-        @\tocstyledepth\endcsname{\the\@tempdima}%
-      \fi
-    \else
-      \expandafter\xdef\csname tocstyle@numwidth@\tocstyleTOC
-      @\tocstyledepth\endcsname{\the\@tempdima}%
-    \fi
-  \endgroup
-  \iftocstyle@indentnotnumbered
-    \hskip -\if@RTL\rightskip\else\leftskip\fi
-  \fi
-  \ifcase \tocstyle@indentstyle
-    \hb@xt@\@tempdima{\tocstyle@@numberline{#1}\hfil}%
-  \or
-    \hb@xt@\@tempdima{\tocstyle@@numberline{#1}\hfil}%
-  \else
-    \ifx\tocstyle@feature@spaceafternumber\relax
-      \hbox{\tocstyle@@numberline{#1}\enskip}%
-    \else
-      \hbox{\tocstyle@@numberline{#1}\hskip
-        \tocstyle@feature@spaceafternumber\relax}%
-    \fi
-  \fi
-}
-\AtBeginDocument{%
-  \ifcsname l@part\endcsname
-    \ifcsname l@chapter\endcsname
-      \setbox\@tempboxa\vbox{\hsize\maxdimen
-        \l@part{\tocstyle@l@define{part}{-1}}{}}%
-    \else
-      \setbox\@tempboxa\vbox{\hsize\maxdimen
-        \l@part{\tocstyle@l@define{part}{0}}{}}%
-    \fi
-  \fi
-  \ifcsname l@chapter\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@chapter{\tocstyle@l@define{chapter}{0}}{}}%
-  \fi
-  \ifcsname l@section\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@section{\tocstyle@l@define{section}{1}}{}}%
-  \fi
-  \ifcsname l@subsection\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@subsection{\tocstyle@l@define{subsection}{2}}{}}%
-  \fi
-  \ifcsname l@subsubsection\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@subsubsection{\tocstyle@l@define{subsubsection}{3}}{}}%
-  \fi
-  \ifcsname l@paragraph\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@paragraph{\tocstyle@l@define{paragraph}{4}}{}}%
-  \fi
-  \ifcsname l@subparagraph\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@subparagraph{\tocstyle@l@define{subparagraph}{5}}{}}%
-  \fi
-  \ifcsname l@table\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@table{\tocstyle@l@define{table}{1}}{}}%
-  \fi
-  \ifcsname l@figure\endcsname
-    \setbox\@tempboxa\vbox{\hsize\maxdimen
-      \l@figure{\tocstyle@l@define{figure}{1}}{}}%
-  \fi
-  \def\@tempa#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}%
-  \ifx\@dottedtocline\@tempa\else
-    \tocstyle@macrochangewarning\@dottedtocline
-  \fi
-  \let\tocstyle@saved@dottedtocline\@dottedtocline
-  \def\@tempa#1{\hb@xt@\@tempdima{#1\autodot\hfil}}%
-  \ifx\numberline\@tempa\else
-    \def\@tempa#1{\hb@xt@\@tempdima{#1\hfil}}%
-    \ifx\numberline@tempa\else
-      \tocstyle@macrochangewarning\numberline
-    \fi
-  \fi
-  \let\tocstyle@saved@numberline\numberline
-}
-\renewcommand*{\tocstyle@l@define}[2]{%
-  \advance\if@RTL\rightskip\else\leftskip\fi-\@tempdima
-  \edef\@tempa{%
-    \noexpand\global\noexpand\let
-    \expandafter\noexpand\csname tocstyle@saved@l@#1\endcsname
-    \expandafter\noexpand\csname l@#1\endcsname
-    \noexpand\gdef
-    \expandafter\noexpand\csname tocstyle@l@#1\endcsname{%
-      \noexpand\@dottedtocline{#2}{\the\if@RTL\rightskip\else\leftskip\fi}{\the\@tempdima}}%
-    \noexpand\g@addto@macro\noexpand\tocstyle@activate@all@l{%
-      \noexpand\let\expandafter\noexpand\csname l@#1\endcsname
-      \expandafter\noexpand\csname tocstyle@l@#1\endcsname
-    }%
-  }%
-  \PackageInfo{tocstyle}{prepare \expandafter\string
-    \csname l@#1\endcsname\space for redefinition}%
-  \@tempa
-}
-%    \end{macrocode}
-% \iffalse
-%</tocstyle-bidi.def>
-%<*xltxtra-bidi.def>
-% \fi
-% \part{xltxtra-bidi.def}
-%    \begin{macrocode}
-\let\@@XeTeX\XeTeX
-\def\XeTeX{\@ensure@LTR{\@@XeTeX}}
-\let\@@XeLaTeX\XeLaTeX
-\def\XeLaTeX{\@ensure@LTR{\@@XeLaTeX}}
-%    \end{macrocode}
-% \iffalse
-%</xltxtra-bidi.def>
-%<*wrapfig-bidi.def>
-% \fi
-% \part{wrapfig-bidi.def}
-%    \begin{macrocode}
-\let\WF@@everypar\n@everypar
-% Put fig here if it fits or if it can't float
-\def\WF@putfigmaybe{%
-\ifinner
-  \vskip-\parskip \global\WF@floatfalse
-  \let\pagetotal\maxdimen % kludge flag for "not top of page"
-\else % outer page
-  \@tempdima\pagedepth % save page depth
-   {\advance\parskip\if@RTL\@tempdimb\else\@tempdima\fi\vskip-\parskip}% back up to baseline
-   \penalty\interlinepenalty % update pg. parameters
-   \@tempdimb\pagegoal \advance\@tempdimb-\pagetotal % room left on page
-   \ifdim\@tempdimb<\z@ % \WF@info{Page overfull already;}%
-      \global\WF@floatfalse
-      \ifdim-\@tempdimb>\pageshrink \else \pagebreak \fi
-   \else
-      \ifdim\WF@size>\@tempdimb
-%        \WF@info{Size \the\WF@size\space does not fit in \the\@tempdimb}%
-         \ifWF@float \dimen@.5\baselineskip \else \dimen@ 2\baselineskip\fi
-         \ifdim\pagestretch>\dimen@ \dimen@\pagestretch \fi
-         \ifdim\pagefilstretch>\z@ \dimen@\@tempdimb \fi
-         \ifdim\pagefillstretch>\z@ \dimen@\@tempdimb \fi
-         \advance\dimen@.5\baselineskip
-         \ifdim\dimen@>\@tempdimb % \WF@info{Page nearly full; can stretch}%
-            \global\WF@floatfalse \pagebreak
-         \fi
-      \else % \WF@info{Fits in \the\@tempdimb;}%
-         \global\WF@floatfalse
-   \fi\fi
-   \vskip\@tempdima\relax % (return erased page depth)
-\fi
-\noindent
-\ifWF@float
-  \WF@fltmes
-\else % putting here;
-  \WF@info{Put \WF@wfname here:}%
-  {\ifodd\if@twoside\c@page\else\@ne\fi % assign l/r to i/o placement
-    \lccode`i`l\lccode`o`r\else \lccode`i`r\lccode`o`l\fi
-    \xdef\WF@place{\the\lccode\lccode\WF@place}}% twice to get only l or r
-  \hbox to\z@{% llap or rlap depending on {l} or {r}; calc effective width
-   \@tempdima\wd\WF@box \@tempdimb\WF@ovh
-   \advance\@tempdima-\@tempdimb \advance\@tempdima\columnsep
-   \@tempdimb\hsize \advance\@tempdimb-\@tempdima
-   \xdef\WF@adjlw{\the\@tempdima}%
-   \ifnum `l=\WF@place % fig on left
-    \if@RTL%
-     \kern\@tempdimb \kern\columnsep
-    \def\@tempa{\hss}% position to left of the gap
-     \else%
-    \hss % figure overlaps space to the left
-    \def\@tempa{\kern\columnsep}% position to left of the gap
-    \fi%
-   \else  %  fig on right
-    \if@RTL%
-     \hss
-      \@tempdima\z@
-      \def\@tempa{\kern\columnsep}
-     \else%
-    \@tempdima\z@ % no left indentation
-    \kern\@tempdimb \kern\columnsep
-    \def\@tempa{\hss}% figure overlaps space to the right
-    \fi%
-   \fi
-   \ifdim\@tempdimb<\hsize
-    \xdef\WF@wrapil{\the\@tempdima \the\@tempdimb}% indentation and length
-    \xdef\WF@adjtlm{\the\@tempdima}%
-   \else
-    \xdef\WF@wrapil{\z@ \the\hsize}%
-    \xdef\WF@adjlw{\z@}\xdef\WF@adjtlm{\z@}%
-   \fi
-   \ifdim\pagetotal=\z@ % \WF@info{Put \WF@wfname at top of p.\thepage}%
-    \global\advance\WF@size-\intextsep
-   \else % \WF@info{Putting \WF@wfname in middle of page}%
-    \setbox\WF@box\hbox{\lower\intextsep\box\WF@box}%
-   \fi \dp\WF@box\z@ \box\WF@box \@tempa
-  }% end \hbox to 0pt
-  \aftergroup\WF@startwrapping % after the \endgroup which immediately follows
-\fi}
-%    \end{macrocode}
-% \iffalse
-%</wrapfig-bidi.def>
-% \fi
-% \clearpage
-% \PrintChanges
-% \Finale
-% 
-% \iffalse
-%<*beamer-sample.tex>
-\documentclass{bidibeamer}
-\usetheme{Warsaw}
-\usepackage{fontspec}
-\setmainfont[Script=Arabic,Mapping=farsidigits]{XB Niloofar}
-\def\familydefault{\rmdefault}
-\newfontfamily\rmfamily[Mapping=tex-text]{Linux Libertine}
-\usepackage{bidi}
-\newenvironment{latin}{\begin{LTR}\rmfamily}{\end{LTR}}
-\def\biditheoremname{قضیه}
-\def\bidicorollaryname{نتیجه}
-\def\bidifactname{حقیقت}
-\def\bidilemmaname{لم}
-\def\bidiproblemname{مسئله}
-\def\bidisolutionname{پاسخ}
-\def\bididefinitionname{تعریف}
-\def\bididefinitionsname{تعریف‌ها}
-\def\bidiexamplename{مثال}
-\def\bidiexamplesname{مثال‌ها}
-\def\bidiproofname{اثبات}
-\title{عنوان اسلاید}
-\subtitle{این یک زیرعنوان است}
-\author{وفا خلیقی}
-\institute{دانشگاه تهران}
-\begin{document}
-\begin{frame}
-\titlepage
-\end{frame}
-
-
-\begin{frame}{این یک عنوان است}
-\framesubtitle{این زیرعنوان است}
-\begin{bidiexample}
-در این مثال به برسی توابعی خواهیم پرداخت که برای ما قابل استفاده هستند:
-\begin{equation}
-(x-y)^2=x^2-2xy+y^2
-\end{equation}
-\end{bidiexample}
-\begin{bidisolution}
-این یک پاسخ است
-\end{bidisolution}
-\begin{bidiproblem}
-این یک مسئله است.
-\end{bidiproblem}
-\end{frame}
-\begin{frame}{ادامهٔ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-\begin{biditheorem}
-این یک قضیه است.
-\end{biditheorem}
-\begin{bidiproof}
-این یک اثبات است
-\end{bidiproof}
-\begin{bidicorollary}
-این یک نتیجه است
-\end{bidicorollary}
-\begin{bidifact}
-این یک حقیقت است
-\end{bidifact}
-\end{frame}
-\begin{frame}{ادامهّ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-\begin{bidilemma}
-این یک لم است
-\end{bidilemma}
-\begin{bididefinition}
-این یک تعریف است
-\end{bididefinition}
-\begin{bididefinitions}
-این محیط مخصوص بیشتر از یک تعریف است
-\end{bididefinitions}
-\begin{bidiexamples}
-این محیط مخصوص بیشتر از یک مثال است.
-\end{bidiexamples}
-\end{frame}
-\begin{frame}{ادامهّ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-\begin{bidiblock}{محیط بلوک}
-این محیط بلوک است
-\end{bidiblock}
-\begin{bidiexampleblock}{محیط بلوک مثال}
-این محیط بلوک مثال است
-\end{bidiexampleblock}
-\begin{bidialertblock}{محیط بلوک هشدار}
-این محیط بلوک هشدار است.
-\end{bidialertblock}
-\end{frame}
-\begin{frame}{ادامهّ عنوان قبلی}
-\framesubtitle{ادامهٔ زیرعنوان قبلی}
-این هم مقداری متن معمولی می‌نویسم تا بتوانم به خط بعدی بروم و ببینم که آیا واقعاً \lr{beamer} دست از لجاجت برمی‌دارد یا نه
-\begin{latin}
-This is an English paragraph that I am writing here to see what happens after this, will I get a new bug or I am lucky enough?
-\end{latin}
-این دوباره متنی است فارسی که من آن را می‌نویسم و هنوز در حال آزمایش هستم تا بتوانم به خط بعدی بروم و نتیجه را مشاهده کنم.
-\end{frame}
-\end{document}
-%</beamer-sample.tex>
-%<*bidicasual-samplecv.tex>
-\documentclass[11pt,a4paper]{bidimoderncv}
-\cvtheme[red]{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]{شماره ۳}{}
-
-% Publications from a BibTeX file
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{publications}       % 'publications' is the name of a BibTeX file
-
-\end{document}
-%</bidicasual-samplecv.tex>
-%<*bidiclassic-samplecv.tex>
-\documentclass[11pt,a4paper]{bidimoderncv}
-\cvtheme[orange]{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]{شماره ۳}{}
-
-% Publications from a BibTeX file
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{publications}       % 'publications' is the name of a BibTeX file
-
-\end{document}
-%</bidiclassic-samplecv.tex>
-%<*bidisample2e.tex>
-% This is a sample LaTeX input file.  (Version of 12 August 2004.)
-%
-% A '%' character causes TeX to ignore all remaining text on the line,
-% and is used for comments like this one.
-
-\documentclass{article}      % Specifies the document class
-\usepackage[RTLdocument]{bidi}
-                             % The preamble begins here.
-\title{An Example Document}  % Declares the document's title.
-\author{Leslie Lamport}      % Declares the author's name.
-\date{January 21, 1994}      % Deleting this command produces today's date.
-
-\newcommand{\ip}[2]{(#1, #2)}
-                             % Defines \ip{arg1}{arg2} to mean
-                             % (arg1, arg2).
-
-%\newcommand{\ip}[2]{\langle #1 | #2\rangle}
-                             % This is an alternative definition of
-                             % \ip that is commented out.
-
-\begin{document}             % End of preamble and beginning of text.
-
-\maketitle                   % Produces the title.
-
-This is an example input file.  Comparing it with
-the output it generates can show you how to
-produce a simple document of your own.
-
-\section{Ordinary Text}      % Produces section heading.  Lower-level
-                             % sections are begun with similar 
-                             % \subsection and \subsubsection commands.
-
-The ends  of words and sentences are marked 
-  by   spaces. It  doesn't matter how many 
-spaces    you type; one is as good as 100.  The
-end of   a line counts as a space.
-
-One   or more   blank lines denote the  end 
-of  a paragraph.  
-
-Since any number of consecutive spaces are treated
-like a single one, the formatting of the input
-file makes no difference to
-      \LaTeX,                % The \LaTeX command generates the LaTeX logo.
-but it makes a difference to you.  When you use
-\LaTeX, making your input file as easy to read 
-as possible will be a great help as you write 
-your document and when you change it.  This sample 
-file shows how you can add comments to your own input 
-file.
-
-Because printing is different from typewriting,
-there are a number of things that you have to do
-differently when preparing an input file than if
-you were just typing the document directly.
-Quotation marks like
-       ``this'' 
-have to be handled specially, as do quotes within
-quotes:
-       ``\,`this'            % \, separates the double and single quote.
-        is what I just 
-        wrote, not  `that'\,''.  
-
-Dashes come in three sizes: an 
-       intra-word 
-dash, a medium dash for number ranges like 
-       1--2, 
-and a punctuation 
-       dash---like 
-this.
-
-A sentence-ending space should be larger than the
-space between words within a sentence.  You
-sometimes have to type special commands in
-conjunction with punctuation characters to get
-this right, as in the following sentence.
-       Gnats, gnus, etc.\ all  % `\ ' makes an inter-word space.
-       begin with G\@.         % \@ marks end-of-sentence punctuation.
-You should check the spaces after periods when
-reading your output to make sure you haven't
-forgotten any special cases.  Generating an
-ellipsis
-       \ldots\               % `\ ' is needed after `\ldots' because TeX 
-                             % ignores spaces after command names like \ldots 
-                             % made from \ + letters.
-                             %
-                             % Note how a `%' character causes TeX to ignore 
-                             % the end of the input line, so these blank lines 
-                             % do not start a new paragraph.
-                             %
-with the right spacing around the periods requires
-a special command.
-
-\LaTeX\ interprets some common characters as
-commands, so you must type special commands to
-generate them.  These characters include the
-following:
-       \$ \& \% \# \{ and \}.
-
-In printing, text is usually emphasized with an
-       \emph{italic}  
-type style.  
-
-\begin{em}
-   A long segment of text can also be emphasized 
-   in this way.  Text within such a segment can be 
-   given \emph{additional} emphasis.
-\end{em}
-
-It is sometimes necessary to prevent \LaTeX\ from
-breaking a line where it might otherwise do so.
-This may be at a space, as between the ``Mr.''\ and
-``Jones'' in
-       ``Mr.~Jones'',        % ~ produces an unbreakable interword space.
-or within a word---especially when the word is a
-symbol like
-       \mbox{\emph{itemnum}} 
-that makes little sense when hyphenated across
-lines.
-
-Footnotes\footnote{This is an example of a footnote.}
-pose no problem.
-
-\LaTeX\ is good at typesetting mathematical formulas
-like
-       \( x-3y + z = 7 \) 
-or
-       \( a_{1} > x^{2n} + y^{2n} > x' \)
-or  
-       \( \ip{A}{B} = \sum_{i} a_{i} b_{i} \).
-The spaces you type in a formula are 
-ignored.  Remember that a letter like
-       $x$                   % $ ... $  and  \( ... \)  are equivalent
-is a formula when it denotes a mathematical
-symbol, and it should be typed as one.
-
-\section{Displayed Text}
-
-Text is displayed by indenting it from the left
-margin.  Quotations are commonly displayed.  There
-are short quotations
-\begin{quote}
-   This is a short quotation.  It consists of a 
-   single paragraph of text.  See how it is formatted.
-\end{quote}
-and longer ones.
-\begin{quotation}
-   This is a longer quotation.  It consists of two
-   paragraphs of text, neither of which are
-   particularly interesting.
-
-   This is the second paragraph of the quotation.  It
-   is just as dull as the first paragraph.
-\end{quotation}
-Another frequently-displayed structure is a list.
-The following is an example of an \emph{itemized}
-list.
-\begin{itemize}
-   \item This is the first item of an itemized list.
-         Each item in the list is marked with a ``tick''.
-         You don't have to worry about what kind of tick
-         mark is used.
-
-   \item This is the second item of the list.  It
-         contains another list nested inside it.  The inner
-         list is an \emph{enumerated} list.
-         \begin{enumerate}
-            \item This is the first item of an enumerated 
-                  list that is nested within the itemized list.
-
-            \item This is the second item of the inner list.  
-                  \LaTeX\ allows you to nest lists deeper than 
-                  you really should.
-         \end{enumerate}
-         This is the rest of the second item of the outer
-         list.  It is no more interesting than any other
-         part of the item.
-   \item This is the third item of the list.
-\end{itemize}
-You can even display poetry.
-\begin{verse}
-   There is an environment 
-    for verse \\             % The \\ command separates lines
-   Whose features some poets % within a stanza.
-   will curse.   
-
-                             % One or more blank lines separate stanzas.
-
-   For instead of making\\
-   Them do \emph{all} line breaking, \\
-   It allows them to put too many words on a line when they'd rather be 
-   forced to be terse.
-\end{verse}
-
-Mathematical formulas may also be displayed.  A
-displayed formula 
-is 
-one-line long; multiline
-formulas require special formatting instructions.
-   \[  \ip{\Gamma}{\psi'} = x'' + y^{2} + z_{i}^{n}\]
-Don't start a paragraph with a displayed equation,
-nor make one a paragraph by itself.
-
-\end{document}               % End of document.
-%</bidisample2e.tex>
-%<*bidismall2e.tex>
-% This is a small sample LaTeX input file (Version of 10 April 1994)
-%
-% Use this file as a model for making your own LaTeX input file.
-% Everything to the right of a  %  is a remark to you and is ignored by LaTeX.
-
-% The Local Guide tells how to run LaTeX.
-
-% WARNING!  Do not type any of the following 10 characters except as directed:
-%                &   $   #   %   _   {   }   ^   ~   \   
-
-\documentclass{article}        % Your input file must contain these two lines 
-\usepackage[RTLdocument]{bidi}
-\begin{document}               % plus the \end{document} command at the end.
-
-
-\section{Simple Text}          % This command makes a section title.
-
-Words are separated by one or more spaces.  Paragraphs are separated by
-one or more blank lines.  The output is not affected by adding extra
-spaces or extra blank lines to the input file.
-
-Double quotes are typed like this: ``quoted text''.
-Single quotes are typed like this: `single-quoted text'.
-
-Long dashes are typed as three dash characters---like this.
-
-Emphasized text is typed like this: \emph{this is emphasized}.
-Bold       text is typed like this: \textbf{this is bold}.
-
-\subsection{A Warning or Two}  % This command makes a subsection title.
-
-If you get too much space after a mid-sentence period---abbreviations
-like etc.\ are the common culprits)---then type a backslash followed by
-a space after the period, as in this sentence.
-
-Remember, don't type the 10 special characters (such as dollar sign and
-backslash) except as directed!  The following seven are printed by
-typing a backslash in front of them:  \$  \&  \#  \%  \_  \{  and  \}.  
-The manual tells how to make other symbols.
-
-\end{document}                 % The input file ends with this command.
-%</bidismall2e.tex>
-%<*presentation-sample.tex>
-\documentclass[12pt,twoside]{bidipresentation}
-\usepackage{eso-pic}
-\usepackage{graphicx}
-\usepackage{fontspec}
-\setmainfont[Script=Arabic,Mapping=farsidigits]{XB Niloofar}
-\newfontfamily\rmfamily[Mapping=tex-text]{XB Niloofar}
-\usepackage[RTLdocument]{bidi}
-\pagestyle{pres}
-\AddToShipoutPicture{
-\includegraphics{gradient.png}
-}
-
-\begin{document}
-\begin{titlepage}
-\distance{1}
-\centering \LARGE
- \bfseries عنوان اسلاید
-
-\distance{1}
-\large
-وفا خلیقی\\[1ex]نام دانشگاه
-\distance{2}
-\end{titlepage}
-
-\begin{plainslide}[این عنوان یک صفحه است.]
-این اولین صفحه اسلاید ما است که من در حال نوشتن آن هستم و کمی بیشتر می‌نویسم تا به خط بعدی بروم
-\footnote{این یک زیرنویس فارسی است.}\LTRfootnote{This is an English footnote.}
-\begin{equation}
-(a+b)^2=a^2+2ab+b^2
-\end{equation}
-\begin{itemize}
-  \item یک
-  \item دو
-\end{itemize}
-
-\begin{enumerate}
-  \item یک
-  \item دو
-\end{enumerate}
-
-\begin{description}
-  \item [یک:] اولین عدد
-  \item [دو:] دومین عدد
-\end{description}
-
-\end{plainslide}
-\begin{rawslide}
-دومین صفحه
-
-\end{rawslide}
-
-\end{document}
-
-
-%</presentation-sample.tex>
-%<*test-bidi.tex>
-\documentclass{article}
-\usepackage{bidi}
-\title{Testing Basic Bidi Direction Change}
-\author{Vafa Khalighi}
-\begin{document}
-\maketitle
-In this document we test bidi direction change in \textsf{RTL} and \textsf{LTR}. These tests includes \texttt{flushleft}, \texttt{flushright} environments and \verb|\centerline{...}|, \verb|\leftline{...}|,\verb|\rightline{...}|,\verb|\raggedleft| and \verb|\raggedright| macros.
-\section{RTL Test}
-\setRTL
-\begin{flushleft}
-This is left in RTL
-\end{flushleft}
-\begin{flushright}
-This is right in RTL
-\end{flushright}
-\centerline{This is center in RTL}
-
-\leftline{This is left in RTL}
-
-\rightline{This is right in RTL}
-
-\raggedleft This is raggedleft in RTL
-
-\raggedright This is raggedright in RTL
-
-\setLTR
-\section{LTR Test}
-\begin{flushleft}
-This is left in LTR
-\end{flushleft}
-\begin{flushright}
-This is right in LTR
-\end{flushright}
-\centerline{This is center in LTR}
-
-\leftline{This is left in LTR}
-
-\rightline{This is right in LTR}
-
-\raggedleft This is raggedleft in LTR
-
-\raggedright This is raggedright in LTR
-\end{document}
-%</test-bidi.tex>
-%<*test-supertabular.tex>
-\documentclass{article}
-\usepackage{supertabular}
-\usepackage{bidi}
-\title{Testing \textsf{supertabular} package in RTL and LTR}
-\author{Vafa Khalighi}
-\begin{document}
-\maketitle
-\section{LTR}
-\tablecaption{The ISOGRK3 entity set}
-\tablehead
-   {\bfseries Entity&\bfseries  Unicode Name&\bfseries Unicode\\ \hline}
-\tabletail
-   {\hline \multicolumn{3}{r}{\emph{Continued on next page}}\\}
-\tablelasttail{\hline}
-\begin{supertabular}{lll}
-alpha              & GREEK SMALL LETTER ALPHA            & 03B1\\
-beta               & GREEK SMALL LETTER BETA             & 03B2\\
-chi                & GREEK SMALL LETTER CHI              & 03C7\\
-Delta              & GREEK CAPITAL LETTER DELTA          & 0394\\
-delta              & GREEK SMALL LETTER DELTA            & 03B4\\
-epsi               & GREEK SMALL LETTER EPSILON          & 03B5\\
-epsis              & GREEK LUNATE EPSILON SYMBOL         & 03F5\\
-\empty
-epsiv              & GREEK SMALL LETTER EPSILON          & 03B5\\
-eta                & GREEK SMALL LETTER ETA              & 03B7\\
-Gamma              & GREEK CAPITAL LETTER GAMMA          & 0393\\
-gamma              & GREEK SMALL LETTER GAMMA            & 03B3\\
-gammad             & GREEK SMALL LETTER DIGAMMA          & 03DD\\
-iota               & GREEK SMALL LETTER IOTA             & 03B9\\
-kappa              & GREEK SMALL LETTER KAPPA            & 03BA\\
-kappav             & GREEK KAPPA SYMBOL                  & 03F0\\
-Lambda             & GREEK CAPITAL LETTER LAMDA          & 039B\\
-lambda             & GREEK SMALL LETTER LAMDA            & 03BB\\
-mu                 & GREEK SMALL LETTER MU               & 03BC\\
-nu                 & GREEK SMALL LETTER NU               & 03BD\\
-Omega              & GREEK CAPITAL LETTER OMEGA          & 03A9\\
-omega              & GREEK SMALL LETTER OMEGA            & 03C9\\
-Phi                & GREEK CAPITAL LETTER PHI            & 03A6\\
-phis               & GREEK PHI SYMBOL                    & 03D5\\
-phiv               & GREEK SMALL LETTER PHI              & 03C6\\
-Pi                 & GREEK CAPITAL LETTER PI             & 03A0\\
-pi                 & GREEK SMALL LETTER PI               & 03C0\\
-piv                & GREEK PI SYMBOL                     & 03D6\\
-Psi                & GREEK CAPITAL LETTER PSI            & 03A8\\
-psi                & GREEK SMALL LETTER PSI              & 03C8\\
-rho                & GREEK SMALL LETTER RHO              & 03C1\\
-rhov               & GREEK RHO SYMBOL                    & 03F1\\
-Sigma              & GREEK CAPITAL LETTER SIGMA          & 03A3\\
-sigma              & GREEK SMALL LETTER SIGMA            & 03C3\\
-sigmav             & GREEK SMALL LETTER FINAL SIGMA      & 03C2\\
-tau                & GREEK SMALL LETTER TAU              & 03C4\\
-Theta              & GREEK CAPITAL LETTER THETA          & 0398\\
-thetas             & GREEK SMALL LETTER THETA            & 03B8\\
-thetav             & GREEK THETA SYMBOL                  & 03D1\\
-Upsi               & GREEK UPSILON WITH HOOK SYMBOL      & 03D2\\
-upsi               & GREEK SMALL LETTER UPSILON          & 03C5\\
-Xi                 & GREEK CAPITAL LETTER XI             & 039E\\
-xi                 & GREEK SMALL LETTER XI               & 03BE\\
-zeta               & GREEK SMALL LETTER ZETA             & 03B6\\
-\end{supertabular}
-\section{RTL}
-
-\setRTL
-\tablecaption{The ISOGRK3 entity set}
-\tablehead
-   {\bfseries Entity&\bfseries  Unicode Name&\bfseries Unicode\\ \hline}
-\tabletail
-   {\hline \multicolumn{3}{r}{\emph{Continued on next page}}\\}
-\tablelasttail{\hline}
-\begin{supertabular}{lll}
-alpha              & GREEK SMALL LETTER ALPHA            & 03B1\\
-beta               & GREEK SMALL LETTER BETA             & 03B2\\
-chi                & GREEK SMALL LETTER CHI              & 03C7\\
-Delta              & GREEK CAPITAL LETTER DELTA          & 0394\\
-delta              & GREEK SMALL LETTER DELTA            & 03B4\\
-epsi               & GREEK SMALL LETTER EPSILON          & 03B5\\
-epsis              & GREEK LUNATE EPSILON SYMBOL         & 03F5\\
-\empty
-epsiv              & GREEK SMALL LETTER EPSILON          & 03B5\\
-eta                & GREEK SMALL LETTER ETA              & 03B7\\
-Gamma              & GREEK CAPITAL LETTER GAMMA          & 0393\\
-gamma              & GREEK SMALL LETTER GAMMA            & 03B3\\
-gammad             & GREEK SMALL LETTER DIGAMMA          & 03DD\\
-iota               & GREEK SMALL LETTER IOTA             & 03B9\\
-kappa              & GREEK SMALL LETTER KAPPA            & 03BA\\
-kappav             & GREEK KAPPA SYMBOL                  & 03F0\\
-Lambda             & GREEK CAPITAL LETTER LAMDA          & 039B\\
-lambda             & GREEK SMALL LETTER LAMDA            & 03BB\\
-mu                 & GREEK SMALL LETTER MU               & 03BC\\
-nu                 & GREEK SMALL LETTER NU               & 03BD\\
-Omega              & GREEK CAPITAL LETTER OMEGA          & 03A9\\
-omega              & GREEK SMALL LETTER OMEGA            & 03C9\\
-Phi                & GREEK CAPITAL LETTER PHI            & 03A6\\
-phis               & GREEK PHI SYMBOL                    & 03D5\\
-phiv               & GREEK SMALL LETTER PHI              & 03C6\\
-Pi                 & GREEK CAPITAL LETTER PI             & 03A0\\
-pi                 & GREEK SMALL LETTER PI               & 03C0\\
-piv                & GREEK PI SYMBOL                     & 03D6\\
-Psi                & GREEK CAPITAL LETTER PSI            & 03A8\\
-psi                & GREEK SMALL LETTER PSI              & 03C8\\
-rho                & GREEK SMALL LETTER RHO              & 03C1\\
-rhov               & GREEK RHO SYMBOL                    & 03F1\\
-Sigma              & GREEK CAPITAL LETTER SIGMA          & 03A3\\
-sigma              & GREEK SMALL LETTER SIGMA            & 03C3\\
-sigmav             & GREEK SMALL LETTER FINAL SIGMA      & 03C2\\
-tau                & GREEK SMALL LETTER TAU              & 03C4\\
-Theta              & GREEK CAPITAL LETTER THETA          & 0398\\
-thetas             & GREEK SMALL LETTER THETA            & 03B8\\
-thetav             & GREEK THETA SYMBOL                  & 03D1\\
-Upsi               & GREEK UPSILON WITH HOOK SYMBOL      & 03D2\\
-upsi               & GREEK SMALL LETTER UPSILON          & 03C5\\
-Xi                 & GREEK CAPITAL LETTER XI             & 039E\\
-xi                 & GREEK SMALL LETTER XI               & 03BE\\
-zeta               & GREEK SMALL LETTER ZETA             & 03B6\\
-\end{supertabular}
-\end{document}
-%</test-supertabular.tex>
-%<*test-tabular.tex>
-\documentclass{article}
-\usepackage{bidi}
-\title{Testing \LaTeX's Default Tabular in \textsf{RTL} and \textsf{LTR}}
-\author{Vafa Khalighi}
-\newcommand{\rb}[1]{\raisebox{1.5ex}[0mm]{#1}}
-\begin{document}
-\maketitle
-In this document we test \LaTeX's default tabular in \textsf{RTL} and \textsf{LTR}.
-\section{LTR}
-\begin{center}\small
-\begin{tabular}{|l||c|l|c|l|c|l|} 
-\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}
-&& Teacher && Teacher && Teacher \\ \cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Day} & \rb{Subj.} & Room & \rb{Subj.} & Room & \rb{Subj.} & Room\\ 
-   \hline\hline
-&& Dr.~Smith && Ms.~Clark && Mr.~Mills\\
-\cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Mon.} & \rb{UNIX} & Comp. Ctr & \rb{Fortran} & Hall A 
-  & \rb{Math.} & Hall A \\ \hline 
-&& Miss Baker && Ms.~Clark && Mr.~Mill\\
-\cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Tues.} & \rb{\LaTeX} & Conf.~Room & \rb{Fortran} & Conf~Room
-  & \rb{Math.} & Hall A \\ \hline
-&& Dr.~Smith && Dr.~Jones && Dr.~Jones \\
-\cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Wed.} & \rb{UNIX} & Comp. Ctr & \rb{C} & Hall A
-  & \rb{ComSci.} & Hall A \\ \hline
-&& Miss Baker && Ms. Clark & \multicolumn{2}{c|}{} \\
-\cline{3-3}\cline{5-5}
-\rb{Fri.} & \rb{\LaTeX} & Conf.~Room & \rb{C++} & Conf.~Room 
-& \multicolumn{2}{c|}{\rb{canceled}}\\ \hline
-\end{tabular}\end{center}
-\section{RTL}
-
-\setRTL
-\begin{center}\small
-\begin{tabular}{|l||c|l|c|l|c|l|} 
-\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}
-&& Teacher && Teacher && Teacher \\ \cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Day} & \rb{Subj.} & Room & \rb{Subj.} & Room & \rb{Subj.} & Room\\ 
-   \hline\hline
-&& Dr.~Smith && Ms.~Clark && Mr.~Mills\\
-\cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Mon.} & \rb{UNIX} & Comp. Ctr & \rb{Fortran} & Hall A 
-  & \rb{Math.} & Hall A \\ \hline 
-&& Miss Baker && Ms.~Clark && Mr.~Mill\\
-\cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Tues.} & \rb{\LaTeX} & Conf.~Room & \rb{Fortran} & Conf~Room
-  & \rb{Math.} & Hall A \\ \hline
-&& Dr.~Smith && Dr.~Jones && Dr.~Jones \\
-\cline{3-3}\cline{5-5}\cline{7-7}
-\rb{Wed.} & \rb{UNIX} & Comp. Ctr & \rb{C} & Hall A
-  & \rb{ComSci.} & Hall A \\ \hline
-&& Miss Baker && Ms. Clark & \multicolumn{2}{c|}{} \\
-\cline{3-3}\cline{5-5}
-\rb{Fri.} & \rb{\LaTeX} & Conf.~Room & \rb{C++} & Conf.~Room 
-& \multicolumn{2}{c|}{\rb{canceled}}\\ \hline
-\end{tabular}\end{center}
-\end{document}
-%</test-tabular.tex>
-%<*test-tabularx.tex>
-\documentclass{article}
-\usepackage{tabularx}
-\usepackage{bidi}
-\title{Testing \textsf{tabularx} Package in RTL and LTR}
-\author{Vafa Khalighi}
-\begin{document}
-\maketitle
-\section{LTR}
-\begin{tabularx}{\linewidth}{|l|p{1.25cm}|p{1.5cm}|X|}\hline
-\multicolumn{1}{|c|}{\textbf{Animal}}
-  & \textbf{Hair Colour}
-  & \multicolumn{2}{c|}{\textbf{Favourite foods}} \\\hline\hline
-Elephant & Gray & Peanuts
-  & Unshelled, prepared in Sea Salt, and warmed over hot stone grill \\\cline{3-4}
-  &  & Cabbage and Greens
-  & Sun dried until lightly browned (2-3 days minimum); 
-    seasoned with Hyperchem super feed \\\cline{4-4}
-  & & & Boiled to British standard \\\hline\hline
-Lion & Yellow & Elephants & Tartare \\\cline{4-4}
-& & & Must be served warm, with no trace of 
-  buckshot. Gaiminess considered desireable. \\\hline
-\end{tabularx} 
-\section{RTL}
-
-\setRTL
-\begin{tabularx}{\linewidth}{|l|p{1.25cm}|p{1.5cm}|X|}\hline
-\multicolumn{1}{|c|}{\textbf{Animal}}
-  & \textbf{Hair Colour}
-  & \multicolumn{2}{c|}{\textbf{Favourite foods}} \\\hline\hline
-Elephant & Gray & Peanuts
-  & Unshelled, prepared in Sea Salt, and warmed over hot stone grill \\\cline{3-4}
-  &  & Cabbage and Greens
-  & Sun dried until lightly browned (2-3 days minimum); 
-    seasoned with Hyperchem super feed \\\cline{4-4}
-  & & & Boiled to British standard \\\hline\hline
-Lion & Yellow & Elephants & Tartare \\\cline{4-4}
-& & & Must be served warm, with no trace of 
-  buckshot. Gaiminess considered desireable. \\\hline
-\end{tabularx} 
-\end{document}
-%</test-tabularx.tex>
-%<*test-tabulary.tex>
-\documentclass{article}
-\usepackage{tabulary}
-\setlength\tymin{10pt}
-\setlength\tymax{\maxdimen}
-\usepackage{bidi}
-\title{Testing \textsf{tabulary} package in RTL and LTR}
-\author{Vafa Khalighi}
-\begin{document}
-\maketitle
-\section{LTR}
-\begin{tabulary}{200pt}{|C|C|C|C|}
- a & b b b b &
- c c c c c c c c c c c c c c c c c c &
- d d d d d d d d d d d d d d d d d d
-\empty
- d d d d d d d d d d d d d d
- d d d d d d d d d d d d d d d d d d d d d d d d d d d d d d d d
- \end{tabulary}
-\section{RTL}
-
-\setRTL
-\begin{tabulary}{200pt}{|C|C|C|C|}
- a & b b b b &
- c c c c c c c c c c c c c c c c c c &
- d d d d d d d d d d d d d d d d d d
-\empty
- d d d d d d d d d d d d d d
- d d d d d d d d d d d d d d d d d d d d d d d d d d d d d d d d
- \end{tabulary}
-\end{document}
-%</test-tabulary.tex>
-%<*test1-wrapfig.tex>
-\documentclass{article}
-\usepackage{wrapfig}
-\usepackage{bidi}
-\newcommand\sample{Some text for our page
-  that might get reused over and over again. }
-\begin{document}
-\section{LTR}
-The starting place for the wrapfigure
-environment was manually determined in
-the current ex-
-
-\begin{wrapfigure}[7]{r}[0.2\width]{0pt}
-  \centering
-  \fbox{This is ``wrapfigure''.}
-  \caption{An example of the
-    \texttt{wrapfigure} environment}
-\end{wrapfigure}
-sample by first setting the text without
-the figure to find the linebreaks.
-
-\sample \sample \sample\sample \sample \sample\sample 
-
-\section{RTL}
-
-\setRTL
-The starting place for the wrapfigure
-environment was manually determined in
-the current ex-
-
-\begin{wrapfigure}[7]{l}[0.2\width]{0pt}
-  \centering
-  \fbox{This is ``wrapfigure''.}
-  \caption{An example of the
-    \texttt{wrapfigure} environment}
-\end{wrapfigure}
-sample by first setting the text without
-the figure to find the linebreaks.
-
-\sample \sample \sample\sample \sample \sample\sample 
-\end{document}
-%</test1-wrapfig.tex>
-%<*test2-wrapfig.tex>
-\documentclass{article}
-\usepackage{wrapfig}
-\usepackage{bidi}
-\newcommand\sample{Some text for our page
-  that might get reused over and over again. }
-\begin{document}
-\section{LTR}
-\begin{wraptable}[4]{l}{4cm}
- \centering
-\fbox{This is ``wraptable''.}
- \caption{The Caption}\label{T1}
-\end{wraptable}
-
-\sample \sample Reference to Table~\ref{T1}.
-\sample
-
-\section{RTL}
-\setRTL
-
-\begin{wraptable}[4]{r}{4cm}
- \centering
-\fbox{This is ``wraptable''.}
- \caption{The Caption}\label{T2}
-\end{wraptable}
-
-\sample \sample Reference to Table~\ref{T2}.
-\sample
-\end{document}
-%</test2-wrapfig.tex>
-%<*test3-wrapfig.tex>
-\documentclass[a4paper,12pt]{article}
-
-
-\usepackage{graphicx}
-\usepackage{wrapfig}
-\usepackage{bidi}
-\begin{document}
-\section{LTR}
-\subsection*{Wrapfig test}
-
-% text from en.wikipedia.org/wiki/Gull
-
-Gulls are birds in the family Laridae. They are most closely
- related to the terns (family Sternidae), auks and skimmers, 
-and more distantly to the waders. Most gulls belong to the 
-large genus Larus.
-
-\begin{wrapfigure}{r}{0.5\textwidth}
-  \begin{center}
-    \includegraphics[width=0.48\textwidth]{gull}
-  \end{center}
-  \caption{A gull}
-\end{wrapfigure}
-
-They are in general medium to large birds, typically grey or white, 
-often with black markings on the head or wings. They have stout, 
-longish bills and webbed feet.
-
-Most gulls, particularly Larus species, are ground nesting carnivores, 
-which will take live food or scavenge opportunistically. The live food 
-often includes crabs and small fish. Apart from the kittiwakes, gulls 
-are typically coastal or inland species, rarely venturing far out to sea. 
-The large species take up to four years to attain full adult plumage, 
-but two years is typical for small gulls.
-
-Gulls---the larger species in particular---are resourceful and 
-highly intelligent birds, demonstrating complex methods of communication 
-and a highly developed social structure. Certain species (e.g. the 
-Herring Gull) have exhibited tool use behaviour. Many species of gull have 
-learned to co-exist successfully with man and have thrived in human habitats. 
-Others rely on kleptoparasitism to get their food.
-
-\newpage
-\section{RTL}
-
-\setRTL
-\subsection*{Wrapfig test}
-
-% text from en.wikipedia.org/wiki/Gull
-
-Gulls are birds in the family Laridae. They are most closely
- related to the terns (family Sternidae), auks and skimmers, 
-and more distantly to the waders. Most gulls belong to the 
-large genus Larus.
-
-\begin{wrapfigure}{l}{0.5\textwidth}
-  \begin{center}
-    \includegraphics[width=0.48\textwidth]{gull}
-  \end{center}
-  \caption{A gull}
-\end{wrapfigure}
-
-They are in general medium to large birds, typically grey or white, 
-often with black markings on the head or wings. They have stout, 
-longish bills and webbed feet.
-
-Most gulls, particularly Larus species, are ground nesting carnivores, 
-which will take live food or scavenge opportunistically. The live food 
-often includes crabs and small fish. Apart from the kittiwakes, gulls 
-are typically coastal or inland species, rarely venturing far out to sea. 
-The large species take up to four years to attain full adult plumage, 
-but two years is typical for small gulls.
-
-Gulls---the larger species in particular---are resourceful and 
-highly intelligent birds, demonstrating complex methods of communication 
-and a highly developed social structure. Certain species (e.g. the 
-Herring Gull) have exhibited tool use behaviour. Many species of gull have 
-learned to co-exist successfully with man and have thrived in human habitats. 
-Others rely on kleptoparasitism to get their food.
-\end{document}
-%</test3-wrapfig.tex>
-% \fi
-% 
-% \typeout{*************************************************************}
-% \typeout{*}
-% \typeout{* To finish the installation you have to move the following}
-% \typeout{* file into a directory searched by TeX:}
-% \typeout{*}
-% \typeout{* \space\space\space all *.cls, *.sty and *.def  files}
-% \typeout{*}
-% \typeout{*************************************************************}
-\endinput
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsart-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsart-bidi.def
index fa6ebca6530..4eaa7ac72ed 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsart-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsart-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `amsart-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `amsart-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{amsart-bidi.def}[2010/03/01 v0.3 adaptations for amsart class]
 \def\@tocline#1#2#3#4#5#6#7{\relax
   \ifnum #1>\c@tocdepth % then omit
   \else
@@ -35,7 +32,7 @@
 \renewcommand\thesubparagraph  {\theparagraph\@SepMark\arabic{subparagraph}}
 \def\part{\@startsection{part}{0}%
   \z@{\linespacing\@plus\linespacing}{.5\linespacing}%
-  {\normalfont\bfseries\raggedleft}}
+  {\normalfont\bfseries\if@RTL\raggedleft\else\raggedright\fi}}
 \renewenvironment{thebibliography}[1]{%
   \@bibtitlestyle
   \normalfont\bibliofont\labelsep .5em\relax
@@ -50,8 +47,56 @@
   \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
   \endlist
 }
+\def\right@footnote{%
+  \hbox to \columnwidth
+  {\beginR \vbox{\kern-.4\p@
+        \hrule\@width 5pc\kern11\p@\kern-\footnotesep}\hfil\endR}}
+\def\left@footnote{\kern-.4\p@
+        \hrule\@width 5pc\kern11\p@\kern-\footnotesep}
+\long\def\@footnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces#1\unskip\strut\par}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
+\long\def\@RTLfootnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\@RTLtrue\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
+\long\def\@LTRfootnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\@RTLfalse\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsbook-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsbook-bidi.def
index f0ad9f886b0..04bbebd7966 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsbook-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsbook-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `amsbook-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `amsbook-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{amsbook-bidi.def}[2010/03/01 v0.3 adaptations for amsbook class]
 \def\@tocline#1#2#3#4#5#6#7{\relax
   \ifnum #1>\c@tocdepth % then omit
   \else
@@ -60,8 +57,56 @@
 \def\@idxitem{\par\hangindent -2em}
 \def\subitem{\par\hangindent -2em\hspace*{1em}}
 \def\subsubitem{\par\hangindent -3em\hspace*{2em}}
+\def\right@footnote{%
+  \hbox to \columnwidth
+  {\beginR \vbox{\kern-.4\p@
+        \hrule\@width 5pc\kern11\p@\kern-\footnotesep}\hfil\endR}}
+\def\left@footnote{\kern-.4\p@
+        \hrule\@width 5pc\kern11\p@\kern-\footnotesep}
+\long\def\@footnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces#1\unskip\strut\par}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
+\long\def\@RTLfootnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\@RTLtrue\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
+\long\def\@LTRfootnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\@RTLfalse\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsmath-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsmath-bidi.def
new file mode 100644
index 00000000000..e148fc0fc4d
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsmath-bidi.def
@@ -0,0 +1,50 @@
+%%
+%% This is file `amsmath-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{amsmath-bidi.def}[2010/03/01 v0.2 adaptations for amsmath package]
+\renewenvironment{equation}{%
+  \incr@eqnum
+  \mathdisplay@push
+  \st@rredfalse \global\@eqnswtrue
+  \beginL\mathdisplay{equation}%
+}{%
+  \endmathdisplay{equation}\endL%
+  \mathdisplay@pop
+  \ignorespacesafterend
+}
+
+\renewcommand{\numberwithin}[3][\arabic]{%
+  \@ifundefined{c@#2}{\@nocounterr{#2}}{%
+    \@ifundefined{c@#3}{\@nocnterr{#3}}{%
+      \@addtoreset{#2}{#3}%
+      \@xp\xdef\csname the#2\endcsname{%
+        \@xp\@nx\csname the#3\endcsname \@SepMark\@nx#1{#2}}}}%
+}
+\def\tagform@#1{\maketag@@@{\if@RTL\beginR\fi(\ignorespaces#1\unskip\@@italiccorr)\if@RTL\endR\fi}}
+\renewcommand{\eqref}[1]{\beginL\textup{\tagform@{\ref{#1}}}\endL}
+\let\@@text=\text
+\def\text#1{\@@text{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
+\DeclareRobustCommand{\[}{\begin{equation*}}
+\DeclareRobustCommand{\]}{\end{equation*}}
+%% 
+%% 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 `amsmath-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsthm-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsthm-bidi.def
index a0ed8577aef..a51a758c584 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsthm-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsthm-bidi.def
@@ -1,20 +1,17 @@
 %%
 %% This is file `amsthm-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `amsthm-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{amsthm-bidi.def}[2010/03/01 v0.1 adaptations for amsthm package]
 \def\@thmcountersep{\@SepMark}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/array-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/array-bidi.def
index 9f2fa8a1193..cf1986e1aaa 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/array-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/array-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `array-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `array-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{array-bidi.def}[2010/03/01 v0.1 adaptations for array package]
 \def\@testpach{\@chclass
  \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
   \ifnum \@lastchclass=7 5 \else
@@ -95,7 +92,7 @@
    \let \par \@empty
 }
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/article-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/article-bidi.def
index 71a77895019..328d17fcee1 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/article-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/article-bidi.def
@@ -1,17 +1,108 @@
 %%
 %% This is file `article-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `article-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{article-bidi.def}[2010/03/01 v0.2 adaptations for standard article class]
+\if@titlepage
+  \renewcommand\maketitle{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\LARGE \@title \par}%
+    \vskip 3em%
+    {\large
+     \lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\large \@date \par}%       % Set date in \large size.
+  \end{center}\par
+  \@thanks
+  \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\else
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb@xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\def\@maketitle{%
+  \newpage
+  \null
+  \vskip 2em%
+  \begin{center}%
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+    {\LARGE \@title \par}%
+    \vskip 1.5em%
+    {\large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+    \vskip 1em%
+    {\large \@date}%
+  \end{center}%
+  \par
+  \vskip 1.5em}
+\fi
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty\@secpenalty
@@ -40,7 +131,7 @@
     \else
       \addcontentsline{toc}{part}{#1}%
     \fi
-    {\parindent \z@ \raggedleft
+    {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi
      \interlinepenalty \@M
      \normalfont
      \ifnum \c@secnumdepth >\m@ne
@@ -77,44 +168,44 @@
 \if@twoside
   \def\ps@headings{%
       \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\beginR\leftmark\endR\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
+      \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
-        \beginR##1\endR}}{}}%
+        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}{}}%
     \def\subsectionmark##1{%
       \markright {%
         \ifnum \c@secnumdepth >\@ne
-          \beginR\thesubsection\quad\endR
+          \if@RTLmain\beginR\fi\thesubsection\quad\if@RTLmain\endR\fi
         \fi
-        \beginR##1\endR}}}
+        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}
 \else
   \def\ps@headings{%
     \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
+    \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
-          \beginR\thesection\quad\endR
+          \if@RTLmain\beginR\fi\thesection\quad\if@RTLmain\endR\fi
         \fi
-        \beginR##1\endR}}}}
+        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}}
 \fi
 \def\ps@myheadings{%
     \let\@oddfoot\@empty\let\@evenfoot\@empty
-    \def\@evenhead{\sl\thepage\hfil\beginR\leftmark\endR}%
-    \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
+    \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      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/arydshln-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/arydshln-bidi.def
new file mode 100644
index 00000000000..5021c938aaf
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/arydshln-bidi.def
@@ -0,0 +1,160 @@
+%%
+%% This is file `arydshln-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{arydshln-bidi.def}[2010/03/01 v0.1 adaptations for arydshln package]
+\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
+\let\adl@array\@array
+\def\@array{\adl@everyvbox\everyvbox
+        \everyvbox{\adl@arrayinit \the\adl@everyvbox \everyvbox\adl@everyvbox}%
+        \ifadl@inactive \adl@inactivate \else \adl@activate \fi
+        \let\adl@noalign\noalign
+        \adl@array}
+\ifadl@usingarypkg
+\def\@testpach{\@chclass
+ \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
+  \ifnum \@lastchclass=7 5 \else
+   \ifnum \@lastchclass=8 \tw@ \else
+    \ifnum \@lastchclass=9 \thr@@
+   \else \z@
+   \ifnum \@lastchclass = 10 \else
+   \edef\@nextchar{\expandafter\string\@nextchar}%
+   \@chnum
+   \if \@nextchar c\z@ \else
+    \if \@nextchar \if@RTLtab r\else l\fi\@ne \else
+     \if \@nextchar \if@RTLtab l\else r\fi\tw@ \else
+   \z@ \@chclass
+   \if\@nextchar |\@ne \let\@arrayrule\adl@arrayrule \else
+   \if\@nextchar :\@ne \let\@arrayrule\adl@arraydashrule \else
+   \if\@nextchar ;\@ne \let\@arrayrule\adl@argarraydashrule \else
+    \if \@nextchar !6 \else
+     \if \@nextchar @7 \else
+      \if \@nextchar <8 \else
+       \if \@nextchar >9 \else
+  10
+  \@chnum
+  \if \@nextchar m\thr@@\else
+   \if \@nextchar p4 \else
+    \if \@nextchar b5 \else
+   \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi \fi \fi
+   \fi \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
+
+\def\@classz{\@classx
+   \@tempcnta \count@
+   \prepnext@tok
+   \@addtopreamble{\ifcase \@chnum
+      \hfil
+      \adl@putlrc{\d@llarbegin \insert@column \d@llarend}\hfil \or
+      \hskip1sp\adl@putlrc{\d@llarbegin \insert@column \d@llarend}\hfil \or
+      \hfil\hskip1sp\adl@putlrc{\d@llarbegin \insert@column \d@llarend}\or
+   \setbox\adl@box\hbox \adl@startmbox{\@nextchar}\insert@column
+        \adl@endmbox\or
+   \setbox\adl@box\vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
+   \setbox\adl@box\vbox \@startpbox{\@nextchar}\insert@column \@endpbox
+  \fi}\prepnext@tok}
+\def\adl@class@start{4}
+\def\adl@class@iiiorvii{7}
+
+\else
+\def\@testpach#1{\@chclass \ifnum \@lastchclass=\tw@ 4\relax \else
+        \ifnum \@lastchclass=\thr@@ 5\relax \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 \let\@arrayrule\adl@arrayrule \else
+                    \if #1:\@ne \let\@arrayrule\adl@arraydashrule \else
+                    \if #1;\@ne \let\@arrayrule\adl@argarraydashrule \else
+                    \if #1@\tw@ \else
+                    \if #1p\thr@@ \else \z@ \@preamerr 0\fi
+        \fi  \fi  \fi  \fi  \fi  \fi  \fi  \fi  \fi}
+
+\def\@arrayclassz{\ifcase \@lastchclass \@acolampacol \or \@ampacol \or
+                \or \or \@addamp \or
+                \@acolampacol \or \@firstampfalse \@acol \fi
+        \edef\@preamble{\@preamble
+                \ifcase \@chnum
+                    \hfil\adl@putlrc{$\relax\@sharp$}\hfil
+                \or \adl@putlrc{$\relax\@sharp$}\hfil
+                \or \hfil\adl@putlrc{$\relax\@sharp$}\fi}}
+\def\@tabclassz{\ifcase \@lastchclass \@acolampacol \or \@ampacol \or
+                \or \or \@addamp \or
+                \@acolampacol \or \@firstampfalse \@acol \fi
+        \edef\@preamble{\@preamble
+        \ifcase \@chnum
+                    \hfil\adl@putlrc{\@sharp\unskip}\hfil
+                \or \adl@putlrc{\@sharp\unskip}\hfil
+                \or \hfil\hskip\z@ \adl@putlrc{\@sharp\unskip}\fi}}
+\def\adl@class@start{6}
+\def\adl@class@iiiorvii{3}
+\fi
+\@ifpackageloaded{colortbl}{%
+\def\adl@inactivate{\adl@org@inactivate \let\CT@setup\adl@CT@setup}
+\def\adl@activate{\adl@org@activate \let\CT@setup\adl@act@CT@setup
+        \let\@endpbox\adl@org@endpbox}
+\let\adl@CT@setup\CT@setup
+\def\CT@setup{\adl@CT@setup
+        \@tempdima\ht\z@ \advance\@tempdima\minrowclearance
+        \ifdim\adl@height<\@tempdima \global\adl@height\@tempdima \fi
+        \ifdim\adl@depth<\dp\z@ \global\adl@depth\dp\z@\fi}
+\let\adl@act@CT@setup\CT@setup
+\def\@classz{\@classx
+        \@tempcnta\count@ \prepnext@tok
+        \expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil
+        \expandafter\adl@extract@arc\the\toks\@tempcnta\arrayrulecolor!\@nil
+        \expandafter\adl@extract@drsc
+                \the\toks\@tempcnta\doublerulesepcolor!\@nil
+        \expandafter\adl@extract@dgc\the\toks\@tempcnta\dashgapcolor!\@nil
+        \@addtopreamble{\if@RTL\beginL\fi%
+                \setbox\z@\hbox\bgroup\bgroup\if@RTL\beginR\fi
+                \ifcase \@chnum
+                        \hskip\stretch{.5}\kern\z@
+                        \d@llarbegin
+                        \insert@column
+                        \d@llarend\hskip\stretch{.5}%
+                \or \d@llarbegin \insert@column \d@llarend \hfill
+                \or \hfill \kern\z@ \d@llarbegin \insert@column \d@llarend
+                \or  $\vcenter
+                        \@startpbox{\@nextchar}\insert@column \@endpbox $%
+                \or  \vtop \@startpbox{\@nextchar}\insert@column \@endpbox
+                \or  \vbox \@startpbox{\@nextchar}\insert@column \@endpbox
+                \fi
+                \if@RTL\endR\fi\egroup\egroup
+                \begingroup
+                        \CT@setup
+                        \CT@column@color
+                        \CT@row@color
+                        \CT@cell@color
+                        \CT@do@color
+                \endgroup
+                \@tempdima\ht\z@
+                \advance\@tempdima\minrowclearance
+                \vrule\@height\@tempdima\@width\z@
+                \unhbox\z@\if@RTL\endL\fi}%
+        \prepnext@tok}
+\let\adl@act@classz\@classz
+\let\adl@org@classz\@classz
+}{}
+%% 
+%% 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 `arydshln-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerthemebidiJLTree.sty b/Master/texmf-dist/tex/xelatex/bidi/beamerthemebidiJLTree.sty
deleted file mode 100644
index 010f8255575..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/beamerthemebidiJLTree.sty
+++ /dev/null
@@ -1,133 +0,0 @@
-%%
-%% This is file `beamerthemebidiJLTree.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `beamerthemebidiJLTree.sty')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
-%% 
-%%   License information appended.
-%% 
-%% 
-\ProvidesPackage{beamerthemebidiJLTree}
-
-\newif\ifbeamer@tree@showhooks
-\beamer@tree@showhookstrue
-
-\DeclareOptionBeamer{hooks}[true]{\csname beamer@tree@showhooks#1\endcsname}
-
-\ProcessOptionsBeamer
-\mode
-<presentation>
-
-\setbeamertemplate{navigation symbols}{}
-\usecolortheme{rose}
-\useinnertheme[shadow=true]{rounded}% les block
-
-\defbeamertemplate*{footline}{bidiJLTree theme}
-{
-  \begin{beamercolorbox}[colsep=1.5pt]{upper separation line foot}
-  \end{beamercolorbox}
-  \hbox{%
-    \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.25ex,dp=1ex,left]{date in head/foot}%
-      \usebeamerfont{date in head/foot}
-      \insertframenumber{} / \inserttotalframenumber\hspace*{2ex}
-    \end{beamercolorbox}%
-    \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.25ex,dp=1ex,right]{title in head/foot}%
-      \usebeamerfont{title in head/foot}\beginR\hspace*{2ex}\insertauthor \hspace*{1ex} (\insertshortinstitute) \hspace*{2ex} \insertdate\endR
-    \end{beamercolorbox}}%
-}
-
-\defbeamertemplate*{sidebar right}{bidiJLTree theme}{}
-
-\usesectionheadtemplate
-{\hfil\insertsectionhead}
-{\hfill\color{fg!50!bg}\insertsectionhead}
-
-\usesubsectionheadtemplate
-{\hfil\insertsubsectionhead}
-{\hfill\color{fg!50!bg}\insertsubsectionhead}
-
-\defbeamertemplate*{headline}{bidiJLTree theme}
-{%
-  \leavevmode%
-  \begin{beamercolorbox}[wd=\paperwidth,colsep=1.5pt]{upper separation line head}
-  \end{beamercolorbox}
-  \@tempdimb=3.625ex% 2.4375ex%
-  \multiply\@tempdimb by\beamer@sectionmax%
-%%  \advance\@tempdimb by 1.125ex%
-  \advance\@tempdimb by -1.125ex%
-  \ifdim\@tempdimb<10.9ex% 3*(2.5+1.125)
-     \@tempdimb=10.9ex%
-  \fi
-  \begin{beamercolorbox}[wd=.45\paperwidth, ht=\@tempdimb]{left block}%
-    \usebeamerfont{section in head/foot}%
-    \vbox to\@tempdimb{\vfill\insertsectionnavigation{.45\paperwidth}\vfill}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=1.125ex,ht=\@tempdimb,dp=1.125ex]{middle separation line head}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=.44\paperwidth]{middle block}%
-    \vbox to\@tempdimb{\vfill%
-    \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
-      leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}%
-      \usebeamerfont{title in head/foot}\insertshorttitle
-    \end{beamercolorbox}
-    \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
-      leftskip=.3cm,rightskip=.3cm plus1fil]{section in head/foot}
-      \usebeamerfont{section in head/foot}%
-      \ifbeamer@tree@showhooks
-      \setbox\beamer@tempbox=\hbox{\insertsectionhead}%
-      \ifdim\wd\beamer@tempbox>1pt%
-      \hskip2pt\raise1.9pt\hbox{\vrule width0.4pt height1.875ex\vrule width 5pt height0.4pt}%
-      \hskip1pt%
-      \fi%
-      \else%
-      \hskip6pt%
-      \fi%
-      \insertsectionhead
-    \end{beamercolorbox}
-    \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
-      leftskip=.3cm,rightskip=.3cm plus1fil]{subsection in head/foot}
-      \usebeamerfont{subsection in head/foot}%
-      \ifbeamer@tree@showhooks
-      \setbox\beamer@tempbox=\hbox{\insertsubsectionhead}%
-      \ifdim\wd\beamer@tempbox>1pt%
-      \hskip9.4pt\raise1.9pt\hbox{\vrule width0.4pt height1.875ex\vrule width 5pt height0.4pt}%
-      \hskip1pt%
-      \fi%
-      \else%
-      \hskip12pt%
-      \fi%
-      \insertsubsectionhead
-    \end{beamercolorbox}%
-    \vfill}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=.1\paperwidth,ht=\@tempdimb,right]{right block}%
-    \vbox to\@tempdimb{\vfill\insertlogo\vfill}
-  \end{beamercolorbox}
-  \vfill
-  \begin{beamercolorbox}[wd=\paperwidth,colsep=1.5pt]{lower separation line head}
-  \end{beamercolorbox}
-}
-\setbeamercolor{separation line}{use=structure,bg=structure.fg!50!bg}
-
-\mode
-<all>
-%% 
-%% Copyright © 2009      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 `beamerthemebidiJLTree.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
index c453366df83..89f18c2000e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
@@ -1,28 +1,42 @@
 %%
 %% This is file `bidi.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidi.sty')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2009/08/09}
-\def\bidiversion{v1.0.3}
-\def\bidirevision{revision 82}
+\def\bididate{2010/03/01}
+\def\bidiversion{v1.0.4}
+\def\bidirevision{revision 202}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidirevision>
 Bidirectional typesetting in XeLaTeX]
 \AtBeginDocument{\special{pdf: docinfo <<
-/Creator (Bidi \bidiversion\space <\bidirevision> Copyright © 2009 Vafa Khalighi)
+/Creator (Bidi \bidiversion\space <\bidirevision> Copyright © 2009-2010 Vafa Khalighi)
          >>}}
+\edef\bidiinfo{%
+bidi package (Support for bidirectional typesetting with XeLaTeX)^^J
+Description: A convenient interface for typesetting bidirectional^^J
+texts with XeLaTeX.  The package includes adaptations for use^^J
+with many other commonly-used packages.^^J
+Copyright © 2009-2010 Vafa Khalighi^^J
+\bidiversion, <\bidirevision>, \bididate^^J
+License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J
+Home: http://bidi.berlios.de^^J
+Location on CTAN: /macros/xetex/latex/bidi}
+\typeout{\bidiinfo}
+\edef\bidi@everyjob{\the\everyjob}
+\everyjob{\bidi@everyjob\typeout{\bidiinfo}}
+\def\@tagsextension{clo}
+\def\@definitionfileextension{def}
+\def\@iftagsloaded{\@ifl@aded\@tagsextension}
+\def\@ifdefinitionfileloaded{\@ifl@aded\@definitionfileextension}
 \newif\if@RTLmain
 \newif\if@RTL
+\newif\if@Latin
 \newif\if@RTLtab
 \newif\if@sentdir
 \newif\if@RTL@footnote
@@ -39,20 +53,6 @@ Bidirectional typesetting in XeLaTeX]
 \let\@tab@rltrue=\@RTLtabtrue
 \let\@tab@rlfalse=\@RTLtabfalse
 \@RTLmainfalse
-\RequirePackage{amsmath}
-\newcommand\bidi@isloaded[2][]{
-  \expandafter\ifx\csname if@bidi@#2loaded@\endcsname\relax
-    \expandafter\newif\csname if@bidi@#2loaded@\endcsname
-  \fi
-  \@ifpackageloaded{#2}
-    {\csname @bidi@#2loaded@true\endcsname #1}
-    {\csname @bidi@#2loaded@false\endcsname}}
-\bidi@isloaded{xunicode}
-\AtBeginDocument{
-  \if@bidi@xunicodeloaded@
-    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xunicode before bidi package. Please load package xunicode after bidi package, and then try to run xelatex on your document again}{}]{xunicode}
-  \fi%
-}
 \ifx\TeXXeTstate\undefined\else%
    \TeXXeTstate=1
 \fi
@@ -123,12 +123,13 @@ Bidirectional typesetting in XeLaTeX]
 \let\setRL=\setRTL
 \let\setLR=\setLTR
 \let\unsetRL=\setLTR
-\DeclareOption{RTLdocument}{\@RTLtrue\@RTL@footnotetrue\RTLdblcol\autofootnoterule}
-\DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\RTLdblcol\autofootnoterule}
+\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
@@ -183,8 +184,8 @@ Bidirectional typesetting in XeLaTeX]
 \def\narrower{%
   \advance\if@RTL\rightskip\else\leftskip\fi\parindent
   \advance\if@RTL\leftskip\else\rightskip\fi\parindent}
-\def\leftmark{\beginR\expandafter\@leftmark\botmark\@empty\@empty\endR}
-\def\rightmark{\beginR\expandafter\@rightmark\firstmark\@empty\@empty\endR}
+\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}%
@@ -282,39 +283,141 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
        \@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}}
-\long\def\@makecaption#1#2{%
- \vskip 10pt%
- \setbox\@tempboxa\hbox{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize \if@RTL\beginR\fi#1: #2\par%
- \else \hbox
-to\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil%
-\if@RTL\endR\fi}%
- \fi}
-\renewenvironment{equation}{%
-  \incr@eqnum
-  \mathdisplay@push
-  \st@rredfalse \global\@eqnswtrue
-  \beginL\mathdisplay{equation}%
-}{%
-  \endmathdisplay{equation}\endL%
-  \mathdisplay@pop
-  \ignorespacesafterend
-}
-\renewcommand{\numberwithin}[3][\arabic]{%
-  \@ifundefined{c@#2}{\@nocounterr{#2}}{%
-    \@ifundefined{c@#3}{\@nocnterr{#3}}{%
-      \@addtoreset{#2}{#3}%
-      \@xp\xdef\csname the#2\endcsname{%
-        \@xp\@nx\csname the#3\endcsname \@SepMark\@nx#1{#2}}}}%
+\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
 }
-\def\tagform@#1{\maketag@@@{\if@RTL)\else(\fi\ignorespaces\text{#1}\unskip\@@italiccorr\if@RTL(\else)\fi}}
-\renewcommand{\eqref}[1]{\beginL\textup{\tagform@{\ref{#1}}}\endL}
-\let\@@text=\text
-\def\text#1{\@@text{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
+\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-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}}{}
@@ -328,6 +431,8 @@ to\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil%
 \@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}}{}
@@ -335,9 +440,10 @@ to\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil%
 \@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}{\input{report-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}}{}
@@ -345,14 +451,13 @@ to\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil%
 \@ifclassloaded{amsbook}{\input{amsbook-bidi.def}}{}
 \@ifclassloaded{bookest}{\input{bookest-bidi.def}}{}
 \@ifclassloaded{extbook}{\input{extbook-bidi.def}}{}
-\@ifclassloaded{book}{\input{book-bidi.def}}{}
-\@ifclassloaded{bidibeamer}{\input{bidibeamer-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
 
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty
index c8eb1450449..3501e5d9480 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty
@@ -1,13 +1,9 @@
 %%
 %% This is file `bidi2in1.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidi2in1.sty')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -70,7 +66,7 @@
 }
 
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidibeamer-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/bidibeamer-bidi.def
deleted file mode 100644
index decc751e62c..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/bidibeamer-bidi.def
+++ /dev/null
@@ -1,395 +0,0 @@
-%%
-%% This is file `bidibeamer-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidibeamer-bidi.def')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
-%% 
-%%   License information appended.
-%% 
-%% 
-\raggedleft
-\def\LTR{\bgroup\par\raggedright\@RTLfalse}
-\def\endLTR{\par\egroup}
-\def\RTL{\bgroup\par\raggedleft\@RTLtrue}
-\def\endRTL{\par\egroup}
-\long\def\beamer@@frametitle[#1]#2{%
-  \beamer@ifempty{#2}{}{%
-    \gdef\insertframetitle{\raggedleft\rightskip=2em{\beginR#2\endR\ifnum\beamer@autobreakcount>0\relax{}\space\usebeamertemplate*{frametitle continuation}\fi}}%
-  \gdef\beamer@frametitle{\beginR#2\endR}%
-  \gdef\beamer@shortframetitle{\beginR#1\endR}%
-}%
-}
-\def\@thm#1#2#3{%
-  \ifhmode\unskip\unskip\par\fi
-  \normalfont
-  \let\thmheadnl\relax
-  \let\thm@swap\@gobble
-  \thm@headpunct{.}% add period after heading
-  \thm@space@setup
-  #1% style overrides
-  \def\inserttheoremname{#3}
-  \def\inserttheorempunctuation{\the\thm@headpunct}
-  \def\@tempa{#2}%
-  \ifx\@empty\@tempa
-    \def\inserttheoremnumber{}
-  \else
-    \refstepcounter{#2}%
-    \expandafter\def\expandafter\inserttheoremnumber\expandafter{ \csname the#2\endcsname}
-  \fi
-  \beamer@begintheorem%
-\raggedleft\@RTLtrue
-}
- \ifbeamer@countsect
-      \newtheorem{biditheorem}{\raggedleft \biditheoremname}[section]
-    \else
-      \newtheorem{biditheorem}{\raggedleft \biditheoremname}
-    \fi
-    \newtheorem{bidicorollary}[theorem]{\raggedleft \bidicorollaryname}
-    \newtheorem{bidifact}[theorem]{\raggedleft \bidifactname}
-    \newtheorem{bidilemma}[theorem]{\raggedleft \bidilemmaname}
-    \newtheorem{bidiproblem}[theorem]{\raggedleft \bidiproblemname}
-    \newtheorem{bidisolution}[theorem]{\raggedleft \bidisolutionname}
-\theoremstyle{definition}
-    \newtheorem{bididefinition}[theorem]{\raggedleft \bididefinitionname}
-    \newtheorem{bididefinitions}[theorem]{\raggedleft \bididefinitionsname}
-\theoremstyle{example}
-    \newtheorem{bidiexample}[theorem]{\raggedleft \bidiexamplename}
-    \newtheorem{bidiexamples}[theorem]{\raggedleft \bidiexamplesname}
-\newenvironment<>{bidiproof}[1][\raggedleft \bidiproofname]{%
-  \par
-  \def\insertproofname{#1\@addpunct{}}%
-  \pushQED{\qed}
-  \usebeamertemplate{proof begin}\@RTLtrue#2}
-{\popQED\usebeamertemplate{proof end}}
- \newenvironment<>{bidiblock}[1]{%
-    \begin{actionenv}#2%
-      \def\insertblocktitle{\raggedleft#1}%
-      \par%
-      \usebeamertemplate{block begin}\raggedleft\@RTLtrue}
-    {\par%
-      \usebeamertemplate{block end}%
-    \end{actionenv}}
-  \newenvironment<>{bidialertblock}[1]{%
-    \begin{actionenv}#2%
-      \def\insertblocktitle{\raggedleft#1}%
-      \par%
-      \mode<presentation>{%\usebeamerfont{block}%
-        \setbeamercolor{local structure}{parent=alerted text}}%
-      \usebeamertemplate{block alerted begin}\raggedleft\@RTLtrue}
-    {\par%
-      \usebeamertemplate{block alerted end}%
-    \end{actionenv}}
-  \newenvironment<>{bidiexampleblock}[1]{%
-    \begin{actionenv}#2%
-      \def\insertblocktitle{\raggedleft#1}%
-      \par%
-      \mode<presentation>{%\usebeamerfont{block}%
-        \setbeamercolor{local structure}{parent=example text}}%
-      \usebeamertemplate{block example begin}\raggedleft\@RTLtrue}
-    {\par%
-      \usebeamertemplate{block example end}%
-    \end{actionenv}}
-\def\@listi{\if@RTL\rightmargin\leftmargini\else\leftmargin\leftmargini\fi
-            \topsep 3\p@ \@plus2\p@ \@minus2.5\p@
-            \parsep 0\p@
-            \itemsep3\p@ \@plus2\p@ \@minus3\p@}
-\let\@listI\@listi
-\def\@listii{\if@RTL\rightmargin\leftmarginii\else\leftmargin\leftmarginii\fi
-              \topsep    2\p@ \@plus1\p@ \@minus2\p@
-              \parsep    0\p@   \@plus\p@
-              \itemsep   \parsep}
-\def\@listiii{\if@RTL\rightmargin\leftmarginiii\else\leftmargin\leftmarginiii\fi
-              \topsep    2\p@ \@plus1\p@ \@minus2\p@
-              \parsep    0\p@   \@plus\p@
-              \itemsep   \parsep}
-\def\beamer@enum@{%
-  \beamer@computepref\@itemdepth% sets \beameritemnestingprefix
-  \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
-  \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
-  \usebeamertemplate{itemize/enumerate \beameritemnestingprefix body begin}%
-  \expandafter
-    \list
-      {\usebeamertemplate{\beamer@enumtempl}}
-      {\usecounter\@enumctr%
-        \def\makelabel##1{{\hss\llap{{%
-                \usebeamerfont*{enumerate \beameritemnestingprefix item}%
-                \usebeamercolor[fg]{enumerate \beameritemnestingprefix item}##1}}}}}%
-  \beamer@cramped%
-  \raggedleft%
-  \beamer@firstlineitemizeunskip%
-}
-\renewcommand{\itemize}[1][]{%
-  \beamer@ifempty{#1}{}{\def\beamer@defaultospec{#1}}%
-  \ifnum \@itemdepth >2\relax\@toodeep\else
-    \advance\@itemdepth\@ne
-    \beamer@computepref\@itemdepth% sets \beameritemnestingprefix
-    \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
-    \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
-    \usebeamertemplate{itemize/enumerate \beameritemnestingprefix body begin}%
-    \list
-      {\usebeamertemplate{itemize \beameritemnestingprefix item}}
-      {\def\makelabel##1{%
-          {%
-            \hss\llap{{%
-                \usebeamerfont*{itemize \beameritemnestingprefix item}%
-                \usebeamercolor[fg]{itemize \beameritemnestingprefix item}##1}}%
-          }%
-        }%
-      }
-  \fi%
-  \beamer@cramped%
-  \raggedleft%
-  \beamer@firstlineitemizeunskip%
-}
-\def\@@description{%
-  \advance\beamer@descdefault by \labelsep%
-  \list
-  {}
-  {\labelwidth\beamer@descdefault\leftmargin\beamer@descdefault\let\makelabel\beamer@descriptionitem}%
-  \beamer@cramped%
-  \raggedleft\rightskip=6em
-  \beamer@firstlineitemizeunskip%
-}
-\AtBeginDocument{\@RTLfalse}
-\renewenvironment{beamer@frameslide}{%
-  \ifbeamer@autobreak\else%
-    \ifx\beamer@againname\@empty%
-      {\let\@elt\beamer@restorecounter\beamer@overlaycounterresets}%
-    \else%
-      {\let\@elt\beamer@labelrestorecounter\beamer@overlaycounterresets}%
-    \fi%
-  \fi%
-  \global\c@beamerpauses=1\relax%
-  \expandafter\beamer@ifempty\expandafter{\beamer@framestartpage}{%
-    \refstepcounter{subsectionslide}%
-    \xdef\beamer@framestartpage{\the\c@page}% only first time
-  }{\clearpage\beamer@notesactions}% cleanup from previous slide
-  \hypersetup{pdfpagetransition=R}%
-  \hypersetup{pdfpageduration=}%
-  \xdef\beamer@frameendpage{\the\c@page}% every time
-  \beamer@setuplinks%
-  \beamer@displaybreak%
-  \global\setbox\beamer@zoombox=\box\voidb@x%
-  \def\beamer@zoomer{}%
-  \beamer@slidehaszoomfalse%
-  \gdef\insertframetitle{}%
-  \gdef\insertframesubtitle{}%
-  \gdef\beamer@frametitle{}%
-  \gdef\beamer@shortframetitle{}%
-  \gdef\beamer@framesubtitle{}%
-  \let\beamer@startcomment=\beamer@startcommentinframe%
-  % Start slide:
-  \beamer@framenotesbegin\@RTLtrue%
-    \global\setbox\beamer@framebox=\vbox\bgroup%
-    \beamer@inframetrue%
-    \let\frame=\framelatex% inside frames, use LaTeX's \frame command
-    \begin{beamer@framepauses}%
-      \ifbeamer@shrink%
-        \hsize=\beamer@shrinkfactorinv\hsize%
-        \textwidth=\beamer@shrinkfactorinv\textwidth%
-        \linewidth=\beamer@shrinkfactorinv\linewidth%
-      \fi%
-      % Insert labels if necessary:
-      \ifx\beamer@againname\@empty\else%
-        \nointerlineskip\vbox to0pt{\vss%
-        \label<\the\beamer@slideinframe>{\beamer@againname<\the\beamer@slideinframe>}%
-        \ifnum\beamer@slideinframe=1\relax%
-          \label<1>{\beamer@againname}%
-        \fi%
-        }\nointerlineskip%
-      \fi%
-      \ifx\beamer@framehypertargets\@empty\else%
-        \nointerlineskip\vbox to0pt{\vss%
-          \beamer@framehypertargets%
-          \global\let\beamer@framehypertargets\@empty%
-        }\nointerlineskip%
-      \fi%
-      \vskip-\parskip\vbox{}%
-      \beamer@initfirstlineunskip%
-      \ifbeamer@plainframe\nointerlineskip\fi%
-    \beamer@checkframetitle}%
-    {\end{beamer@framepauses}%
-  \egroup%
-  \ifx\beamer@frametitle\@empty%
-    \setbox\beamer@frametitlebox=\box\voidb@x%
-  \else%
-    \setbox\beamer@frametitlebox=\vbox{%
-      \vbox{}%
-      {\parskip0pt\usebeamertemplate***{frametitle}\vskip0.25em}%
-    }%
-  \fi%
-  \ifbeamer@plainframe%
-    \beamer@frametextheight=\paperheight%
-  \else%
-    \beamer@frametextheight=\textheight%
-  \fi%
-  \advance\beamer@frametextheight by-\ht\beamer@frametitlebox%
-  \advance\beamer@frametextheight by-\dp\beamer@frametitlebox%
-  \advance\beamer@frametextheight by-\beamer@frametopskip%
-  \ifbeamer@shrink%
-    \beamer@shrinkframebox%
-  \fi%
-  \ifx\beamer@zoomer\@empty
-    \setbox\beamer@framebox=\vbox{%
-      \nobreak\vbox{}\nobreak\par\nobreak\beamer@entrycode\nobreak%
-      \nointerlineskip\unvbox\beamer@frametitlebox%
-      \nobreak%
-      \ifbeamer@autobreak%
-        \vskip\beamer@frametopskipautobreak%
-      \else%
-        \vskip\beamer@frametopskip%
-      \fi%
-      \nobreak%
-      \nointerlineskip\box\beamer@zoombox\nointerlineskip%
-      \nobreak%
-      \ifbeamer@slidehaszoom\box\beamer@framebox\else\unvbox\beamer@framebox\fi%
-      % bottom skip is added in autobreakframebox
-    }%
-    \beamer@autobreakframebox%
-  \else%
-    \beamer@zoomer%
-  \fi%
-  \beamer@undolabels%
-  \beamer@framenotesend%
-  \box\beamer@framebox}
-\long\def\beamer@title[#1]#2{%
-  \def\inserttitle{\beginR#2\endR}%
-  \def\beamer@shorttitle{\beginR#1\endR}%
-  }
-\long\def\beamer@subtitle[#1]#2{%
-  \def\insertsubtitle{\beginR#2\endR}%
-  \def\beamer@shortsubtitle{\beginR#1\endR}%
-  }
-\long\def\beamer@date[#1]#2{%
-  \def\insertdate{\beginR#2\endR}%
-  \def\beamer@shortdate{\beginR#1\endR}%
-  }
-\long\def\beamer@author[#1]#2{%
-  \def\insertauthor{\def\inst{\beamer@insttitle}\def\and{\beamer@andtitle}\beginR#2\endR}%
-  \def\beamer@shortauthor{\beginR#1\endR}%
-  \ifbeamer@autopdfinfo%
-    \def\beamer@andstripped{}%
-    \beamer@stripands#2 \and\relax
-    {\let\inst=\@gobble\let\thanks=\@gobble\def\and{, }\hypersetup{pdfauthor={\beamer@andstripped}}}
-  \fi%
-}
-\long\def\beamer@institute[#1]#2{%
-  \def\beamer@temp{\beginR#2\endR}%
-  \ifx\beamer@temp\@empty
-    \def\insertinstitute{}
-  \else
-    \def\insertinstitute{\def\inst{\beamer@instinst}\def\and{\beamer@andinst}\beginR#2\endR}%
-  \fi
- \def\beamer@shortinstitute{\beginR#1\endR}}
-\renewenvironment{thebibliography}[1]
-{%\leavevmode\unskip%
-  \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\beamer@biblabeltemplate{\@biblabel{#1}}}%
-            \leftmargin\labelwidth
-            \advance\leftmargin\labelsep
-            \itemsep=0pt%
-            \partopsep=0pt%
-            \topsep=0pt%
-            \usecounter{enumiv}%
-            \let\p@enumiv\@empty
-            \renewcommand\theenumiv{\@arabic\c@enumiv}
-            \let\makelabel\beamer@biblabeltemplate}%
-      \sloppy\raggedleft
-      \clubpenalty10000
-      \@clubpenalty \clubpenalty
-      \widowpenalty10000%
-      \sfcode`\.\@m}
-     {\def\@noitemerr
-       {\@latex@warning{Empty `thebibliography' environment}}%
-      \ifhmode\unskip\fi\endlist}
-\long\def\beamer@@@section#1{\beamer@section[\beginR#1\endR]{#1}}
-\def\beamer@@@subsection#1{\beamer@subsection[\beginR#1\endR]{#1}}
-\def\beamer@@@subsubsection#1{\beamer@subsubsection[\beginR#1\endR]{#1}}
-\long\def\beamer@subsectionintoc#1#2#3#4#5#6{%
-  \ifnum\c@tocdepth>1%
-  \ifnum#5=\beamer@showpartnumber%
-  {
-    \beamer@saveanother%
-    \gdef\beamer@todo{}%
-    \beamer@slideinframe=#1\relax%
-    \expandafter\only\beamer@tocsections{\gdef\beamer@todo{%
-      \ifbeamer@pausesubsections\pause\fi%
-      \beamer@tempcount=#6%
-      \advance\beamer@tempcount by\beamer@sectionadjust%
-      \edef\inserttocsectionnumber{\the\beamer@tempcount}%
-      \def\inserttocsubsectionnumber{#2}%
-      \def\inserttocsubsection{\rightskip=1.5em\hyperlink{Navigation#4}{\beginR#3\endR\hfill}}%
-      \beamer@tocifnothide{\ifnum\c@section=#1\beamer@toc@oss\else\beamer@toc@ooss\fi}%
-      {%
-        \def\beamer@breakhere{\\}%
-        \beamer@tocact{\ifnum\c@section=#1\ifnum\c@subsection=#2\beamer@toc@css\else\beamer@toc@oss\fi\else\beamer@toc@ooss\fi}
-        {subsection in toc}%
-      }%
-    }}%
-    \beamer@restoreanother%
-  }
-  \beamer@todo%
-  \fi\fi%
-}
-\long\def\beamer@subsubsectionintoc#1#2#3#4#5#6#7{%
-  \ifnum\c@tocdepth>2%
-  \ifnum#1=\beamer@showpartnumber%
-  {
-    \beamer@saveanother%
-    \gdef\beamer@todo{}%
-    \beamer@slideinframe=#2\relax%
-    \expandafter\only\beamer@tocsections{\gdef\beamer@todo{%
-      \ifbeamer@pausesubsections\pause\fi%
-      \beamer@tempcount=#6%
-      \advance\beamer@tempcount by\beamer@sectionadjust%
-      \edef\inserttocsectionnumber{\the\beamer@tempcount}%
-      \def\inserttocsubsectionnumber{#3}%
-      \def\inserttocsubsubsectionnumber{#4}%
-      \def\inserttocsubsubsection{\rightskip=3em\hyperlink{Navigation#5}{\beginR#7\endR\hfill}}%
-      \beamer@tocifnothide{\ifnum\c@section=#2\beamer@toc@oss\else\beamer@toc@ooss\fi}%
-      {%
-        \def\beamer@breakhere{\\}%
-        \beamer@tocact{\ifnum\c@section=#2\ifnum\c@subsection=#3\beamer@toc@css\else\beamer@toc@oss\fi\else\beamer@toc@ooss\fi}
-        {subsubsection in toc}%
-      }%
-    }}%
-    \beamer@restoreanother%
-  }
-  \beamer@todo%
-  \fi\fi%
-}
-\long\def\beamer@makecaption#1#2{%
-  \def\insertcaptionname{\csname#1name\endcsname}%
-  \def\insertcaptionnumber{\csname the#1\endcsname}%
-  \def\insertcaption{#2}%
-  \nobreak\vskip\abovecaptionskip\nobreak
-  \sbox\@tempboxa{\usebeamertemplate**{caption}}%
-  \ifdim \wd\@tempboxa >\hsize
-    \usebeamertemplate**{caption}\par
-  \else
-    \global \@minipagefalse
-    \hb@xt@\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}%
-  \fi
-  \nobreak\vskip\belowcaptionskip\nobreak}
-\let\origin@alert=\alert
-\def\alert#1{\ifmmode\origin@alert{#1}\else\if@RTL\beginL\origin@alert{\beginR#1\endR}\endL\else\origin@alert{#1}\fi\fi}
-%% 
-%% Copyright © 2009      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 `bidibeamer-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidibeamer.cls b/Master/texmf-dist/tex/xelatex/bidi/bidibeamer.cls
deleted file mode 100644
index 3efdf50bd0f..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/bidibeamer.cls
+++ /dev/null
@@ -1,370 +0,0 @@
-%%
-%% This is file `bidibeamer.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidibeamer.cls')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
-%% 
-%%   License information appended.
-%% 
-%% 
-
-\RequirePackage{beamerbasercs}
-\def\beamer@version{3.07}
-
-\RequirePackage{beamerbasemodes}
-
-\beamer@transferifnecessary
-
-\ifx\pdfoutput\@undefined \newcount\pdfoutput \fi
-\ifx\pdfoutput\relax \newcount\pdfoutput \fi
-
-
-\newdimen\headheight    % Total height of the headline (including depth)
-\newdimen\headdp        % Depth of the headline
-\newdimen\footheight    % Height of the footline
-\newdimen\sidebarheight % Height of the sidebars
-
-\newdimen\beamer@tempdim
-\newdimen\beamer@finalheight
-\newdimen\beamer@animht
-\newdimen\beamer@animdp
-\newdimen\beamer@animwd
-\newdimen\beamer@leftmargin
-\newdimen\beamer@rightmargin
-\newdimen\beamer@leftsidebar
-\newdimen\beamer@rightsidebar
-\newdimen\beamer@boxsize
-\newdimen\beamer@vboxoffset
-\newdimen\beamer@descdefault
-\newdimen\beamer@descriptionwidth
-
-\newskip\beamer@lastskip
-
-\newbox\beamer@areabox
-\newbox\beamer@animcurrent
-\newbox\beamer@animshowbox
-\newbox\beamer@sectionbox
-\newbox\beamer@logobox
-\newbox\beamer@linebox
-
-\newcount\beamer@sectioncount
-\newcount\beamer@subsubsectionmax
-\newcount\beamer@subsectionmax
-\newcount\beamer@sectionmax
-\newcount\beamer@totalheads
-\newcount\beamer@headcounter
-\newcount\beamer@partstartpage
-\newcount\beamer@sectionstartpage
-\newcount\beamer@subsectionstartpage
-\newcount\beamer@animationtempa
-\newcount\beamer@animationtempb
-\newcount\beamer@xpos
-\newcount\beamer@ypos
-\newcount\beamer@showpartnumber
-\newcount\beamer@currentsubsection
-\newcount\beamer@coveringdepth
-\newcount\beamer@sectionadjust
-\newcount\beamer@tocsectionnumber
-
-\newif\ifbeamer@sansmath
-\newif\ifbeamer@altmode
-\newif\ifbeamer@notes
-\newif\ifbeamer@notesnormals
-\newif\ifbeamer@compress
-\newif\ifbeamer@centered
-\newif\ifbeamer@draftmode
-\newif\ifbeamer@suppressreplacements % decides whether fonts should be substituted
-\newif\ifbeamer@frameswithnotesonly
-\newif\ifbeamer@ignorenonframe
-\newif\ifbeamer@autopdfinfo
-
-\RequirePackage{beamerbaseoptions}
-
-
-\beamer@suppressreplacementsfalse
-\beamer@altmodefalse
-\beamer@notesfalse
-\beamer@notesnormalstrue
-\beamer@compressfalse
-\beamer@draftmodefalse
-\beamer@frameswithnotesonlyfalse
-\beamer@ignorenonframefalse
-\beamer@autopdfinfotrue
-
-\DeclareOptionBeamer{usepdftitle}[true]{\csname beamer@autopdfinfo#1\endcsname}
-\DeclareOptionBeamer{envcountsect}{\beamer@countsecttrue}
-\DeclareOptionBeamer{notheorems}{\beamer@blocksfalse}
-\DeclareOptionBeamer{noamsthm}{\beamer@blocksfalse\beamer@amsfalse}
-
-\DeclareOptionBeamer{compress}{\beamer@compresstrue}
-
-\DeclareOptionBeamer{t}{\beamer@centeredfalse}
-\DeclareOptionBeamer{c}{\beamer@centeredtrue}
-
-\DeclareOptionBeamer{leqno}{\input{leqno.clo}}
-\DeclareOptionBeamer{fleqn}{\input{fleqn.clo}}
-
-\def\beamer@currentmode{beamer}
-\DeclareOptionBeamer{handout}{\gdef\beamer@currentmode{handout}}
-\DeclareOptionBeamer{trans}{\gdef\beamer@currentmode{trans}}
-
-\DeclareOptionBeamer{pdftex}{}% Used by hyperref
-\DeclareOptionBeamer{nativepdf}{}% Used by hyperref
-\DeclareOptionBeamer{pdfmark}{}% Used by hyperref
-\DeclareOptionBeamer{dvips}{}% Used by hyperref
-\DeclareOptionBeamer{dviwindo}{}% Used by hyperref
-\DeclareOptionBeamer{dvipsone}{}% Used by hyperref
-\DeclareOptionBeamer{vtex}{}% Used by hyperref
-\DeclareOptionBeamer{ps2pdf}{}% Used by hyperref
-
-\DeclareOptionBeamer{ignorenonframetext}{\beamer@ignorenonframetrue}
-
-\def\beamer@size{{size11.clo}}
-\DeclareOptionBeamer{bigger}{\def\beamer@size{{size12.clo}}}
-\DeclareOptionBeamer{smaller}{\def\beamer@size{{size10.clo}}}
-
-\DeclareOptionBeamer{8pt}{\def\beamer@size{{size8.clo}}}
-\DeclareOptionBeamer{9pt}{\def\beamer@size{{size9.clo}}}
-\DeclareOptionBeamer{10pt}{\def\beamer@size{{size10.clo}}}
-\DeclareOptionBeamer{11pt}{\def\beamer@size{{size11.clo}}}
-\DeclareOptionBeamer{12pt}{\def\beamer@size{{size12.clo}}}
-\DeclareOptionBeamer{14pt}{\def\beamer@size{{size14.clo}}}
-\DeclareOptionBeamer{17pt}{\def\beamer@size{{size17.clo}}}
-\DeclareOptionBeamer{20pt}{\def\beamer@size{{size20.clo}}}
-
-\DeclareOptionBeamer{draft}{\beamer@draftmodetrue}
-\def\insertpagenumber{\thepage}
-
-\def\beamer@activecjk{}
-\def\beamer@hypercjk{}
-
-\DeclareOptionBeamer{CJK}{\ExecuteOptionsBeamer{cjk}}
-\DeclareOptionBeamer{cjk}{
-  \def\beamer@hypercjk{\hypersetup{CJKbookmarks=true}}
-
-  \def\beamer@activecjk{
-    % Activate all >=128 characters.
-    \count@=127
-    \@whilenum\count@<254 \do{%
-      \advance\count@ by 1
-      \lccode`\~=\count@
-      \catcode\count@=\active
-      \lowercase{\def~{\kern1ex}}
-    }
-  }
-}
-
-\DeclareOptionBeamer{notes}[show]{\csname beamer@notesaction@#1\endcsname}
-\def\beamer@notesaction@hide{%
-  \ClassWarning{beamer}{This option is obsolete. Use beamer option
-    ``hide notes'' instead.}%
-  \beamer@notesfalse}
-\def\beamer@notesaction@show{%
-  \ClassWarning{beamer}{This option is obsolete. Use beamer option
-    ``show notes'' instead.}%
-  \beamer@notestrue}
-\def\beamer@notesaction@only{%
-  \ClassWarning{beamer}{This option is obsolete. Use beamer option
-    ``show only notes'' instead.}%
-  \beamer@notestrue
-  \beamer@notesnormalsfalse
-  \nofiles
-}
-\def\beamer@notesaction@onlyslideswithnotes{%
-  \beamer@notestrue%
-  \beamer@frameswithnotesonlytrue%
-  \nofiles
-}
-\DeclareOptionBeamer{inrow}{
-  \ClassError{beamer}{``inrow'' no longer supported. Use ``compress'' instead.}{}}
-\DeclareOptionBeamer{compressnotes}{%
-  \ClassWarning{beamer}{``compressnotes'' is obsolete. Use
-    \noexpand\setbeamertemplate{note page}[compressed] instead}
-  \AtBeginDocument{\beamertemplatenotecompress}}
-\DeclareOptionBeamer{notesonly}{
-  \ClassWarning{beamer}{``notesonly'' is obsolete. Use beamer option
-    ``show only notes'' instead.}
-  \beamer@notesaction@only}
-\DeclareOptionBeamer{blue}{
-  \ClassWarning{beamer}{``blue'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.2,0.2,0.7}]{structure}}}
-\DeclareOptionBeamer{red}{
-  \ClassWarning{beamer}{``red'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.7,0.2,0.2}]{structure}}}
-\DeclareOptionBeamer{blackandwhite}{
-  \ClassWarning{beamer}{``blackandwhite'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.2,0.2,0.2}]{structure}}}
-\DeclareOptionBeamer{brown}{
-  \ClassWarning{beamer}{``brown'' is obsolete. Use color theme structure instead}
-  \def\beamer@loadlater{\usecolortheme[rgb={0.66,0.4,0.166}]{structure}}}
-\DeclareOptionBeamer{slidescentered}{
-  \ClassWarning{beamer}{``slidescentered'' is obsolete. Use ``c'' instead}
-  \beamer@centeredtrue}
-\DeclareOptionBeamer{slidestop}{
-  \ClassWarning{beamer}{``slidestop'' is obsolete. Use ``t'' instead}
-  \beamer@centeredfalse}
-\DeclareOptionBeamer{sans}{%
-  \ClassWarning{beamer}{``sans'' is obsolete. Just remove this option}
-  \def\familydefault{\sfdefault}
-  \def\mathfamilydefault{\sfdefault}
-  \beamer@sansmathtrue
-}
-\DeclareOptionBeamer{serif}{%
-  \ClassWarning{beamer}{``serif'' is obsolete. Use font theme ``serif'' instead}
-  \def\familydefault{\rmdefault}
-  \def\mathfamilydefault{\rmdefault}
-  \beamer@sansmathfalse
-}
-\DeclareOptionBeamer{mathsans}{
-  \ClassWarning{beamer}{``mathsans'' is obsolete. Use font theme ``serif'' with option ``butsansserifmath''}
-  \def\mathfamilydefault{\sfdefault}\beamer@sansmathtrue}
-\DeclareOptionBeamer{mathserif}{
-  \ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''}
-  \def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse}
-\DeclareOptionBeamer{professionalfont}{
-  \ClassWarning{beamer}{``professionalfont'' is obsolete. Use font theme ``professionalfonts'' instead}
-  \beamer@suppressreplacementstrue}
-
-\def\familydefault{\rmdefault}
-\def\mathfamilydefault{\sfdefault}
-\beamer@sansmathtrue
-
-\PassOptionsToPackage{bookmarks=true,%
-  bookmarksopen=true,%
-  pdfborder={0 0 0},%
-  pdfhighlight={/N},%
-  linkbordercolor={.5 .5 .5}}{hyperref}
-
-\DeclareOptionBeamer{pgf}{\PassOptionsToPackage{#1}{pgf}}
-\DeclareOptionBeamer{hyperref}{\PassOptionsToPackage{#1}{hyperref}}
-\DeclareOptionBeamer{color}{\PassOptionsToPackage{#1}{color}}
-\DeclareOptionBeamer{xcolor}{\PassOptionsToPackage{#1}{xcolor}}
-
-\def\beamer@loaducs{}
-
-\DeclareOptionBeamer{ucs}{%
-  \ifcase\pdfoutput
-    \def\beamer@loaducs{
-      \RequirePackage{ucs}%
-      \AtBeginDocument{\PreloadUnicodePage{0}}%
-      \AtBeginDocument{\PreloadUnicodePage{1}}%
-    }
-  \or
-    \PassOptionsToPackage{pdftex,unicode}{hyperref}
-    \def\beamer@loaducs{
-      \RequirePackage[hyperref]{ucs}%
-      \AtBeginDocument{\PreloadUnicodePage{0}}%
-      \AtBeginDocument{\PreloadUnicodePage{1}}%
-    }
-  \fi
-}
-\DeclareOptionBeamer{utf8}{\ExecuteOptionsBeamer{ucs}%
-  \g@addto@macro\beamer@loaducs{\RequirePackage[utf8]{inputenc}}%
-}
-
-
-\ExecuteOptionsBeamer{c}
-\ProcessOptionsBeamer
-
-\beamer@filterclassoptions
-
-\RequirePackage{pgfcore,pgfbaseimage}
-
-\RequirePackage{xxcolor}
-
-\RequirePackage{amssymb}
-
-\RequirePackage[%
-  papersize={12.80cm,9.60cm},
-  hmargin=1cm,%
-  vmargin=0cm,%
-  head=0.5cm,% will be changed later
-  headsep=0pt,%
-  foot=0.5cm% will be changed later
-  ]{geometry}
-
-\RequirePackage[implicit=false]{hyperref}
-
-\hypersetup{pdfcreator={LaTeX with beamer class version \beamer@version}}
-
-\beamer@loaducs
-\beamer@hypercjk
-
-\expandafter\input\beamer@size
-\geometry{headsep=0pt}
-
-\RequirePackage{beamerbasecompatibility}
-
-\RequirePackage{beamerbasefont}
-
-\normalfont
-\raggedleft
-
-\AtBeginDocument
-{
-  \addtocontents{toc}{\protect\beamer@endinputifotherversion{\beamer@version pt}}
-  \addtocontents{nav}{\protect\beamer@endinputifotherversion{\beamer@version pt}}
-}
-
-\RequirePackage{beamerbasemisc}
-
-\RequirePackage{beamerbasetwoscreens}
-
-\RequirePackage{beamerbaseoverlay}
-
-\RequirePackage{beamerbasetitle}
-
-\RequirePackage{beamerbasesection}
-
-\RequirePackage{beamerbaseframe}
-
-\RequirePackage{beamerbaseverbatim}
-
-\RequirePackage{beamerbaseframesize}
-
-\RequirePackage{beamerbaseframecomponents}
-
-\RequirePackage{beamerbasecolor}
-
-\RequirePackage{beamerbasenotes}
-
-\RequirePackage{beamerbasetoc}
-
-\RequirePackage{bidibeamerbasetemplates}
-
-\RequirePackage{beamerbaselocalstructure}
-
-\RequirePackage{beamerbasenavigation}
-
-\RequirePackage{beamerbasetheorems}
-
-\RequirePackage{beamerbasethemes}
-
-\usetheme{default}
-
-\csname beamer@loadlater\endcsname
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "~/texmf/tex/latex/beamer/examples/beamerexample1.tex"
-%%% End:
-%% 
-%% Copyright © 2009      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 `bidibeamer.cls'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidibeamerbaseauxtemplates.sty b/Master/texmf-dist/tex/xelatex/bidi/bidibeamerbaseauxtemplates.sty
deleted file mode 100644
index d6129057d6a..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/bidibeamerbaseauxtemplates.sty
+++ /dev/null
@@ -1,693 +0,0 @@
-%%
-%% This is file `bidibeamerbaseauxtemplates.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidibeamerbaseauxtemplates.sty')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
-%% 
-%%   License information appended.
-%% 
-%% 
-
-\mode<presentation>
-
-\RequirePackage{beamerbaseboxes}
-
-
-\normalsize
-\pgfdeclareradialshading[bg,parent.bg]{tocsphere}{\pgfpoint{-0.5ex}{0.6ex}}%
-{%
-  color(0cm)=(bg!35!white);
-  color(0.44ex)=(bg!75!white);
-  color(0.88ex)=(bg!70!black!90!parent.bg);
-  color(1.2ex)=(bg!50!black!90!parent.bg);
-  color(1.3ex)=(parent.bg)}
-
-\pgfdeclareradialshading[bg,parent.bg]{bigsphere}{\pgfpoint{-0.1849315ex}{.2260273ex}}%
-{%
-  color(0cm)=(bg!15);
-  color(0.1643835ex)=(bg!75);
-  color(0.3287671ex)=(bg!70!black);
-  color(0.4520547ex)=(bg!50!black);
-  color(0.53ex)=(parent.bg)}
-
-\pgfdeclareradialshading[bg,parent.bg]{smallsphere}{\pgfpoint{-0.1479452ex}{0.18287671ex}}%
-{%
-  color(0cm)=(bg!15);
-  color(0.1315068ex)=(bg!75);
-  color(0.2630136ex)=(bg!70!black);
-  color(0.36164383ex)=(bg!50!black);
-  color(0.427ex)=(parent.bg)}
-
-\def\beamer@usesphere#1#2{%
-  \hbox{\usebeamercolor{#1}\normalsize\pgfuseshading{#2}}}
-
-
-\define@key{beamer@backgroundgrid}{step}{\def\beamer@bggw{#1}}
-\define@key{beamer@backgroundgrid}{color}{\def\beamer@bggc{\color{#1}}}
-
-\defbeamertemplate{background}{grid}[1][]
-{%
-  \setkeys{beamer@backgroundgrid}{step=0.5cm,color=fg!10!bg}%
-  \setkeys{beamer@backgroundgrid}{#1}%
-  \begin{pgfpicture}{0cm}{0cm}{\the\paperwidth}{\the\paperheight}
-    \beamer@bggc
-    \pgfpathgrid[stepx=\beamer@bggw,stepy=\beamer@bggw]{\pgfpointorigin}{\pgfpoint{\the\paperwidth}{\the\paperheight}}
-    \pgfusepath{stroke}
-  \end{pgfpicture}%
-}
-
-\define@key{beamer@backgroundshade}{top}{\def\beamer@bgst{#1}}
-\define@key{beamer@backgroundshade}{bottom}{\def\beamer@bgsb{#1}}
-\define@key{beamer@backgroundshade}{right}{\def\beamer@bgst{#1}}
-\define@key{beamer@backgroundshade}{left}{\def\beamer@bgsb{#1}}
-\define@key{beamer@backgroundshade}{middle}{\def\beamer@bgsm{#1}}
-\define@key{beamer@backgroundshade}{midpoint}{\def\beamer@bgsmp{#1}}
-
-\def\beamer@calcvertshading#1#2#3{%
-  {\usebeamercolor{palette primary}}
-  \usebeamercolor{normal text}
-  \setkeys{beamer@backgroundshade}{top=palette primary.bg!25!bg,bottom=bg,middle={},midpoint=0.5}%
-  \setkeys{beamer@backgroundshade}{#3}
-  \ifx\beamer@bgsm\@empty
-    \pgfdeclareverticalshading{#1}{#2}%
-      {color(0cm)=(\beamer@bgsb); color(\the\paperheight)=(\beamer@bgst)}
-    \colorlet{beamer@backgroundshadestart}{\beamer@bgsb}%
-    \colorlet{beamer@backgroundshadeend}{\beamer@bgst}%
-    \colorlet{beamer@average}{beamer@backgroundshadestart!50!beamer@backgroundshadeend}%
-  \else
-    \pgfdeclareverticalshading{#1}{#2}%
-      {color(0cm)=(\beamer@bgsb); color(\beamer@bgsmp\paperheight)=(\beamer@bgsm); color(\the\paperheight)=(\beamer@bgst)}
-    \colorlet{beamer@average}{\beamer@bgsm}
-  \fi%
-}
-
-\def\beamer@calchorishading#1#2#3{%
-  {\usebeamercolor{palette primary}}
-  \usebeamercolor{normal text}
-  \setkeys{beamer@backgroundshade}{left=palette primary.bg!25!bg,right=bg,middle={},midpoint=0.5}%
-  \setkeys{beamer@backgroundshade}{#3}
-  \ifx\beamer@bgsm\@empty
-    \pgfdeclarehorizontalshading{#1}{\the\paperheight}%
-      {color(0cm)=(\beamer@bgsb); color(#2)=(\beamer@bgst)}
-    \colorlet{beamer@backgroundshadestart}{\beamer@bgsb}%
-    \colorlet{beamer@backgroundshadeend}{\beamer@bgst}%
-    \colorlet{beamer@average}{beamer@backgroundshadestart!50!beamer@backgroundshadeend}%
-  \else
-    \pgfdeclarehorizontalshading{#1}{\the\paperheight}%
-      {color(0cm)=(\beamer@bgsb); color(\beamer@bgsmp#2)=(\beamer@bgsm); color(#2)=(\beamer@bgst)}
-    \colorlet{beamer@average}{\beamer@bgsm}
-  \fi%
-}
-
-\defbeamertemplate{background canvas}{vertical shading}[1][]
-{%
-  \pgfuseshading{beamer@backgroundshading}%
-}
-[action]
-{
-  \beamer@calcvertshading{beamer@backgroundshading}{\the\paperwidth}{#1}
-  \colorlet{beamer@@average}{beamer@average}
-  \setbeamercolor{normal text}{bg=beamer@@average}
-}
-
-
-\defbeamertemplate{sidebar canvas left}{vertical shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasleftshading}%
-}
-[action]
-{
-  \beamer@calcvertshading{beamer@sidebarcanvasleftshading}{\the\beamer@leftsidebar}{#1}
-}
-
-\defbeamertemplate{sidebar canvas right}{vertical shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasrightshading}%
-}
-[action]
-{
-  \beamer@calcvertshading{beamer@sidebarcanvasrightshading}{\the\beamer@rightsidebar}{#1}
-}
-
-\defbeamertemplate{sidebar canvas left}{horizontal shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasleftshading}%
-}
-[action]
-{
-  \beamer@calchorishading{beamer@sidebarcanvasleftshading}{\beamer@leftsidebar}{#1}
-}
-
-\defbeamertemplate{sidebar canvas right}{horizontal shading}[1][]
-{%
-  \pgfuseshading{beamer@sidebarcanvasrightshading}%
-}
-[action]
-{
-  \beamer@calchorishading{beamer@sidebarcanvasrightshading}{\beamer@rightsidebar}{#1}
-}
-
-
-\defbeamertemplate{section in toc}{sections numbered}
-{\leavevmode\inserttocsectionnumber\@SepMark \inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{sections numbered}
-{\leavevmode\if@RTL\rightskip=2.5em\else\leftskip=2.5em\fi\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{sections numbered}
-{\leavevmode\normalsize\usebeamerfont{subsection in toc}\if@RTL\rightskip=3.5em\else\leftskip=3.5em\fi\usebeamerfont{subsubsection in toc}%
-  \inserttocsubsubsection\par}
-
-
-\defbeamertemplate{section in toc}{subsections numbered}
-{\leavevmode\if@RTL\rightskip=2em\else\leftskip=2em\fi\inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{subsections numbered}
-{\leavevmode\if@RTL\rightskip=2em\else\leftskip=2em\fi\rlap{\hskip-2em\inserttocsectionnumber\@SepMark\inserttocsubsectionnumber}\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{subsections numbered}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=3em\else\leftskip=3em\fi\usebeamerfont{subsubsection in toc}%
-  \inserttocsubsubsection\par}
-
-
-\defbeamertemplate{section in toc}{circle}
-{\leavevmode\if@RTL\rightskip=2ex\else\leftskip=2ex\fi%
-  \llap{%
-    \usebeamerfont*{section number projected}%
-    \usebeamercolor{section number projected}%
-    \beginL\begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-      \color{bg}
-      \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-      \pgfusepath{fill}
-      \pgftext[base]{\color{fg}\inserttocsectionnumber}
-    \end{pgfpicture}\endL\kern1.25ex%
-  }%
-  \inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{circle}
-{\leavevmode\if@RTL\rightskip=2em\else\leftskip=2em\fi\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{circle}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=3em\else\leftskip=3em\fi\usebeamerfont{subsubsection in toc}%
-  \inserttocsubsubsection\par}
-
-
-\defbeamertemplate{section in toc}{square}
-{\leavevmode\if@RTL\rightskip=1.75ex\else\leftskip=1.75ex\fi%
-  \llap{%
-    \usebeamerfont*{section number projected}%
-    \usebeamercolor[bg]{section number projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{\hfil\color{fg}\inserttocsectionnumber\hfil}}%
-  \kern1.25ex\inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{square}
-{\leavevmode\if@RTL\rightskip=5ex\else\leftskip=5ex\fi\llap{%
-    \usebeamercolor[bg]{subsection number projected}%
-    \vrule width1ex height1ex\kern1ex}\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{square}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=7ex\else\leftskip=7ex\fi\usebeamerfont{subsubsection in toc}%
-  \llap{%
-    \usebeamercolor[bg]{subsubsection number projected}%
-    \vrule width0.75ex height0.75ex\kern1ex}\inserttocsubsubsection\par}
-
-
-\defbeamertemplate{section in toc}{ball unnumbered}
-{\leavevmode\raise0.1ex\beamer@usesphere{section number projected}{bigsphere}\kern1.25ex\inserttocsection\par}
-
-\defbeamertemplate{subsection in toc}{ball unnumbered}
-{\leavevmode\if@RTL\rightskip=1.5em\else\leftskip=1.5em\fi\raise0.2ex\beamer@usesphere{subsection number projected}{smallsphere}%
-  \kern1ex\inserttocsubsection\par}
-
-\defbeamertemplate{subsubsection in toc}{ball unnumbered}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=3em\else\leftskip=3em\fi\usebeamerfont{subsubsection in toc}%
-  \beamer@usesphere{subsubsection number projected}{smallsphere}%
-  \kern0.75ex\inserttocsubsubsection\par}
-
-
-\defbeamertemplate{section in toc}{ball}
-{\leavevmode\if@RTL\rightskip=2.75ex\else\leftskip=2.75ex\fi%
-  \llap{%
-    \normalsize%
-    \beginL\begin{pgfpicture}{-1ex}{-0.7ex}{1ex}{1ex}
-      \pgftext{\beamer@usesphere{section number projected}{tocsphere}}
-      \pgftext{%
-        \usebeamerfont*{section number projected}%
-        \usebeamercolor{section number projected}%
-        \color{fg!90!bg}%
-        \inserttocsectionnumber}
-    \end{pgfpicture}\endL%
-    \kern1.25ex}%
-  \inserttocsection\par
-}
-[action]
-{\setbeamerfont{section number projected}{size=\scriptsize}}
-
-\defbeamertemplate{subsection in toc}{ball}
-{\leavevmode\if@RTL\rightskip=5ex\else\leftskip=5ex\fi%
-  \llap{\raise0.1ex\beamer@usesphere{subsection number projected}{bigsphere}\kern1ex}%
-  \inserttocsubsection\par%
-}
-
-\defbeamertemplate{subsubsection in toc}{ball}
-{\leavevmode\normalsize\usebeamerfont{subsection in
-    toc}\if@RTL\rightskip=7ex\else\leftskip=7ex\fi\usebeamerfont{subsubsection in toc}%
-  \llap{\beamer@usesphere{subsubsection number projected}{bigsphere}\kern0.75ex}%
-  \inserttocsubsubsection\par%
-}
-
-
-\defbeamertemplatealias{itemize item}{triangle}{default}
-\defbeamertemplatealias{itemize subitem}{triangle}{default}
-\defbeamertemplatealias{itemize subsubitem}{triangle}{default}
-
-
-\defbeamertemplate{itemize item}{circle}{\small\raise0.5pt\hbox{\textbullet}}
-\defbeamertemplate{itemize subitem}{circle}{\footnotesize\raise0.5pt\hbox{\textbullet}}
-\defbeamertemplate{itemize subsubitem}{circle}{\footnotesize\raise0.5pt\hbox{\textbullet}}
-
-
-\defbeamertemplate{itemize item}{square}{\hbox{\vrule width 1ex height 1ex}}
-\defbeamertemplate{itemize subitem}{square}{\small\hbox{\vrule width 1ex height 1ex}}
-\defbeamertemplate{itemize subsubitem}{square}{\small\hbox{\vrule width 1ex height 1ex}}
-
-
-\defbeamertemplate{itemize item}{ball}{\raise0.2pt\beamer@usesphere{item projected}{bigsphere}}
-\defbeamertemplate{itemize subitem}{ball}{\raise0.2pt\beamer@usesphere{subitem projected}{smallsphere}}
-\defbeamertemplate{itemize subsubitem}{ball}{\raise0.2pt\beamer@usesphere{subsubitem projected}{smallsphere}}
-
-
-\defbeamertemplate{enumerate item}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.65ex}{1ex}{1ex}
-    \usebeamercolor[fg]{item projected}
-    {\pgftransformscale{1.75}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    {\pgftransformshift{\pgfpoint{0pt}{0.5pt}}
-      \pgftext{\usebeamerfont*{item projected}\insertenumlabel}}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate subitem}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.55ex}{1ex}{1ex}
-    \usebeamercolor[fg]{subitem projected}
-    {\pgftransformscale{1.4}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    \pgftext{%
-      \usebeamerfont*{subitem projected}%
-      \insertsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate subsubitem}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.55ex}{1ex}{1ex}
-    \usebeamercolor[fg]{subsubitem projected}
-    {\pgftransformscale{1.4}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    \pgftext{%
-      \usebeamerfont*{subitem projected}%
-      \insertsubsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate mini template}{ball}
-{\beginL
-  \begin{pgfpicture}{-1ex}{-0.65ex}{1ex}{1ex}
-    \usebeamercolor[fg]{\beameritemnestingprefix item projected}
-    {\pgftransformscale{1.75}\pgftext{\normalsize\pgfuseshading{bigsphere}}}
-    {\pgftransformshift{\pgfpoint{0pt}{0.5pt}}%
-     \usebeamerfont*{\beameritemnestingprefix item projected}%
-     \pgftext{\insertenumlabel}}
-  \end{pgfpicture}
-\endL}
-
-
-\defbeamertemplate{enumerate item}{square}
-{
-  \hbox{%
-    \usebeamerfont*{item projected}%
-    \usebeamercolor[bg]{item projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertenumlabel%
-      \hfil}%
-  }%
-}
-[action]
-{\setbeamerfont{item projected}{size=\scriptsize}}
-
-\defbeamertemplate{enumerate subitem}{square}
-{
-  \hbox{%
-    \usebeamerfont*{subitem projected}%
-    \usebeamercolor[bg]{subitem projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertsubenumlabel%
-      \hfil}%
-  }%
-}
-
-\defbeamertemplate{enumerate subsubitem}{square}
-{
-  \hbox{%
-    \usebeamerfont*{subitem projected}%
-    \usebeamercolor[bg]{subsubitem projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertsubsubenumlabel%
-      \hfil}%
-  }%
-}
-
-\defbeamertemplate{enumerate mini template}{square}
-{
-  \hbox{%
-    \usebeamerfont*{\beameritemnestingprefix item projected}%
-    \usebeamercolor[bg]{\beameritemnestingprefix item projected}%
-    \vrule width2.25ex height1.85ex depth.4ex%
-    \hskip-2.25ex%
-    \hbox to2.25ex{%
-      \hfil%
-      \color{fg}\insertenumlabel%
-      \hfil}%
-  }%
-}
-
-
-\defbeamertemplate{enumerate item}{circle}
-{\beginL
-  \usebeamerfont*{item projected}%
-  \usebeamercolor[bg]{item projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertenumlabel}
-  \end{pgfpicture}%
-\endL}
-[action]
-{\setbeamerfont{item projected}{size=\scriptsize}}
-
-\defbeamertemplate{enumerate subitem}{circle}
-{\beginL
-  \usebeamerfont*{subitem projected}%
-  \usebeamercolor[bg]{subitem projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate subsubitem}{circle}
-{\beginL
-  \usebeamerfont*{subsubitem projected}%
-  \usebeamercolor[bg]{subsubitem projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertsubsubenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-\defbeamertemplate{enumerate mini template}{circle}
-{\beginL
-  \usebeamerfont*{\beameritemnestingprefix item projected}%
-  \usebeamercolor[bg]{\beameritemnestingprefix item projected}%
-  \begin{pgfpicture}{-1ex}{0ex}{1ex}{2ex}
-    \pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.2ex}
-    \pgfusepath{fill}
-    \pgftext[base]{\color{fg}\insertenumlabel}
-  \end{pgfpicture}%
-\endL}
-
-
-\defbeamertemplatealias{frametitle continuation}{roman}{default}
-
-\defbeamertemplate{frametitle continuation}{from second}[1][\insertcontinuationtext]
-{\expandafter\ifnum\insertcontinuationcount>1\relax#1\fi}
-
-
-\defbeamertemplatealias{bibliography item}{article}{default}
-
-\defbeamertemplate{bibliography item}{book}
-{\lower2pt\hbox{\pgfuseimage{beamericonbook}}}
-
-\defbeamertemplate{bibliography item}{text}
-{\insertbiblabel}
-
-\defbeamertemplate{bibliography item}{triangle}
-{\scriptsize\raise1.25pt\hbox{\donotcoloroutermaths$\if@RTL\blacktriangleleft\else\blacktriangleright\fi$}}
-
-
-\defbeamertemplate{headline}{text line}[1]
-{\hskip\Gm@lmargin\hbox to\@tempdima{\textwidth=\@tempdima\hsize=\textwidth\relax#1\hfil}\hskip\Gm@rmargin}
-
-
-\defbeamertemplate{footline}{text line}[1]
-{\hskip\Gm@lmargin\hbox to\@tempdima{\textwidth=\@tempdima\hsize=\textwidth\relax#1\hfil}\hskip\Gm@rmargin}
-
-\defbeamertemplate{footline}{page number}
-{%
-  \hfill%
-  \usebeamercolor[fg]{page number in head/foot}%
-  \usebeamerfont{page number in head/foot}%
-  \insertpagenumber\,/\,\insertpresentationendpage\kern1em\vskip2pt%
-}
-
-\defbeamertemplate{footline}{frame number}
-{
-  \hfill%
-  \usebeamercolor[fg]{page number in head/foot}%
-  \usebeamerfont{page number in head/foot}%
-  \insertframenumber\,/\,\inserttotalframenumber\kern1em\vskip2pt%
-}
-
-
-\defbeamertemplate{mini frame}{box}
-{%
-  \begin{pgfpicture}{0pt}{0pt}{.1cm}{.1cm}
-    \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\the\beamer@boxsize}{\the\beamer@boxsize}}
-    \pgfusepath{fill,stroke}
-  \end{pgfpicture}%
-}
-[action]
-{
-  \setbeamersize{mini frame size=.1cm,mini frame offset=.05cm}
-}
-
-\defbeamertemplate{mini frame in current subsection}{box}
-{%
-  \begin{pgfpicture}{0pt}{0pt}{.1cm}{.1cm}
-    \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\the\beamer@boxsize}{\the\beamer@boxsize}}
-    \pgfusepath{stroke}
-  \end{pgfpicture}%
-}
-
-\defbeamertemplate{mini frame}{tick}
-{%
-  \hskip-0.4pt\vrule height\beamer@boxsize width1.2pt%
-}
-[action]
-{
-  \setbeamersize{mini frame size=.1cm,mini frame offset=.05cm}
-}
-
-\defbeamertemplate{mini frame in current subsection}{tick}
-{%
-  \vrule height\beamer@boxsize width0.4pt%
-}
-
-
-\defbeamertemplate{caption}{numbered}
-{%
-  \raggedright
-  {%
-    \usebeamercolor[fg]{caption name}%
-    \usebeamerfont*{caption name}%
-    \insertcaptionname~\insertcaptionnumber:%
-  }
-  \insertcaption\par
-}
-
-\defbeamertemplate{caption}{caption name own line}
-{%
-  \begin{minipage}{\textwidth}
-    \raggedright
-  {%
-    \usebeamercolor[fg]{caption name}%
-    \usebeamerfont*{caption name}%
-    \insertcaptionname%
-    }\\
-      \insertcaption
-    \end{minipage}
-}
-
-
-\newdimen\beamer@blockheadheight%
-
-\defbeamertemplate{navigation symbols}{only frame symbol}
-{\insertframenavigationsymbol}
-
-\defbeamertemplate{navigation symbols}{vertical}
-{%
-  \vbox{%
-  \hbox{\insertslidenavigationsymbol}
-  \hbox{\insertframenavigationsymbol}
-  \hbox{\insertsubsectionnavigationsymbol}
-  \hbox{\insertsectionnavigationsymbol}
-  \hbox{\insertdocnavigationsymbol}
-  \hbox{\insertbackfindforwardnavigationsymbol}}%
-}
-
-\defbeamertemplatealias{navigation symbols}{horizontal}{default}
-
-
-\defbeamertemplateparent{blocks}[rounded]{block begin,block end,%
-  block alerted begin,block alerted end,%
-  block example begin,block example end}[1][]
-{[#1]}
-
-\defbeamertemplate{block begin}{rounded}[1][shadow=false]
-{
-  \par\vskip\medskipamount%
-  \begin{beamerboxesrounded}[upper=block title,lower=block body,#1]%
-    {\raggedright\usebeamerfont*{block title}\insertblocktitle}%
-    \raggedright%
-    \usebeamerfont{block body}%
-}
-\defbeamertemplate{block end}{rounded}[1][]
-{\end{beamerboxesrounded}\vskip\smallskipamount}
-
-\defbeamertemplate{block alerted begin}{rounded}[1][shadow=false]
-{
-  \par\vskip\medskipamount%
-  \begin{beamerboxesrounded}[upper=block title alerted,lower=block body alerted,#1]%
-    {\raggedright\usebeamerfont*{block title alerted}\insertblocktitle}%
-    \raggedright%
-    \usebeamerfont{block body alerted}%
-}%
-\defbeamertemplate{block alerted end}{rounded}[1][]
-{\end{beamerboxesrounded}\vskip\smallskipamount}
-
-\defbeamertemplate{block example begin}{rounded}[1][shadow=false]
-{
-  \par\vskip\medskipamount%
-  \begin{beamerboxesrounded}[upper=block title example,lower=block body example,#1]
-    {\raggedright\usebeamerfont*{block title example}\insertblocktitle}%
-    \raggedright%
-    \usebeamerfont{block body alerted}%
-}%
-\defbeamertemplate{block example end}{rounded}[1][]
-{\end{beamerboxesrounded}\vskip\smallskipamount}
-
-
-\defbeamertemplate{note page}{plain}
-{\insertnote}
-
-\defbeamertemplate{note page}{compressed}
-{%
-  {%
-    \tiny
-    \let\\=\relax%
-    \insertvrule{0.125\paperheight}{white!90!black}%
-    \vskip-0.125\paperheight
-    \nointerlineskip
-    \vbox{\hfill\insertslideintonotes{0.125}\hskip-\Gm@rmargin\hskip0pt%
-      \vskip-0.125\paperheight\nointerlineskip}%
-    \nointerlineskip
-    \vbox to .125\paperheight{
-      \setbox\beamer@tempbox=\hbox{\hbox{\insertsection}}%
-      \ht\beamer@tempbox=1em
-      \box\beamer@tempbox
-      \nointerlineskip
-      \setbox\beamer@tempbox=\hbox{\hbox{\quad\insertsubsection}}%
-      \ht\beamer@tempbox=1em
-      \box\beamer@tempbox
-      \nointerlineskip
-      \setbox\beamer@tempbox=\hbox{\hbox{\quad\quad\insertshortframetitle}}%
-      \ht\beamer@tempbox=1em
-      \box\beamer@tempbox
-      \vfil
-    }\vskip0.5em
-  }
-  \nointerlineskip
-  \insertnote
-}
-
-
-\defbeamertemplate{theorem begin}{ams style}
-{%
-  \begin{\inserttheoremblockenv}
-    {%
-      \inserttheoremheadfont
-      \inserttheoremname
-      \inserttheoremnumber
-      \ifx\inserttheoremaddition\@empty\else\ (\inserttheoremaddition)\fi%
-      \inserttheorempunctuation
-    }%
-}
-
-\defbeamertemplate{theorem end}{ams style}
-{\end{\inserttheoremblockenv}}
-
-\defbeamertemplate{theorem begin}{numbered}
-{%
-  \begin{\inserttheoremblockenv}
-    {%
-      \inserttheoremname
-      \inserttheoremnumber
-      \ifx\inserttheoremaddition\@empty\else\ (\inserttheoremaddition)\fi%
-    }%
-}
-
-\defbeamertemplate{theorem end}{numbered}
-{\end{\inserttheoremblockenv}}
-
-\defbeamertemplate{theorem begin}{normal font}
-{
-  \normalfont
-  \begin{\inserttheoremblockenv}
-  {%
-    \inserttheoremname
-    \ifx\inserttheoremaddition\@empty\else\ (\inserttheoremaddition)\fi%
-  }%
-}
-
-\defbeamertemplate{theorem end}{normal font}
-{\end{\inserttheoremblockenv}}
-
-\mode
-<all>
-
-%% 
-%% Copyright © 2009      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 `bidibeamerbaseauxtemplates.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidibeamerbasetemplates.sty b/Master/texmf-dist/tex/xelatex/bidi/bidibeamerbasetemplates.sty
deleted file mode 100644
index 457ab099d4b..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/bidibeamerbasetemplates.sty
+++ /dev/null
@@ -1,139 +0,0 @@
-%%
-%% This is file `bidibeamerbasetemplates.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidibeamerbasetemplates.sty')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
-%% 
-%%   License information appended.
-%% 
-%% 
-
-
-\def\usebeamertemplate{\@ifstar{\beamer@usebeamertemplates}{\beamer@usebeamertemplatedo}}
-\def\beamer@usebeamertemplates{\@ifstar{\beamer@usebeamertemplatess}{\beamer@usebeamertemplatedos}}
-\def\beamer@usebeamertemplatess{\@ifstar{\beamer@usebeamertemplatedosss}{\beamer@usebeamertemplatedoss}}
-\def\beamer@usebeamertemplatedo#1{\csname beamer@@tmpl@#1\endcsname}
-\def\beamer@usebeamertemplatedos#1{{{\usebeamerfont{#1}\usebeamercolor[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
-\def\beamer@usebeamertemplatedoss#1{{{\usebeamerfont*{#1}\usebeamercolor[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
-\def\beamer@usebeamertemplatedosss#1{{{\usebeamerfont*{#1}\usebeamercolor*[fg]{#1}\csname beamer@@tmpl@#1\endcsname}}}
-
-\long\def\beamer@@empty{}
-\def\expandbeamertemplate#1{\csname beamer@@tmpl@#1\endcsname}
-\def\ifbeamertemplateempty#1#2#3{%
-  \def\beamer@ifdo{#3}%
-  \expandafter\ifx\csname beamer@@tmpl@#1\endcsname\relax\def\beamer@ifdo{#2}\fi%
-  \expandafter\ifx\csname beamer@@tmpl@#1\endcsname\beamer@@empty\def\beamer@ifdo{#2}\fi%
-  \beamer@ifdo}
-
-\mode<article>
-{
-  % the following do the same in article mode:
-  \let\beamer@usebeamertemplatedosss=\beamer@usebeamertemplatedo
-  \let\beamer@usebeamertemplatedoss=\beamer@usebeamertemplatedo
-  \let\beamer@usebeamertemplatedos=\beamer@usebeamertemplatedo
-}
-
-\newif\ifbeamer@sbt
-\newtoks\beamer@sbttoks
-
-\newcommand<>\defbeamertemplate{
-  \beamer@ifempty{#1}
-  {\def\beamer@@oar{<presentation>}}
-  {\def\beamer@@oar{#1}}\beamer@defbeamertemplate}
-\def\beamer@defbeamertemplate{\@ifstar{\beamer@sbttrue\beamer@sbtoo}{\beamer@sbtfalse\beamer@sbtoo}}
-\def\beamer@sbtoo#1#2{\@ifnextchar[{\beamer@sbto{#1}{#2}}{\beamer@sbto{#1}{#2}[0]}}
-\def\beamer@sbto#1#2[#3]{\@ifnextchar[{\beamer@@sbto{#1}{#2}[#3]}{\def\beamer@sbtotemp{}\beamer@@@sbto{#1}{#2}[#3]}}
-\long\def\beamer@@sbto#1#2[#3][#4]{\long\def\beamer@sbtotemp{[#4]}\beamer@@@sbto{#1}{#2}[#3]}
-\long\def\beamer@@@sbto#1#2[#3]#4{%
-  \beamer@sbttoks={\beamer@@@@sbto{#1}{#2}[#3]{#4}}%
-  \@ifnextchar[{\the\beamer@sbttoks}{\the\beamer@sbttoks[action]{}}%
-}
-\long\def\beamer@@@@sbto#1#2[#3]#4[#5]#6{%
-  \edef\beamer@@sbtoarg{\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[#3]}%
-  \expandafter\expandafter\expandafter\newcommand\expandafter\beamer@@sbtoarg\beamer@sbtotemp{%
-    \expandafter\long\expandafter\def\csname beamer@@tmpl@#1\endcsname{#4}#6}%
-  \let\beamer@@next=\beamer@resetsbtoarg%
-  \expandafter\mode\beamer@@oar{\let\beamer@@next=\relax}%
-  \beamer@@next%
-  \ifbeamer@sbt\setbeamertemplate{#1}[#2]\relax\relax\relax\relax\relax\relax\relax\relax\relax\fi%
-}
-\def\beamer@resetsbtoarg{%
-  \expandafter\expandafter\expandafter\renewcommand\expandafter\beamer@@sbtoarg\beamer@sbtotemp{}
-}
-
-\def\defbeamertemplatealias#1#2#3{%
-  \edef\beamer@@temp{\def\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname{\expandafter\noexpand\csname beamer@@tmpop@#1@#3\endcsname}}%
-  \beamer@@temp}
-
-\def\defbeamertemplateparent#1{\@ifnextchar[{\beamer@sbtoparo{#1}}{\beamer@sbtoparo{#1}[*]}}
-\def\beamer@sbtoparo#1[#2]#3{\@ifnextchar[{\beamer@sbtopar{#1}[#2]{#3}}{\beamer@sbtopar{#1}[#2]{#3}[0]}}
-\def\beamer@sbtopar#1[#2]#3[#4]{\@ifnextchar[
-  {\beamer@@sbtopar{#1}[#2]{#3}[#4]}
-  {\def\beamer@sbtotemp{}\beamer@@@sbtopar{#1}[#2]{#3}[#4]}}
-\long\def\beamer@@sbtopar#1[#2]#3[#4][#5]{\long\def\beamer@sbtotemp{[#5]}\beamer@@@sbtopar{#1}[#2]{#3}[#4]}
-\long\def\beamer@@@sbtopar#1[#2]#3[#4]#5{%
-  \expandafter\def\csname beamer@@tmpgrp@#1\endcsname{#3}%
-  \edef\beamer@@sbtoarg{\noexpand\newcommand\expandafter\noexpand\csname beamer@@tmpop@#1@#2\endcsname[#4]}%
-  \expandafter\beamer@@sbtoarg\beamer@sbtotemp{%
-    \def\beamer@sbtlist{#3}%
-    \@for\beamer@templ:=\beamer@sbtlist\do
-    {\expandafter\expandafter\expandafter\setbeamertemplate
-      \expandafter\expandafter\expandafter{\expandafter\beamer@templ\expandafter}\expandafter[\beamer@@sbt@option]#5}}}
-
-\def\setbeamertemplate#1{%
-  \@ifnextchar[{\beamer@sbtchoose{#1}}{\beamer@sbtexec{#1}}}
-\long\def\beamer@sbtexec#1#2{%
-  \expandafter\long\expandafter\def\csname beamer@@tmpl@#1\endcsname{#2}%
-  \expandafter\ifx\csname beamer@@tmpgrp@#1\endcsname\relax%
-  \else%
-    \expandafter\expandafter\expandafter\def
-    \expandafter\expandafter\expandafter\beamer@sbt@group
-    \expandafter\expandafter\expandafter{\csname beamer@@tmpgrp@#1\endcsname}%
-    \@for\beamer@templ:=\beamer@sbt@group\do{\expandafter\setbeamertemplate\expandafter{\beamer@templ}{#2}}%
-  \fi%
-}
-\long\def\beamer@sbtchoose#1[#2]{\def\beamer@@sbt@option{#2}%
-  \expandafter\ifx\csname beamer@@tmpop@#1@#2\endcsname\relax%
-    \expandafter\let\expandafter\beamer@@next\csname beamer@@tmpop@#1@*\endcsname%
-  \else%
-    \expandafter\let\expandafter\beamer@@next\csname beamer@@tmpop@#1@#2\endcsname%
-  \fi%
-  \beamer@@next%
-}
-
-\newcommand\addtobeamertemplate[3]{%
-  \long\def\beamer@temp{#2}%
-  \expandafter\def\expandafter\beamer@@temp\expandafter{\expandafter\long\expandafter\def\csname beamer@@tmpl@#1\endcsname}%
-  \expandafter\expandafter\expandafter\long%
-  \expandafter\expandafter\expandafter\def%
-  \expandafter\expandafter\expandafter\beamer@@addtemplate%
-  \expandafter\expandafter\expandafter{\csname beamer@@tmpl@#1\endcsname}%
-  \expandafter\expandafter\expandafter\beamer@@temp%
-  \expandafter\expandafter\expandafter{\expandafter\beamer@temp\beamer@@addtemplate#3}%
-}
-
-\RequirePackage{bidibeamerbaseauxtemplates}
-
-\mode
-<all>
-
-%% 
-%% Copyright © 2009      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 `bidibeamerbasetemplates.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
index 9a328e1bb99..7a8dd0b3768 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
@@ -1,21 +1,16 @@
 %%
 %% This is file `bidicode.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidicode.sty')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bidicode}
-\RequirePackage{pstricks}
-\RequirePackage{fvrb-ex}
+\RequirePackage{xcolor}
 \RequirePackage{showexpl}
 \definecolor{Orange}{rgb}{1,.4,.2}
 \definecolor{myblue}{rgb}{0.02,0.04,0.48}
@@ -31,36 +26,78 @@
 \lstset{%
     language=[LaTeX]TEX,%
     float=hbp,%
-    basicstyle=\ttfamily\small, %
+    basicstyle=\ttfamily, %
     identifierstyle=\color{black}, %
-    keywordstyle=\color{myred}, %
+    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=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},
+    captionpos=t,
+    explpreset={columns=flexible,language=[LaTeX]TEX},
    morekeywords={setLTR,setLR,setRTL,setRL,LRE,LR,RLE,RL,lr}
 }
-\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}
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20}}
+\lstdefinestyle{code}{backgroundcolor=\color{red!20}}
+\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$}
@@ -70,9 +107,9 @@
 \newcommand\LBEG[1]{{\normalfont\ttfamily\bs{}begin\lcb#1\rcb}}
 \newcommand\LEND[1]{{\normalfont\ttfamily\bs{}end\lcb#1\rcb}}
 
-\DeclareRobustCommand\bs{{\normalfont\ttfamily\textbackslash}}
-\DeclareRobustCommand\lcb{{\normalfont\ttfamily\textbraceleft}}
-\DeclareRobustCommand\rcb{{\normalfont\ttfamily\textbraceright}}
+\DeclareRobustCommand\bs{{\normalfont\ttfamily\symbol{92}}}
+\DeclareRobustCommand\lcb{{\normalfont\ttfamily\char`\{}}
+\DeclareRobustCommand\rcb{{\normalfont\ttfamily\char`\}}}
 \DeclareRobustCommand\lsb{{\normalfont\ttfamily[}}
 \DeclareRobustCommand\rsb{{\normalfont\ttfamily]}}
 \DeclareRobustCommand\lrb{{\normalfont\ttfamily(}}
@@ -80,7 +117,7 @@
 
 \def\Lcs#1{\nxLcs{#1}}
 \def\LcsStar#1{\nxLcs{#1}\OptArg*{*}}
-\def\nxLcs#1{\texttt{\textbackslash#1}}
+\def\nxLcs#1{\texttt{\symbol{92}#1}}
 
 \def\Coordx#1{$x_{#1}$}
 \def\Coordy#1{$y_{#1}$}
@@ -102,7 +139,7 @@
 \newsavebox{\boxdef}
 \newenvironment{BDef}
   {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}
+      \def\arraystretch{1.0}\if@RTL\@RTLfalse\fi
       \begin{tabular}{@{}l@{}l@{}l@{}}
   }
   {\end{tabular}\end{lrbox}
@@ -113,7 +150,7 @@
 
 \newenvironment{BDef*}
   {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}
+      \def\arraystretch{1.0}\if@RTL\@RTLfalse\fi
       \begin{tabular}{@{}l@{}l@{}l@{}}
   }
   {\end{tabular}\end{lrbox}
@@ -124,7 +161,7 @@
   \@beginparpenalty-\@lowpenalty
   \topsep\BDefaboveskip
   \fboxsep3pt
-  \flushleft}
+  \flushleft\if@RTL\@RTLfalse\fi}
  {\@endparpenalty\@M
   \@topsepadd\BDefbelowskip
   \endflushleft}
@@ -133,7 +170,7 @@
   \@beginparpenalty\@M
   \topsep\BDefinlineskip
   \fboxsep3pt
-  \flushleft}
+  \flushleft\if@RTL\@RTLfalse\fi}
  {\@endparpenalty5000
   \endflushleft}
 
@@ -144,13 +181,12 @@
 \setlength\BDefbelowskip{6pt}
 \setlength\BDefinlineskip{6pt}
 
-\def\OptArgs{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{[Options]}}\kern1pt}
+\def\OptArgs{\colorbox{black!20}{\texttt{[Options]}}\kern1pt}
 \def\OptArg{\@ifnextchar*\OptArg@i{\OptArg@ii*}}
-\def\OptArg@i*#1{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{#1}}\kern1pt}
-\def\OptArg@ii*#1{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{[#1]}}\kern1pt}
-
+\def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt}
+\def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty
new file mode 100644
index 00000000000..8479487dc37
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty
@@ -0,0 +1,172 @@
+%%
+%% This is file `bidiftnxtra.sty',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bidiftnxtra}
+\newtoks\bidi@p@ftn
+\let\FN@sf@@footnote\footnote
+\let\FN@sf@@LTRfootnote\LTRfootnote
+\let\FN@sf@@RTLfootnote\RTLfootnote
+\def\footnote{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@footnote
+  \else
+    \expandafter\FN@sf@gobble@opt
+  \fi
+}
+\def\LTRfootnote{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@LTRfootnote
+  \else
+    \expandafter\FN@sf@gobble@opt
+  \fi
+}
+\def\RTLfootnote{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@RTLfootnote
+  \else
+    \expandafter\FN@sf@gobble@opt
+  \fi
+}
+\edef\FN@sf@gobble@opt{\noexpand\protect
+  \expandafter\noexpand\csname FN@sf@gobble@opt \endcsname}
+\expandafter\def\csname FN@sf@gobble@opt \endcsname{%
+  \@ifnextchar[%]
+    \FN@sf@gobble@twobracket
+    \@gobble
+}
+\def\FN@sf@gobble@twobracket[#1]#2{}
+\let\FN@sf@@footnotemark\footnotemark
+\def\footnotemark{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@footnotemark
+  \else
+    \expandafter\FN@sf@gobble@optonly
+  \fi
+}
+\edef\FN@sf@gobble@optonly{\noexpand\protect
+  \expandafter\noexpand\csname FN@sf@gobble@optonly \endcsname}
+\expandafter\def\csname FN@sf@gobble@optonly \endcsname{%
+  \@ifnextchar[%]
+    \FN@sf@gobble@bracket
+    {}%
+}
+\def\FN@sf@gobble@bracket[#1]{}
+\def\@tabular{\if@RTL\global\@RTLtabtrue\fi
+   \leavevmode \hbox \bgroup
+   \let\@footnotetext\bidi@p@ftntext
+   \let\@LTRfootnotetext\bidi@p@LTRftntext
+   \let\@RTLfootnotetext\bidi@p@RTLftntext
+   \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
+                 \the\bidi@p@ftn
+                 \global\bidi@p@ftn{}%
+                 \global\@RTLtabfalse}
+\long\def\bidi@p@ftntext#1{%
+  \edef\@tempy{\the\bidi@p@ftn\noexpand\footnotetext[\the\c@footnote]}%
+  \global\bidi@p@ftn\expandafter{\@tempy{#1}}}%
+\long\def\bidi@p@LTRftntext#1{%
+  \edef\@tempyi{\the\bidi@p@ftn\noexpand\LTRfootnotetext[\the\c@footnote]}%
+  \global\bidi@p@ftn\expandafter{\@tempyi{#1}}}%
+\long\def\bidi@p@RTLftntext#1{%
+  \edef\@tempyii{\the\bidi@p@ftn\noexpand\RTLfootnotetext[\the\c@footnote]}%
+  \global\bidi@p@ftn\expandafter{\@tempyii{#1}}}%
+\def\@xfloat #1[#2]{%
+  \@nodocument
+  \def \@captype {#1}%
+   \def \@fps {#2}%
+   \@onelevel@sanitize \@fps
+   \def \reserved@b {!}%
+   \ifx \reserved@b \@fps
+     \@fpsadddefault
+   \else
+     \ifx \@fps \@empty
+       \@fpsadddefault
+     \fi
+   \fi
+   \ifhmode
+     \@bsphack
+     \@floatpenalty -\@Mii
+   \else
+     \@floatpenalty-\@Miii
+   \fi
+  \ifinner
+     \@parmoderr\@floatpenalty\z@
+  \else
+    \@next\@currbox\@freelist
+      {%
+       \@tempcnta \sixt@@n
+       \expandafter \@tfor \expandafter \reserved@a
+         \expandafter :\expandafter =\@fps
+         \do
+          {%
+           \if \reserved@a h%
+             \ifodd \@tempcnta
+             \else
+               \advance \@tempcnta \@ne
+             \fi
+           \fi
+           \if \reserved@a t%
+             \@setfpsbit \tw@
+           \fi
+           \if \reserved@a b%
+             \@setfpsbit 4%
+           \fi
+           \if \reserved@a p%
+             \@setfpsbit 8%
+           \fi
+           \if \reserved@a !%
+             \ifnum \@tempcnta>15
+               \advance\@tempcnta -\sixt@@n\relax
+             \fi
+           \fi
+           }%
+       \@tempcntb \csname ftype@\@captype \endcsname
+       \multiply \@tempcntb \@xxxii
+       \advance \@tempcnta \@tempcntb
+       \global \count\@currbox \@tempcnta
+       }%
+    \@fltovf
+  \fi
+  \global \setbox\@currbox
+    \color@vbox
+      \normalcolor
+      \vbox \bgroup
+       \let\@footnotetext\bidi@p@ftntext
+       \let\@LTRfootnotetext\bidi@p@LTRftntext
+       \let\@RTLfootnotetext\bidi@p@RTLftntext
+        \hsize\columnwidth
+        \@parboxrestore
+        \@floatboxreset
+}
+\def \@endfloatbox{%
+      \par\vskip\z@skip      %% \par\vskip\z@ added 15 Dec 87
+      \@minipagefalse
+      \outer@nobreak
+    \egroup                  %% end of vbox
+    \the\bidi@p@ftn
+    \global\bidi@p@ftn{}%
+  \color@endbox
+}
+%% 
+%% 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 `bidiftnxtra.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
deleted file mode 100644
index d751d42dc3b..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
+++ /dev/null
@@ -1,275 +0,0 @@
-%%
-%% This is file `bidimoderncv.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidimoderncv.cls')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 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{graphicx}
-\RequirePackage{pstricks}
-\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}
-\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}}}
-\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{\beginL\psline[linecolor=sectionrectanglecolour,linewidth=4pt](-2.5,0)(0,0)\endL}}%
-  \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}{}}%
-    {\beginL\href{#2}{\beginR#2\endR}\endL}%
-    {\beginL\href{#2}{\beginR#1\endR}\endL}}
-\newcommand*{\httplink}[2][]{%
-  \ifthenelse{\equal{#1}{}}%
-    {\beginL\href{http://#2}{\beginR#2\endR}\endL}%
-    {\beginL\href{http://#2}{\beginR#1\endR}\endL}}
-\newcommand*{\emaillink}[2][]{%
-  \ifthenelse{\equal{#1}{}}%
-    {\beginL\href{mailto:#2}{\beginR#2\endR}\endL}%
-    {\beginL\href{mailto:#2}{\beginR#1\endR}\endL}}
-\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      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
new file mode 100644
index 00000000000..06f83b9c3f4
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
@@ -0,0 +1,221 @@
+%%
+%% This is file `bidipoem.sty',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bidipoem}%
+[2010/03/01 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}
+\def\poemskip{\medskip}
+\def\poemblocksep{\quad$\Box$}
+\newdimen\versewidth
+\newtoks\bidipoem@p@ftn
+\def\poem@verse#1{%
+\ifdim\wd#1>\new@poem@width
+\xdef\new@poem@width{\the\wd#1}%
+\ifdim\new@poem@width>\poem@width
+\xdef\poem@width{\new@poem@width}%
+\global\let\poem@needrun\relax
+\fi
+\fi
+\hbox to\poem@width{\unhbox#1}%
+}
+\def\poem@linebegin{\vadjust{}\hskip\@flushglue\hskip\poemmarginskip\relax}
+\def\poem@lineend{\nobreak\hskip\poemmarginskip\hskip\@flushglue\vadjust{}}
+\def\poem@lineversesep{%
+\nobreak
+\hskip\z@ plus 1filll%
+\penalty600%
+\hskip\poemcolsepskip
+\hskip\z@ plus -2filll%
+\vadjust{}%
+\nobreak
+\hskip\z@ plus 1filll%
+}
+\def\poem@lineparsebegin{%
+\halign\bgroup
+\global\setbox\verse@i=\hbox{\ignorespaces##\unskip}&&
+\global\setbox\verse@ii=\hbox{\ignorespaces##\unskip}
+\cr
+}
+\def\poem@lineparseend{%
+\crcr\egroup
+\vskip-\baselineskip
+}
+\def\oldpoem@cr{%
+  \cr\poem@line
+}
+\newbox\verse@i
+\newbox\verse@ii
+\newif\ifpoem@started
+
+\def\poem@line{%
+\poem@lineparseend
+\ifdim\wd\verse@i>\z@\global\poem@startedtrue\fi
+\ifdim\wd\verse@ii>\z@\global\poem@startedtrue\fi
+\ifpoem@started
+  \ifdim\wd\verse@ii>\z@\else
+  \nopagebreak[3]
+  \fi
+  \leavevmode
+  \poem@linebegin
+  \poem@verse\verse@i
+  \ifdim\wd\verse@ii>\z@
+  \poem@lineversesep
+  \poem@verse\verse@ii
+  \fi
+  \poem@lineend
+  \nopagebreak
+  \endgraf
+  \vskip\poemextrabaselineskip
+\fi
+\poem@lineparsebegin
+}
+\def\@traditionalpoem{%
+\stepcounter{poem@no}
+        \ifnum\max@poem@no<\number\c@poem@no%
+\xdef\poem@width{\z@}%
+        \else
+\xdef\poem@width{\poem@prop{poem@width}}%
+\fi
+\xdef\new@poem@width{\z@}%
+\global\versewidth=\poem@width
+\poemskip\leavevmode\par
+\begingroup
+        \let\@footnotetext\bidipoem@p@ftntext
+        \let\@LTRfootnotetext\bidipoem@p@LTRftntext
+        \let\@RTLfootnotetext\bidipoem@p@RTLftntext
+\tabskip=\z@
+\parskip=\z@
+\parindent=\z@
+\parfillskip=\z@
+\rightskip=\z@
+\leftskip=\z@
+\widowpenalty=10000% No break between verses of the same line.
+\clubpenalty=10000% Same as above.  Not really needed.
+\def\newblock{\hfil\poemblocksep\hfil\null}%
+\def\par{\oldpoem@cr}% Redefine \par for possible \obeylines
+\def\\{\global\poem@startedtrue\oldpoem@cr}%
+\global\poem@startedfalse
+\csname poem@obeylines\endcsname
+\let\poem@obeylines\relax
+\poem@lineparsebegin
+}
+\def\@endtraditionalpoem{%
+\cr
+\ifdim\wd\verse@i>\z@\poem@line\else\ifdim\wd\verse@ii>\z@\poem@line\else
+\noalign{%
+\skip0=\poemextrabaselineskip
+\vskip-\skip0
+\vskip-\baselineskip
+}%
+\fi\fi
+\poem@lineparseend
+\endgroup
+        \the\bidipoem@p@ftn
+        \global\bidipoem@p@ftn{}%
+\par
+\vskip\baselineskip
+\poemskip
+\ifdim\new@poem@width<\poem@width
+\global\let\poem@needrun\relax
+\fi
+        \poem@write@aux{poem@width@\romannumeral\c@poem@no}{\new@poem@width}%
+\ifx\AtEndDocument\undefined\poem@finish\fi
+}
+\long\def\bidipoem@p@ftntext#1{%
+  \edef\@tempx{\the\bidipoem@p@ftn\noexpand\footnotetext[\the\c@footnote]}%
+  \global\bidipoem@p@ftn\expandafter{\@tempx{#1}}}%
+\long\def\bidipoem@p@LTRftntext#1{%
+  \edef\@tempxi{\the\bidipoem@p@ftn\noexpand\LTRfootnotetext[\the\c@footnote]}%
+  \global\bidipoem@p@ftn\expandafter{\@tempxi{#1}}}%
+\long\def\bidipoem@p@RTLftntext#1{%
+  \edef\@tempxii{\the\bidipoem@p@ftn\noexpand\RTLfootnotetext[\the\c@footnote]}%
+  \global\bidipoem@p@ftn\expandafter{\@tempxii{#1}}}%
+\newenvironment{traditionalpoem}{\@traditionalpoem}{\@endtraditionalpoem}
+\expandafter\def\csname traditionalpoem*\endcsname{\let\poem@obeylines=\obeylines\traditionalpoem}
+\expandafter\def\csname endtraditionalpoem*\endcsname{\endtraditionalpoem}
+\def\poem@finish{%
+\poem@write@aux{max@poem@no}{\number\c@poem@no}%
+\ifx\poem@needrun\relax
+\PackageWarning{bidipoem}{Unjustified poem.  Rerun XeLaTeX to get poem right}%
+\global\let\poem@needrun\undefined
+\fi
+}
+\ifx\AtEndDocument\undefined\else\AtEndDocument\poem@finish\fi
+\newcounter{poem@no}\setcounter{poem@no}{\z@}
+\ifx\max@poem@no\undefined
+        \def\max@poem@no{0}%
+\fi
+\newcommand{\poem@prop}[1]{\@nameuse{#1@\romannumeral\c@poem@no}}
+\newcommand{\poem@write@aux}[2]{%
+        \def\@x{\immediate\write\@auxout{\global\noexpand\@namedef{#1}{#2}}}%
+        \@x
+}
+\def\@modernpoem{%
+\par
+\begingroup
+        \let\@footnotetext\bidipoem@p@ftntext
+        \let\@LTRfootnotetext\bidipoem@p@LTRftntext
+        \let\@RTLfootnotetext\bidipoem@p@RTLftntext
+\parskip=\z@
+\parindent=\z@
+\def\[{\@settab\@tabplus\ignorespaces}%
+\def\]{\@tabminus\ignorespaces}%
+\def\newblock{\poemblocksep}%
+\let\newpoem@tabcr\@tabcr
+\def\par{% Redefine \par for possible \obeylines
+  \ifpoem@started\else
+    \ifdim\wd\@curline>\z@\global\poem@startedtrue\else
+      \@stopfield
+      \ifdim\wd\@curfield>\z@\global\poem@startedtrue\fi
+      \@contfield
+    \fi
+  \fi
+  \ifpoem@started\newpoem@tabcr\fi}%
+\def\@tabcr{\global\poem@startedtrue\newpoem@tabcr}%
+\global\poem@startedfalse
+\csname poem@obeylines\endcsname
+\let\poem@obeylines\relax
+\begin{tabbing}%
+}
+\def\@endmodernpoem{%
+\global\poem@startedfalse
+\ifdim\wd\@curline>\z@\global\poem@startedtrue\else
+  \@stopfield
+  \ifdim\wd\@curfield>\z@\global\poem@startedtrue\fi
+  \@contfield
+\fi
+\ifpoem@started\else\let\@stopline\@stopfield\fi
+\end{tabbing}%
+\endgroup
+        \the\bidipoem@p@ftn
+        \global\bidipoem@p@ftn{}%
+\par
+}
+\newenvironment{modernpoem}{\@modernpoem}{\@endmodernpoem}
+\expandafter\def\csname modernpoem*\endcsname{\let\poem@obeylines=\obeylines\modernpoem}
+\expandafter\def\csname endmodernpoem*\endcsname{\endmodernpoem}
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% 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 `bidipoem.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidipresentation.cls b/Master/texmf-dist/tex/xelatex/bidi/bidipresentation.cls
index 8d74f9d211c..e412454de34 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidipresentation.cls
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidipresentation.cls
@@ -1,13 +1,9 @@
 %%
 %% This is file `bidipresentation.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bidipresentation.cls')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -86,7 +82,7 @@
                {\endlist}
 
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/book-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/book-bidi.def
index 4cc8f7dfefb..7adaa49516b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/book-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/book-bidi.def
@@ -1,17 +1,108 @@
 %%
 %% This is file `book-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `book-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{book-bidi.def}[2010/03/01 v0.2 adaptations for standard book class]
+  \if@titlepage
+  \renewcommand\maketitle{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\LARGE \@title \par}%
+    \vskip 3em%
+    {\large
+     \lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\large \@date \par}%       % Set date in \large size.
+  \end{center}\par
+  \@thanks
+  \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\else
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb@xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\def\@maketitle{%
+  \newpage
+  \null
+  \vskip 2em%
+  \begin{center}%
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+    {\LARGE \@title \par}%
+    \vskip 1.5em%
+    {\large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+    \vskip 1em%
+    {\large \@date}%
+  \end{center}%
+  \par
+  \vskip 1.5em}
+\fi
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
@@ -41,7 +132,7 @@
 \renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}
 \def\@makechapterhead#1{%
   \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft \normalfont
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi \normalfont
     \ifnum \c@secnumdepth >\m@ne
       \if@mainmatter
         \huge\bfseries \@chapapp\space \thechapter
@@ -55,7 +146,7 @@
   }}
 \def\@makeschapterhead#1{%
   \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi
     \normalfont
     \interlinepenalty\@M
     \Huge \bfseries  #1\par\nobreak
@@ -91,15 +182,15 @@
 \if@twoside
   \def\ps@headings{%
       \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\beginR\leftmark\endR}%
+      \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{%
- \beginR\@chapapp\ \thechapter.\,\,\endR%
+ \if@RTLmain\beginR\fi\@chapapp\ \thechapter.\,\,\if@RTLmain\endR\fi%
         \ifnum \c@secnumdepth >\m@ne
           \if@mainmatter
-           \beginR##1\endR
+           \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
           \fi
         \fi
         }}{}}%
@@ -109,22 +200,22 @@
 }
     \def\sectionmark##1{%
       \markright {\MakeUppercase{%
-\beginR\thesection\endR\,
+\if@RTLmain\beginR\fi\thesection\if@RTLmain\endR\fi\,
         \ifnum \c@secnumdepth >\z@
-          \beginR##1\endR \ %
+          \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi \ %
         \fi
         }}}}
 \else
   \def\ps@headings{%
     \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
+    \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi}%
     \let\@mkboth\markboth
     \def\chaptermark##1{%
       \markright {\MakeUppercase{%
-       \beginR\@chapapp\ \thechapter. \endR %
+       \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \if@RTLmain\endR\fi %
         \ifnum \c@secnumdepth >\m@ne
           \if@mainmatter
-            \beginR##1\endR
+            \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
           \fi
         \fi
         }}}}
@@ -133,7 +224,7 @@
 \pagestyle{headings}
 \def\@idxitem{\par\hangindent -40\p@}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bookest-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/bookest-bidi.def
index 7b993f8a0bd..9969102163e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bookest-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/bookest-bidi.def
@@ -1,21 +1,18 @@
 %%
 %% This is file `bookest-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `bookest-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   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@ \raggedleft \normalfont
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi \normalfont
     \ifnum \c@secnumdepth >\m@ne
       \if@mainmatter
         {\colorA\huge\scshape \@chapapp\space \thechapter}
@@ -77,7 +74,7 @@
 }
 \NoHyper
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/breqn-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/breqn-bidi.def
new file mode 100644
index 00000000000..d5fd237e0c5
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/breqn-bidi.def
@@ -0,0 +1,80 @@
+%%
+%% This is file `breqn-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{breqn-bidi.def}[2010/03/01 v0.1 adaptations for breqn package]
+\def\@dmath[#1]{\if@RTL\@RTLfalse\fi%
+  \everydisplay\expandafter{\the\everydisplay \display@setup}%
+  \if@noskipsec \leavevmode \fi
+  \if@inlabel \leavevmode \global\@inlabelfalse \fi
+  \if\eq@group\else\eq@prelim\fi
+  \setkeys{breqn}{#1}%
+  \the\eqstyle
+  \eq@setnumber
+  \begingroup
+  \eq@setup@a
+  \eq@startup
+}
+\def\@dgroup[#1]{\if@RTL\@RTLfalse\fi%
+  \let\eq@group\@True \global\let\eq@GRP@first@dmath\@True
+  \global\GRP@queue\@emptytoks \global\setbox\GRP@box\box\voidb@x
+  \global\let\GRP@label\@empty
+  \global\grp@wdL\z@\global\grp@wdR\z@\global\grp@wdT\z@
+  \global\grp@linewidth\z@\global\grp@wdNum\z@
+  \global\let\grp@eqs@numbered\@False
+  \global\let\grp@aligned\@True
+  \global\let\grp@shiftnumber\@False
+  \eq@prelim
+  \setkeys{breqn}{#1}%
+  \if\grp@hasNumber \grp@setnumber \fi
+}
+\def\@dseries[#1]{\if@RTL\@RTLfalse\fi%
+  \let\display@setup\dseries@display@setup
+  % Question: should this be the default for dseries???
+  \global\eq@wdCond\z@
+  \@dmath[layout={M},#1]%
+  \mathsurround\z@\@@math \penalty\@Mi
+  \let\endmath\ends@math
+  \def\premath{%
+    \ifdim\lastskip<.3em \unskip
+    \else\ifnum\lastpenalty<\@M \dquad\fi\fi
+}%
+  \def\postmath{\unpenalty\eq@addpunct \penalty\intermath@penalty \dquad \@ignoretrue}%
+\ignorespaces
+}
+\def\eqnumform#1{\if@Latin\else\beginR\@RTLtrue\fi(#1\@@italiccorr)\if@Latin\else\endR\fi}
+\renewenvironment{dsuspend}{%
+  \global\setbox\EQ@box\vbox\bgroup\if@Latin\else\@RTLtrue\fi \@parboxrestore
+    \parshape 1 \displayindent \displaywidth\relax
+    \hsize=\columnwidth \noindent\ignorespaces
+}{%
+  \par\egroup
+  \global\setbox\GRP@box\vbox{%
+    \hbox{\copy\EQ@box\vtop{\unvbox\EQ@box}}%
+    \unvbox\GRP@box
+  }%
+  \global\GRP@queue\@xp{\the\GRP@queue
+     \@elt{\let\eq@isIntertext\@True}%
+  }%
+}
+%% 
+%% 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 `breqn-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/color-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/color-bidi.def
new file mode 100644
index 00000000000..bf1612373c0
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/color-bidi.def
@@ -0,0 +1,66 @@
+%%
+%% This is file `color-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{color-bidi.def}[2010/03/01 v0.1 adaptations for color package]
+\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}%
+ \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@
+ \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@
+ {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}%
+      \box\z@}}\if@RTL\endL\fi}
+\DeclareRobustCommand\color{%
+  \ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\@ifnextchar[\@undeclaredcolor\@declaredcolor}
+\def\@declaredcolor#1{%
+  \@ifundefined{\string\color @#1}%
+    {\c@lor@error{`#1'}}%
+    {\expandafter\let\expandafter\current@color
+     \csname\string\color @#1\endcsname
+     \set@color}%
+  \ignorespaces\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
+\def\@undeclaredcolor[#1]#2{%
+  \@ifundefined{color@#1}%
+    {\c@lor@error{model `#1'}}%
+    {\csname color@#1\endcsname\current@color{#2}%
+     \set@color}%
+  \ignorespaces\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
+\DeclareRobustCommand\bidicolor{%
+  \@ifnextchar[\@bidiundeclaredcolor\@bidideclaredcolor}
+\def\@bidiundeclaredcolor[#1]#2{%
+  \@ifundefined{color@#1}%
+    {\c@lor@error{model `#1'}}%
+    {\csname color@#1\endcsname\current@color{#2}%
+     \set@color}%
+  \ignorespaces}
+\def\@bidideclaredcolor#1{%
+  \@ifundefined{\string\color @#1}%
+    {\c@lor@error{`#1'}}%
+    {\expandafter\let\expandafter\current@color
+     \csname\string\color @#1\endcsname
+     \set@color}%
+  \ignorespaces}
+\def\color@box#1#2{\color@b@x\relax{\bidicolor#1{#2}}}
+\def\color@fbox#1#2#3{%
+  \color@b@x{\fboxsep\z@\bidicolor#1{#2}\fbox}{\bidicolor#1{#3}}}
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% 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 `color-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/colortbl-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/colortbl-bidi.def
new file mode 100644
index 00000000000..1c60f587434
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/colortbl-bidi.def
@@ -0,0 +1,63 @@
+%%
+%% This is file `colortbl-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{colortbl-bidi.def}[2010/03/01 v0.1 adaptations for colortbl package]
+\def\CT@setup{%
+  \@tempdimb\col@sep
+  \@tempdimc\col@sep
+  \def\CT@color{%
+    \global\let\CT@do@color\CT@@do@color
+    \bidicolor}}
+\def\@classz{\@classx
+   \@tempcnta \count@
+   \prepnext@tok
+\expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil
+   \@addtopreamble{\if@RTL\beginL\fi%
+    \setbox\z@\hbox\bgroup\bgroup\if@RTL\beginR\fi
+      \ifcase \@chnum
+      \hskip\stretch{.5}\kern\z@
+      \d@llarbegin
+      \insert@column
+      \d@llarend\hskip\stretch{.5}\or
+      \d@llarbegin \insert@column \d@llarend \hfill \or
+      \hfill\kern\z@ \d@llarbegin \insert@column \d@llarend \or
+   $\vcenter
+   \@startpbox{\@nextchar}\insert@column \@endpbox $\or
+   \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
+   \vbox \@startpbox{\@nextchar}\insert@column \@endpbox
+  \fi
+ \if@RTL\endR\fi\egroup\egroup
+\begingroup
+  \CT@setup
+  \CT@column@color
+  \CT@row@color
+  \CT@cell@color
+  \CT@do@color
+\endgroup
+        \@tempdima\ht\z@
+        \advance\@tempdima\minrowclearance
+        \vrule\@height\@tempdima\@width\z@
+        \unhbox\z@\if@RTL\endL\fi}%
+  \prepnext@tok}
+%% 
+%% 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 `colortbl-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
deleted file mode 100644
index f9e1cc3d68b..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
+++ /dev/null
@@ -1,118 +0,0 @@
-%%
-%% This is file `cvthemebidicasual.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `cvthemebidicasual.sty')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 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}
-\familynamecolour{808080}
-\firstnamecolour{A9A9A9}
-\quotecolour{696969}
-\addresscolour{696969}
-\definecolor{sectionrectanglecolour}{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}
-\if@colourorange
-  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.65,0.20}
-  \sectiontitlecolour{FF8C00}
-  \subsectioncolour{FF8C00}
-  \definecolor{footersymbolcolour}{rgb}{0.95,0.55,0.15}\fi
-\if@colourgreen
-  \definecolor{sectionrectanglecolour}{rgb}{0.55,0.85,0.35}
-  \sectiontitlecolour{008000}
-  \subsectioncolour{008000}
-  \definecolor{footersymbolcolour}{rgb}{0.30,0.65,0.15}\fi
-\if@colourred
-  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.30,0.30}
-  \sectiontitlecolour{FF0000}
-  \subsectioncolour{FF0000}
-  \definecolor{footersymbolcolour}{rgb}{0.95,0.20,0.20}\fi
-\if@colourgrey
-  \definecolor{sectionrectanglecolour}{rgb}{0.75,0.75,0.75}
-  \sectiontitlecolour{808080}
-  \subsectioncolour{808080}
-  \definecolor{footersymbolcolour}{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}}%
-      {}%
-      {{\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
-    \hfill%
-    \raggedleft{\beginR\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}\endR}\endL\\[-.35em]}%
-  {\beginL\psline[linewidth=2pt,linecolor=rulecolour](-11.2,-0.2)(5.6,-0.2)\endL\\[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%
-    { ~~\beginL\psdot[linecolor=footersymbolcolour](0,0.1)\endL~~~}\fi}
-\providecommand*{\makefooter}{}
-\renewcommand*{\makefooter}{%
-  \fancypagestyle{plain}{%
-    \fancyfoot[c]{%
-      \parbox{0.8\textwidth}{%
-      \centering%
-      \addressfont\@addresscolour%
-      \ifthenelse{\isundefined{\@address}}{}{%
-        \beginR\addresssymbol~\@address\endR\\%
-        \@firstfooterelementfalse}%
-      \beginR\ifthenelse{\isundefined{\@mobile}}{}{\beginR\mobilesymbol~\@mobile\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@phone}}{}{\footersymbol\beginR\phonesymbol~\@phone\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@fax}}{}{\footersymbol\beginR\faxsymbol~\@fax\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@email}}{}{\footersymbol\beginR\emailsymbol~\emaillink{\@email}\endR\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@extrainfo}}{}{\beginR\footersymbol\@extrainfo\endR\@firstfooterelementfalse}\endR}}%
-  }%
-  \pagestyle{plain}}
-\AtBeginDocument{\makefooter}
-
-%% 
-%% Copyright © 2009      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
deleted file mode 100644
index e297fc97e0c..00000000000
--- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty
+++ /dev/null
@@ -1,130 +0,0 @@
-%%
-%% This is file `cvthemebidiclassic.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `cvthemebidiclassic.sty')
-%% 
-%%   __________________________________
-%%   Copyright © 2009 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}
-\sectiontitlecolour{1E90FF}
-\subsectioncolour{4682B4}
-\if@colourorange
-  \addresscolour{FF8C00}
-  \definecolor{sectionrectanglecolour}{rgb}{1.00,0.65,0.20}
-  \sectiontitlecolour{FF8C00}
-  \subsectioncolour{FF8C00}\fi
-\if@colourgreen
-  \addresscolour{008000}
-  \definecolor{sectionrectanglecolour}{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}
-  \sectiontitlecolour{FF0000}
-  \subsectioncolour{FF0000}\fi
-\if@colourgrey
-  \addresscolour{808080}
-  \definecolor{sectionrectanglecolour}{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}\framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}}\\[3em]%
-  % optional quote
-  \ifthenelse{\isundefined{\@quote}}%
-    {}%
-    {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}%
-  }
-
-%% 
-%% Copyright © 2009      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-bidi.def
index 6238ed1db95..51ec5a6fb31 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-bidi.def
@@ -1,21 +1,18 @@
 %%
 %% This is file `draftwatermark-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `draftwatermark-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{draftwatermark-bidi.def}[2010/03/01 v0.2 adaptations for draftwatermark package]
 \renewcommand\SetWatermarkText[1]{%
-  \def\sc@wm@text{\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
+  \def\sc@wm@text{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi}}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extbook-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extbook-bidi.def
index daaf4374160..9f25e652eb1 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/extbook-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/extbook-bidi.def
@@ -1,17 +1,108 @@
 %%
 %% This is file `extbook-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `extbook-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{extbook-bidi.def}[2010/03/01 v0.1 adaptations for extbook class]
+  \if@titlepage
+  \renewcommand\maketitle{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\LARGE \@title \par}%
+    \vskip 3em%
+    {\large
+     \lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\large \@date \par}%       % Set date in \large size.
+  \end{center}\par
+  \@thanks
+  \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\else
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb@xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\def\@maketitle{%
+  \newpage
+  \null
+  \vskip 2em%
+  \begin{center}%
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+    {\LARGE \@title \par}%
+    \vskip 1.5em%
+    {\large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+    \vskip 1em%
+    {\large \@date}%
+  \end{center}%
+  \par
+  \vskip 1.5em}
+\fi
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
@@ -40,7 +131,7 @@
 \renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}
 \def\@makechapterhead#1{%
   \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft \normalfont
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi \normalfont
     \ifnum \c@secnumdepth >\m@ne
       \if@mainmatter
         \huge\bfseries \@chapapp\space \thechapter
@@ -55,7 +146,7 @@
 
 \def\@makeschapterhead#1{%
   \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi
     \normalfont
     \interlinepenalty\@M
     \Huge \bfseries  #1\par\nobreak
@@ -90,15 +181,15 @@
 \if@twoside
   \def\ps@headings{%
       \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\beginR\rightmark\endR\hfil\thepage}%
-      \def\@oddhead{\sl\thepage\hfil\beginR\leftmark\endR}%
+      \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{%
- \beginR\@chapapp\ \thechapter.\,\,\endR%
+ \if@RTLmain\beginR\fi\@chapapp\ \thechapter.\,\,\if@RTLmain\endR\fi%
         \ifnum \c@secnumdepth >\m@ne
           \if@mainmatter
-           \beginR##1\endR
+           \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
           \fi
         \fi
         }}{}}%
@@ -108,22 +199,22 @@
 }
     \def\sectionmark##1{%
       \markright {\MakeUppercase{%
-\beginR\thesection\endR\,
+\if@RTLmain\beginR\fi\thesection\if@RTLmain\endR\fi\,
         \ifnum \c@secnumdepth >\z@
-          \beginR##1\endR \ %
+          \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi \ %
         \fi
         }}}}
 \else
   \def\ps@headings{%
     \let\@oddfoot\@empty
-    \def\@oddhead{\sl\thepage\hfil\beginR\rightmark\endR}%
+    \def\@oddhead{\sl\thepage\hfil\if@RTLmain\beginR\fi\rightmark\if@RTLmain\endR\fi}%
     \let\@mkboth\markboth
     \def\chaptermark##1{%
       \markright {\MakeUppercase{%
-       \beginR\@chapapp\ \thechapter. \endR %
+       \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \if@RTLmain\endR\fi %
         \ifnum \c@secnumdepth >\m@ne
           \if@mainmatter
-            \beginR##1\endR
+            \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi
           \fi
         \fi
         }}}}
@@ -132,7 +223,7 @@
 \pagestyle{headings}
 \def\@idxitem{\par\hangindent -40\p@}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-bidi.def
index 29dcd17192b..a8c0fb77c44 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-bidi.def
@@ -1,29 +1,26 @@
 %%
 %% This is file `fancyhdr-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `fancyhdr-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
-\def\@fancyhead#1#2#3#4#5{\beginR#1\endR\hbox to\headwidth{\fancy@reset
+\ProvidesFile{fancyhdr-bidi.def}[2010/03/01 v0.2 adaptations for fancyhdr package]
+\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}{\raggedright\beginR#2\endR}}\hfill
-      \parbox[b]{\headwidth}{\centering\beginR#3\endR}\hfill
-      \llap{\parbox[b]{\headwidth}{\raggedleft\beginR#4\endR}}}\headrule}}\beginR#5\endR}
-\def\@fancyfoot#1#2#3#4#5{\beginR#1\endR\hbox to\headwidth{\fancy@reset
+    {\rlap{\parbox[b]{\headwidth}{\if@RTLmain\raggedleft\else\raggedright\fi\if@RTLmain\beginR\fi#2\if@RTLmain\endR\fi}}\hfill
+      \parbox[b]{\headwidth}{\centering\if@RTLmain\beginR\fi#3\if@RTLmain\endR\fi}\hfill
+      \llap{\parbox[b]{\headwidth}{\if@RTLmain\raggedright\else\raggedleft\fi\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}\headrule}}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi}
+\def\@fancyfoot#1#2#3#4#5{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi\hbox to\headwidth{\fancy@reset
     \@fancyvbox\footskip{\footrule
-      \hbox{\rlap{\parbox[t]{\headwidth}{\raggedright\beginR#2\endR}}\hfill
-        \parbox[t]{\headwidth}{\centering\beginR#3\endR}\hfill
-        \llap{\parbox[t]{\headwidth}{\raggedleft\beginR#4\endR}}}}}\beginR#5\endR}
+      \hbox{\rlap{\parbox[t]{\headwidth}{\if@RTLmain\raggedleft\else\raggedright\fi\if@RTLmain\beginR\fi#2\if@RTLmain\endR\fi}}\hfill
+        \parbox[t]{\headwidth}{\centering\if@RTLmain\beginR\fi#3\if@RTLmain\endR\fi}\hfill
+        \llap{\parbox[t]{\headwidth}{\if@RTLmain\raggedright\else\raggedleft\fi\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}}}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fleqn-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fleqn-bidi.def
new file mode 100644
index 00000000000..cb0fb2e1765
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/fleqn-bidi.def
@@ -0,0 +1,55 @@
+%%
+%% This is file `fleqn-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{fleqn-bidi.def}[2010/03/01 v0.1 adaptations for fleqn tag]
+\renewcommand\[{\relax
+                \ifmmode\@badmath
+                \else
+                  \begin{trivlist}%
+                    \@beginparpenalty\predisplaypenalty
+                    \@endparpenalty\postdisplaypenalty
+                    \item[]\leavevmode
+                    \hb@xt@\linewidth\bgroup \beginL$\m@th\displaystyle %$
+                      \hskip\mathindent\bgroup
+                \fi}
+\renewcommand\]{\relax
+                \ifmmode
+                      \egroup $\hfil% $
+                    \endL\egroup
+                  \end{trivlist}%
+                \else \@badmath
+                \fi}
+\renewenvironment{equation}%
+    {\@beginparpenalty\predisplaypenalty
+     \@endparpenalty\postdisplaypenalty
+     \refstepcounter{equation}%
+     \trivlist \item[]\leavevmode
+       \hb@xt@\linewidth\bgroup\beginL $\m@th% $
+         \displaystyle
+         \hskip\mathindent}%
+        {$\hfil % $
+         \displaywidth\linewidth\hbox{\@eqnnum}%
+       \endL\egroup
+     \endtrivlist}
+%% 
+%% 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 `fleqn-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/flowfram-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/flowfram-bidi.def
new file mode 100644
index 00000000000..ba1aca3f617
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/flowfram-bidi.def
@@ -0,0 +1,155 @@
+%%
+%% This is file `flowfram-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{flowfram-bidi.def}[2010/03/01 v0.1 adaptations for flowfram package]
+\def\@outputdblcol{%
+\@nxtcol=\c@thisframe
+\c@curpg=\c@page
+\@g@tnextcol{\@nxtcol}%
+\if@ff@nwpg % next flow frame starts on new page
+  \global\@firstcolumntrue
+  \@setcolbox\c@thisframe
+  \if@specialpage
+    \global\@specialpagefalse
+    \@nameuse{ps@\@specialstyle}\relax
+  \fi
+  \if@twoside
+    \ifodd\count\z@
+      \let\@thehead\@oddhead
+      \let\@thefoot\@oddfoot
+    \else
+      \let\@thehead\@evenhead
+      \let\@thefoot\@evenfoot
+    \fi
+  \else
+    \let\@thehead\@oddhead
+    \let\@thefoot\@oddfoot
+  \fi
+  \@begindvi
+  \@dodynamicthehead\@dodynamicthefoot
+  \vbadness=\@M
+  \setbox\@outputbox\vbox{\hbox to \textwidth{\@ff@do@allframes}}%
+  \@combinedblfloats
+  \@outputpage
+\advance\c@curpg by -\c@page\relax
+  \whiledo{\c@curpg>0}{\advance\c@curpg by -1\relax
+  \setbox\@outputbox\vbox{\hbox to \textwidth{\@ff@do@allframes}}%
+\@outputpage}
+  \begingroup
+    \@dblfloatplacement
+    \@startdblcolumn
+    \@whilesw \if@fcolmade \fi
+       {\@outputpage \@startdblcolumn }\endgroup
+  \@resetst@tics
+  \@resetdyn@mics
+\else % still on same page, save contents of box255
+  \global\@firstcolumnfalse
+  \@setcolbox\c@thisframe
+\fi
+\global\c@thisframe=\@nxtcol
+\@setcol{\c@thisframe}\relax
+\global\@colht\vsize
+}
+\def\@outputpage{%
+\begingroup
+  \let\protect\noexpand
+  \@resetactivechars
+  \global\let\@@if@newlist\if@newlist
+  \global\@newlistfalse\@parboxrestore
+  \shipout\vbox{\set@typeset@protect
+    \aftergroup
+    \endgroup
+    \aftergroup
+    \set@typeset@protect
+    \reset@font\normalsize\normalsfcodes
+    \let\label\@gobble
+    \let\index\@gobble
+    \let\glossary\@gobble
+    \baselineskip\z@skip
+    \lineskip\z@skip
+    \lineskiplimit\z@
+    \vskip\topmargin\moveright\@themargin
+    \vbox{%
+      \vskip\headheight
+      \vskip\headsep
+      \box\@outputbox
+    }}%
+  \global\let\if@newlist\@@if@newlist
+  \stepcounter{page}%
+  \setcounter{displayedframe}{0}%
+  \let\firstmark\botmark}
+
+
+\newcommand*\bidi@s@tfftextcol{\ifthenelse{\equal{\ff@txtcol}{}}{}{%
+\expandafter\bidicolor\ff@txtcol}}
+
+\newcommand{\bidi@ff@box}[3]{{\@ffbackground{\vbox to#2
+{\hb@xt@ #1{\hss{\bidi@s@tfftextcol #3}\hss}\vss\kern\z@}}}}
+
+
+\renewcommand*{\@docolbox}[1]{%
+\edef\ff@frametype{%
+\csname @ff@frametype@\romannumeral#1\endcsname}%
+\edef\ff@col{\csname @ff@col@\romannumeral#1\endcsname}%
+\edef\ff@txtcol{\csname @ff@txtcol@\romannumeral#1\endcsname}%
+\edef\ff@backcol{\csname @ff@backcol@\romannumeral#1\endcsname}%
+\@ff@setoffset{#1}%
+\rotateframe{\csname @ff@angle@\romannumeral#1\endcsname}{%
+\ifthenelse{\boolean{columnframe\romannumeral#1}}{%
+\@ff@fbox{\csname colwidth\romannumeral#1\endcsname}%
+{\csname colheight\romannumeral#1\endcsname}{%
+\expandafter\box\csname column\romannumeral#1\endcsname}{%
+\csname\ff@frametype\endcsname}%
+}{%
+\bidi@ff@box{\csname colwidth\romannumeral#1\endcsname}%
+{\csname colheight\romannumeral#1\endcsname}{%
+\expandafter\box\csname column\romannumeral#1\endcsname}%
+}}}
+\@ifclassloaded{book}{%
+\renewcommand\theequation
+  {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
+\renewcommand \thefigure
+     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@figure}
+\renewcommand \thetable
+     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@table}
+\renewcommand \thechapter {\@arabic\c@chapter}
+\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}}{}
+\@ifclassloaded{report}{%
+\renewcommand\theequation
+  {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation}
+\renewcommand \thefigure
+     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@figure}
+\renewcommand \thetable
+     {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@table}
+\renewcommand \thechapter {\@arabic\c@chapter}
+\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}}{}
+%% 
+%% 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 `flowfram-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnote-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/footnote-bidi.def
index 25d2a504f1b..9ce5054aeeb 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/footnote-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/footnote-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `footnote-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `footnote-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{footnote-bidi.def}[2010/03/01 v0.4 footnote macros for bidi package]
 \if@RTLmain\@RTL@footnotetrue\else\@RTL@footnotefalse\fi
 \def\bidi@footnote@output{{%
     \dimen0=\ht\footins
@@ -86,15 +83,15 @@
 \DeclareRobustCommand\EInLTR{\endinsertLTR}
 \DeclareRobustCommand\InRTL{\insertRTL}
 \DeclareRobustCommand\EInRTL{\endinsertRTL}
-\def\parse@lsent#1#2\EInLTR#3#4#5\parse@end{\@sentdirfalse
+\long\def\parse@lsent#1#2\EInLTR#3#4#5\parse@end{\@sentdirfalse
 \def\@tempa{\InLTR}\def\@tempb{\EInLTR}\def\@tempc{#1}\def\@tempd{#4}%
 \ifx\@tempa\@tempc\ifx\@tempb\@tempd\@sentdirtrue\fi\fi}
-\def\parse@rsent#1#2\EInRTL#3#4#5\parse@end{\@sentdirfalse
+\long\def\parse@rsent#1#2\EInRTL#3#4#5\parse@end{\@sentdirfalse
 \def\@tempa{\InRTL}\def\@tempb{\EInRTL}\def\@tempc{#1}\def\@tempd{#4}%
 \ifx\@tempa\@tempc\ifx\@tempb\@tempd\@sentdirtrue\fi\fi}
-\def\iflsentence#1{\parse@lsent#1\EInLTR123\parse@end\if@sentdir}
-\def\ifrsentence#1{\parse@rsent#1\EInRTL123\parse@end\if@sentdir}
-\def\bidi@footnotetext@dir#1{%
+\long\def\iflsentence#1{\parse@lsent#1\EInLTR123\parse@end\if@sentdir}
+\long\def\ifrsentence#1{\parse@rsent#1\EInRTL123\parse@end\if@sentdir}
+\long\def\bidi@footnotetext@dir#1{%
    \@tempswatrue
    \ifrsentence{#1}\rtl\@tempswafalse\fi
    \iflsentence{#1}\ltr\@tempswafalse\fi
@@ -122,7 +119,7 @@
     \hsize\columnwidth \@parboxrestore
     \bidi@footnotetext@dir{#1}%
     \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\strut}}%
+    {\rule{\z@}{\footnotesep}\ignorespaces#1\strut}}%
      \bidi@footnotetext@after
     \insert\footins{\unvbox\footins}%
     \endgroup}
@@ -150,51 +147,51 @@
     \hsize\columnwidth \@parboxrestore
     \bidi@footnotetext@dir{#1}%
     \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\rmfamily #1\strut}}%
+    {\rule{\z@}{\footnotesep}\ignorespaces#1\strut}}%
      \bidi@footnotetext@after
     \insert\footins{\unvbox\footins}%
     \endgroup}
-\long\def\@mpRTLfootnotetext#1{
-  \global\setbox\@mpfootins\vbox{\@RTLtrue
+\long\def\@mpRTLfootnotetext#1{%
+  \global\setbox\@mpfootins\vbox{\@RTLtrue%
     \unvbox\@mpfootins
     \reset@font\footnotesize
     \hsize\columnwidth
     \@parboxrestore
     \protected@edef\@currentlabel
-         {\csname p@mpfootnote\endcsname\@thefnmark}
+         {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
      \bidi@footnotetext@dir{#1}
-    \if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi
-      \@makefntext{
-        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}
+    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}
-\long\def\@mpLTRfootnotetext#1{
-  \global\setbox\@mpfootins\vbox{\@RTLfalse
+\long\def\@mpLTRfootnotetext#1{%
+  \global\setbox\@mpfootins\vbox{\@RTLfalse%
     \unvbox\@mpfootins
     \reset@font\footnotesize
     \hsize\columnwidth
     \@parboxrestore
     \protected@edef\@currentlabel
-         {\csname p@mpfootnote\endcsname\@thefnmark}
+         {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
      \bidi@footnotetext@dir{#1}
-    \if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi
-      \@makefntext{
-        \rule\z@\footnotesep\ignorespaces\rmfamily#1\@finalstrut\strutbox}
+    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}
-\long\def\@mpfootnotetext#1{
-  \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi
+\long\def\@mpfootnotetext#1{%
+  \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
     \unvbox\@mpfootins
     \reset@font\footnotesize
     \hsize\columnwidth
     \@parboxrestore
     \protected@edef\@currentlabel
-         {\csname p@mpfootnote\endcsname\@thefnmark}
+         {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
      \bidi@footnotetext@dir{#1}
-    \if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi
-      \@makefntext{
-        \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\@finalstrut\strutbox}
+    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}
 \def\@iiiminipage#1#2[#3]#4{%
   \leavevmode
@@ -213,8 +210,37 @@
       \let\@listdepth\@mplistdepth \@mplistdepth\z@
       \@minipagerestore
       \@setminipage}
+\def\LTRthanks#1{\footnotemark
+    \protected@xdef\@thanks{\@thanks
+        \protect\LTRfootnotetext[\the\c@footnote]{#1}}%
+}
+\def\LTRfootnotetext{%
+     \@ifnextchar [\@xLTRfootnotenext
+       {\protected@xdef\@thefnmark{\thempfn}%
+    \@LTRfootnotetext}}
+\def\@xLTRfootnotenext[#1]{%
+  \begingroup
+     \csname c@\@mpfn\endcsname #1\relax
+     \unrestored@protected@xdef\@thefnmark{\thempfn}%
+  \endgroup
+  \@LTRfootnotetext}
+\def\RTLthanks#1{\footnotemark
+    \protected@xdef\@thanks{\@thanks
+        \protect\RTLfootnotetext[\the\c@footnote]{#1}}%
+}
+\let\@thanks\@empty
+\def\RTLfootnotetext{%
+     \@ifnextchar [\@xRTLfootnotenext
+       {\protected@xdef\@thefnmark{\thempfn}%
+    \@RTLfootnotetext}}
+\def\@xRTLfootnotenext[#1]{%
+  \begingroup
+     \csname c@\@mpfn\endcsname #1\relax
+     \unrestored@protected@xdef\@thefnmark{\thempfn}%
+  \endgroup
+  \@RTLfootnotetext}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/graphicx-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/graphicx-bidi.def
index c46d3570e88..71b4c27904e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/graphicx-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/graphicx-bidi.def
@@ -1,18 +1,39 @@
 %%
 %% This is file `graphicx-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `graphicx-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
-\def\Gin@ii[#1]#2{%
+\ProvidesFile{graphicx-bidi.def}[2010/03/01 v0.3 adaptations for graphicx package]
+\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}}%
+  \Grot@x\z@
+  \Grot@y\z@
+  \Grot@box\ifmmode\else\if@RTL\endL\fi\fi}
+\long\def\Gscale@box#1[#2]#3{\ifmmode\else\if@RTL\beginL\fi\fi%
+  \leavevmode
+  \def\Gscale@x{#1}\def\Gscale@y{#2}%
+  \setbox\z@\hbox{{#3}}%
+  \setbox\tw@\hbox{\Gscale@start\rlap{\copy\z@}\Gscale@end}%
+  \ifdim#2\p@<\z@
+    \ht\tw@-#2\dp\z@
+    \dp\tw@-#2\ht\z@
+  \else
+    \ht\tw@#2\ht\z@
+    \dp\tw@#2\dp\z@
+  \fi
+  \ifdim#1\p@<\z@
+    \hb@xt@-#1\wd\z@{\kern-#1\wd\z@\box\tw@\hss}%
+  \else
+    \wd\tw@#1\wd\z@
+    \box\tw@
+  \fi\ifmmode\else\if@RTL\endL\fi\fi}
+\def\Gin@ii[#1]#2{\ifmmode\else\if@RTL\beginL\fi\fi%
     \def\@tempa{[}\def\@tempb{#2}%
     \ifx\@tempa\@tempb
       \def\@tempa{\Gin@iii[#1][}%
@@ -20,14 +41,80 @@
     \else
      \begingroup
        \@tempswafalse
-       \toks@{\beginL\Ginclude@graphics{#2}\endL}%
+       \toks@{\Ginclude@graphics{#2}}%
        \setkeys{Gin}{#1}%
        \Gin@esetsize
        \the\toks@
      \endgroup
-     \fi}%
+     \fi\ifmmode\else\if@RTL\endL\fi\fi}
+\def\reflectbox{\bidiGscale@box-1[1]}
+\long\def\bidiGscale@box#1[#2]#3{\ifmmode\else\if@RTL\beginL\fi\fi%
+  \leavevmode
+  \def\Gscale@x{#1}\def\Gscale@y{#2}%
+  \setbox\z@\hbox{{\ifmmode\if@RTL\beginR\fi#3\if@RTL\endR\fi\else\if@RTL\beginR\fi#3\if@RTL\endR\fi\fi}}%
+  \setbox\tw@\hbox{\Gscale@start\rlap{\copy\z@}\Gscale@end}%
+  \ifdim#2\p@<\z@
+    \ht\tw@-#2\dp\z@
+    \dp\tw@-#2\ht\z@
+  \else
+    \ht\tw@#2\ht\z@
+    \dp\tw@#2\dp\z@
+  \fi
+  \ifdim#1\p@<\z@
+    \hb@xt@-#1\wd\z@{\kern-#1\wd\z@\box\tw@\hss}%
+  \else
+    \wd\tw@#1\wd\z@
+    \box\tw@
+  \fi\ifmmode\else\if@RTL\endL\fi\fi}
+\def\scalebox#1{%
+  \@ifnextchar[{\bidiGscale@box{#1}}{\bidiGscale@box{#1}[#1]}}
+\def\resizebox{%
+  \leavevmode
+  \@ifstar{\bidiGscale@@box\totalheight}{\bidiGscale@@box\height}}
+\def\bidiGscale@@box#1#2#3{%
+  \let\@tempa\Gin@exclamation
+  \expandafter\def\expandafter\@tempb\expandafter{\string#2}%
+  \expandafter\def\expandafter\@tempc\expandafter{\string#3}%
+  \ifx\@tempb\@tempa
+    \ifx\@tempc\@tempa
+      \toks@{\mbox}%
+    \else
+      \toks@{\bidiGscale@box@dd{#3}#1}%
+    \fi
+  \else
+    \ifx\@tempc\@tempa
+      \toks@{\bidiGscale@box@dd{#2}\width}%
+    \else
+      \toks@{\bidiGscale@box@dddd{#2}\width{#3}#1}%
+    \fi
+  \fi
+  \the\toks@}
+\long\def\bidiGscale@box@dd#1#2#3{%
+  \@begin@tempboxa\hbox{\ifmmode\if@RTL\beginR\fi#3\if@RTL\endR\fi\else\if@RTL\beginR\fi#3\if@RTL\endR\fi\fi}%
+    \setlength\@tempdima{#1}%
+    \setlength\@tempdimb{#2}%
+    \Gscale@div\@tempa\@tempdima\@tempdimb
+    \Gscale@box\@tempa[\@tempa]{\box\@tempboxa}%
+  \@end@tempboxa}
+\long\def\bidiGscale@box@dddd#1#2#3#4#5{%
+  \@begin@tempboxa\hbox{\ifmmode\if@RTL\beginR\fi#5\if@RTL\endR\fi\else\if@RTL\beginR\fi#5\if@RTL\endR\fi\fi}%
+    \setlength\@tempdima{#1}%
+    \setlength\@tempdimb{#2}%
+    \Gscale@div\@tempa\@tempdima\@tempdimb
+    \setlength\@tempdima{#3}%
+    \setlength\@tempdimb{#4}%
+    \Gscale@div\@tempb\@tempdima\@tempdimb
+    \ifGin@iso
+      \ifdim\@tempa\p@>\@tempb\p@
+        \let\@tempa\@tempb
+      \else
+        \let\@tempb\@tempa
+      \fi
+    \fi
+    \Gscale@box\@tempa[\@tempb]{\box\@tempboxa}%
+  \@end@tempboxa}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/hyperref-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hyperref-bidi.def
index 7aaf3e7d94c..a5e3d744ced 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/hyperref-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/hyperref-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `hyperref-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `hyperref-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{hyperref-bidi.def}[2010/03/01 v0.2 adaptations for hyperref package]
 \AtBeginDocument{%
 \def\contentsline#1#2#3#4{%
   \ifx\\#4\\%
@@ -228,18 +225,18 @@
 \renewcommand\url[1]{\beginL\origin@url{#1}\endL}%
 \def\hyper@natlinkstart#1{%
   \Hy@backout{#1}%
-  \beginL\hyper@linkstart{cite}{cite.#1}%
+  \beginL\hyper@linkstart{cite}{cite.#1}\if@RTL\beginR\fi%
   \def\hyper@nat@current{#1}%
 }
 \def\hyper@natlinkend{%
-  \hyper@linkend\endL
+  \if@RTL\endR\fi\hyper@linkend\endL
 }
 \def\hyper@natlinkbreak#1#2{%
-  \hyper@linkend\endL#1\beginL\hyper@linkstart{cite}{cite.#2}%
+  \if@RTL\endR\fi\hyper@linkend\endL#1\beginL\hyper@linkstart{cite}{cite.#2}\if@RTL\beginR\fi%
 }%
 }
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/leqno-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/leqno-bidi.def
new file mode 100644
index 00000000000..c7beb947669
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/leqno-bidi.def
@@ -0,0 +1,29 @@
+%%
+%% This is file `leqno-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{leqno-bidi.def}[2010/03/01 v0.1 adaptations for leqno tag]
+\renewcommand\@eqnnum{\hb@xt@.01\p@{}%
+                      \rlap{\normalfont\normalcolor
+                        \hskip -\displaywidth\if@RTL\beginR\fi(\theequation)\if@RTL\endR\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 `leqno-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/letter-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/letter-bidi.def
new file mode 100644
index 00000000000..8d1a312e2f8
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/letter-bidi.def
@@ -0,0 +1,39 @@
+%%
+%% This is file `letter-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{letter-bidi.def}[2010/03/01 v0.1 adaptations for standard letter class]
+\renewcommand*{\opening}[1]{\ifx\@empty\fromaddress
+  \thispagestyle{firstpage}%
+    {\if@RTL\raggedright\else\raggedleft\fi\@date\par}%
+  \else  % home address
+    \thispagestyle{empty}%
+    {\if@RTL\raggedright\else\raggedleft\fi\if@RTL\begin{tabular}{r@{}}\else\begin{tabular}{l@{}}\fi\ignorespaces
+      \fromaddress \\*[2\parskip]%
+      \@date \end{tabular}\par}%
+  \fi
+  \vspace{2\parskip}%
+  {\if@RTL\raggedleft\else\raggedright\fi \toname \\ \toaddress \par}%
+  \vspace{2\parskip}%
+  #1\par\nobreak}
+%% 
+%% 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 `letter-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/listings-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/listings-bidi.def
index 0ce06b2a7e4..1d15dce14b0 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/listings-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/listings-bidi.def
@@ -1,27 +1,24 @@
 %%
 %% This is file `listings-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `listings-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{listings-bidi.def}[2010/03/01 v0.2 adaptations for listings package]
 \long\def\@makecaption#1#2{%
  \vskip 10pt%
  \setbox\@tempboxa\hbox{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize \beginR#1: #2\par%
+ \ifdim \wd\@tempboxa >\hsize \if@RTLmain\beginR\fi#1: #2\par%
  \else \hbox
-to\hsize{\beginR\hfil\box\@tempboxa\hfil%
-\endR}%
+to\hsize{\if@RTLmain\beginR\fi\hfil\box\@tempboxa\hfil%
+\if@RTLmain\endR\fi}%
  \fi}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def
new file mode 100644
index 00000000000..dcfde485603
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-bidi.def
@@ -0,0 +1,172 @@
+%%
+%% This is file `loadingorder-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{loadingorder-bidi.def}[2010/03/01 v0.1 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
+  \fi
+  \@ifpackageloaded{#2}
+    {\csname @bidi@#2loaded@true\endcsname #1}
+    {\csname @bidi@#2loaded@false\endcsname}}
+\bidi@isloaded{amsmath}
+\bidi@isloaded{amsthm}
+\bidi@isloaded{breqn}
+\bidi@isloaded{color}
+\bidi@isloaded{xcolor}
+\bidi@isloaded{colortbl}
+\bidi@isloaded{flowfram}
+\bidi@isloaded{xltxtra}
+\bidi@isloaded{xunicode}
+\bidi@isloaded{wrapfig}
+\bidi@isloaded{graphicx}
+\bidi@isloaded{hyperref}
+\bidi@isloaded{fancyhdr}
+\bidi@isloaded{draftwatermark}
+\bidi@isloaded{pdfpages}
+\bidi@isloaded{listings}
+\bidi@isloaded{pstricks}
+\bidi@isloaded{tikz}
+\bidi@isloaded{array}
+\bidi@isloaded{stabular}
+\bidi@isloaded{supertabular}
+\bidi@isloaded{xtab}
+\bidi@isloaded{longtable}
+\bidi@isloaded{arydshln}
+\bidi@isloaded{multicol}
+\bidi@isloaded{minitoc}
+\bidi@isloaded{ragged2e}
+\bidi@isloaded{tabls}
+\bidi@isloaded{tabulary}
+\bidi@isloaded{tocstyle}
+\bidi@isloaded{fontspec}
+\bidi@isloaded{arabxetex}
+\bidi@isloaded{polyglossia}
+\bidi@isloaded{fancyvrb}
+\AtBeginDocument{
+  \if@bidi@amsmathloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package amsmath after bidi package. Please load package amsmath before bidi package, and then try to run xelatex on your document again}{}]{amsmath}
+  \fi%
+  \if@bidi@amsthmloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package amsthm after bidi package. Please load package amsthm before bidi package, and then try to run xelatex on your document again}{}]{amsthm}
+  \fi%
+  \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@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}}
+  \fi%
+  \if@bidi@xcolorloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xcolor after bidi package. Please load package xcolor before bidi package, and then try to run xelatex on your document again}{}]{xcolor}
+  \fi%
+  \if@bidi@colortblloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package colortbl after bidi package. Please load package colortbl before bidi package, and then try to run xelatex on your document again}{}]{colortbl}
+  \fi%
+  \if@bidi@flowframloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package flowfram after bidi package. Please load package flowfram before bidi package, and then try to run xelatex on your document again}{}]{flowfram}
+  \fi%
+  \if@bidi@xltxtraloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xltxtra after bidi package. Please load package xltxtra before bidi package, and then try to run xelatex on your document again}{}]{xltxtra}
+  \fi%
+  \if@bidi@xunicodeloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xunicode after bidi package. Please load package xunicode before bidi package, and then try to run xelatex on your document again}{}]{xunicode}
+  \fi%
+  \if@bidi@wrapfigloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package wrapfig after bidi package. Please load package wrapfig before bidi package, and then try to run xelatex on your document again}{}]{wrapfig}
+  \fi%
+  \if@bidi@graphicxloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{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}{}]{graphicx}
+  \fi%
+  \if@bidi@hyperrefloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package hyperref after bidi package. Please load package hyperref before bidi package, and then try to run xelatex on your document again}{}]{hyperref}
+  \fi%
+  \if@bidi@fancyhdrloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fancyhdr after bidi package. Please load package fancyhdr before bidi package, and then try to run xelatex on your document again}{}]{fancyhdr}
+  \fi%
+  \if@bidi@draftwatermarkloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package draftwatermark after bidi package. Please load package draftwatermark before bidi package, and then try to run xelatex on your document again}{}]{draftwatermark}
+  \fi%
+  \if@bidi@pdfpagesloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pdfpages after bidi package. Please load package pdfpages before bidi package, and then try to run xelatex on your document again}{}]{pdfpages}
+  \fi%
+  \if@bidi@listingsloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package listings after bidi package. Please load package listings before bidi package, and then try to run xelatex on your document again}{}]{listings}
+  \fi%
+  \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@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%
+  \if@bidi@arrayloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package array after bidi package. Please load package array before bidi package, and then try to run xelatex on your document again}{}]{array}
+  \fi%
+  \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@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%
+  \if@bidi@xtabloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xtab after bidi package. Please load package xtab before bidi package, and then try to run xelatex on your document again}{}]{xtab}
+  \fi%
+  \if@bidi@longtableloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package longtable after bidi package. Please load package longtable before bidi package, and then try to run xelatex on your document again}{}]{longtable}
+  \fi%
+  \if@bidi@arydshlnloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package arydshln after bidi package. Please load package arydshln before bidi package, and then try to run xelatex on your document again}{}]{arydshln}
+  \fi%
+  \if@bidi@multicolloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package multicol after bidi package. Please load package multicol before bidi package, and then try to run xelatex on your document again}{}]{multicol}
+  \fi%
+  \if@bidi@minitocloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package minitoc after bidi package. Please load package minitoc before bidi package, and then try to run xelatex on your document again}{}]{minitoc}
+  \fi%
+  \csname if@bidi@ragged2eloaded@\endcsname\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package ragged2e after bidi package. Please load package ragged2e before bidi package, and then try to run xelatex on your document again}{}]{ragged2e}
+  \fi%
+  \if@bidi@tablsloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tabls after bidi package. Please load package tabls before bidi package, and then try to run xelatex on your document again}{}]{tabls}
+  \fi%
+  \if@bidi@tabularyloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tabulary after bidi package. Please load package tabulary before bidi package, and then try to run xelatex on your document again}{}]{tabulary}
+  \fi%
+  \if@bidi@tocstyleloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tocstyle after bidi package. Please load package tocstyle before bidi package, and then try to run xelatex on your document again}{}]{tocstyle}
+  \fi%
+  \if@bidi@fontspecloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fontspec after bidi package. Please load package fontspec before bidi package, and then try to run xelatex on your document again}{}]{fontspec}
+  \fi%
+  \if@bidi@arabxetexloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package arabxetex after bidi package. Please load package arabxetex before bidi package, and then try to run xelatex on your document again}{}]{arabxetex}
+  \fi%
+  \if@bidi@polyglossialoaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package polyglossia after bidi package. Please load package polyglossia before bidi package, and then try to run xelatex on your document again}{}]{polyglossia}
+  \fi%
+  \if@bidi@fancyvrbloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fancyvrb after bidi package. Please load package fancyvrb before bidi package, and then try to run xelatex on your document again}{}]{fancyvrb}
+  \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 `loadingorder-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/longtable-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/longtable-bidi.def
index 9f674499acf..53d583ecda0 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/longtable-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/longtable-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `longtable-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `longtable-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{longtable-bidi.def}[2010/03/01 v0.2 adaptations for longtable package]
 \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}%
@@ -22,107 +19,8 @@
     \fi
     \endgraf\vskip\baselineskip}%
   \hss}}}
-
-\def\longtable{\if@RTL\global\@RTLtabtrue\fi%
-  \par
-  \ifx\multicols\@undefined
-  \else
-     \ifnum\col@number>\@ne
-       \@twocolumntrue
-     \fi
-  \fi
-  \if@twocolumn
-    \LT@err{longtable not in 1-column mode}\@ehc
-  \fi
-  \begingroup \if@RTLtab\beginR \fi
-  \@ifnextchar[\LT@array{\LT@array[x]}}
-
-\def\LT@array[#1]#2{%
-  \refstepcounter{table}\stepcounter{LT@tables}%
-  \if l#1%
-    \LTleft\z@ \LTright\fill
-  \else\if r#1%
-    \LTleft\fill \LTright\z@
-  \else\if c#1%
-    \LTleft\fill \LTright\fill
-  \fi\fi\fi
-  \let\LT@mcol\multicolumn
-  \let\LT@@tabarray\@tabarray
-  \let\LT@@hl\hline
-  \def\@tabarray{%
-    \let\hline\LT@@hl
-    \LT@@tabarray}%
-  \let\\\LT@tabularcr\let\tabularnewline\\%
-  \def\newpage{\noalign{\break}}%
-  \def\pagebreak{\noalign{\ifnum`}=0\fi\@testopt{\LT@no@pgbk-}4}%
-  \def\nopagebreak{\noalign{\ifnum`}=0\fi\@testopt\LT@no@pgbk4}%
-  \let\hline\LT@hline \let\kill\LT@kill\let\caption\LT@caption
-  \@tempdima\ht\strutbox
-  \let\@endpbox\LT@endpbox
-  \ifx\extrarowheight\@undefined
-    \let\@acol\@tabacol
-    \let\@classz\@tabclassz \let\@classiv\@tabclassiv
-    \def\@startpbox{\vtop\LT@startpbox}%
-    \let\@@startpbox\@startpbox
-    \let\@@endpbox\@endpbox
-    \let\LT@LL@FM@cr\@tabularcr
-  \else
-    \advance\@tempdima\extrarowheight
-    \col@sep\tabcolsep
-    \let\@startpbox\LT@startpbox\let\LT@LL@FM@cr\@arraycr
-  \fi
-  \setbox\@arstrutbox\hbox{\vrule
-    \@height \arraystretch \@tempdima
-    \@depth \arraystretch \dp \strutbox
-    \@width \z@}%
-  \let\@sharp##\let\protect\relax
-   \begingroup
-    \@mkpream{#2}%
-    \xdef\LT@bchunk{%
-       \global\advance\c@LT@chunks\@ne
-       \global\LT@rows\z@\setbox\z@\vbox\bgroup
-       \LT@setprevdepth
-       \tabskip\LTleft \noexpand\halign to\hsize\bgroup
-      \tabskip\z@ \@arstrut \@preamble \tabskip\LTright \cr}%
-  \endgroup
-  \expandafter\LT@nofcols\LT@bchunk&\LT@nofcols
-  \LT@make@row
-  \m@th\let\par\@empty
-  \everycr{}\lineskip\z@\baselineskip\z@
-  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
-  \LT@bchunk}
-
-\def\endlongtable{%
-  \crcr
-  \noalign{%
-    \let\LT@entry\LT@entry@chop
-    \xdef\LT@save@row{\LT@save@row}}%
-  \LT@echunk
-  \LT@start
-  \unvbox\z@
-  \LT@get@widths
-  \if@filesw
-    {\let\LT@entry\LT@entry@write\immediate\write\@auxout{%
-      \gdef\expandafter\noexpand
-        \csname LT@\romannumeral\c@LT@tables\endcsname
-          {\LT@save@row}}}%
-  \fi
-  \ifx\LT@save@row\LT@@save@row
-  \else
-    \LT@warn{Column \@width s have changed\MessageBreak
-             in table \thetable}%
-    \LT@final@warn
-  \fi
-  \endgraf\penalty -\LT@end@pen
-  \if@RTLtab\egroup\endR\egroup\fi
-   \if@RTLtab\endR\fi \endgroup
-  \global\@mparbottom\z@
-  \pagegoal\vsize
-  \endgraf\penalty\z@\addvspace\LTpost
-  \ifvoid\footins\else\insert\footins{}\fi
-   \global\@RTLtabfalse}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/memoir-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/memoir-bidi.def
index 16575ba59a5..0f92a04494d 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/memoir-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/memoir-bidi.def
@@ -1,17 +1,48 @@
 %%
 %% This is file `memoir-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `memoir-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   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}
@@ -33,7 +64,7 @@
 \renewcommand{\thefigure}{\thechapter\@SepMark\@arabic\c@figure}
 \renewcommand{\thetable}{\thechapter\@SepMark\@arabic\c@table}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/minitoc-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/minitoc-bidi.def
index f0166ce23bf..4713bc7d33f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/minitoc-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/minitoc-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `minitoc-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `minitoc-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{minitoc-bidi.def}[2010/03/01 v0.1 adaptations for minitoc package]
 \def\@undottedtocline#1#2#3#4#5{%
   \ifnum #1>\c@tocdepth\relax \else
   \vskip \z@ plus.2\p@
@@ -50,7 +47,7 @@
     \par}%
   \fi}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/multicol-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multicol-bidi.def
new file mode 100644
index 00000000000..2d0545b0b53
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/multicol-bidi.def
@@ -0,0 +1,171 @@
+%%
+%% This is file `multicol-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{multicol-bidi.def}[2010/03/01 v0.1 adaptations for multicol package]
+\def\revprocess@cols#1#2{\count@\doublecol@number\relax
+\advance\count@ by -2
+     \loop #2%
+     \ifnum\count@>#1\relax
+     \advance\count@-\tw@
+   \repeat}
+\def\page@sofar{%
+   \process@cols\mult@rightbox
+       {\ifvoid\count@
+          \setbox\count@\hbox to\hsize{}%
+        \else
+          \wd\count@\hsize
+        \fi}%
+   \count@\col@number \advance\count@\m@ne
+   \mult@info\z@
+    {Column spec: \the\full@width\space = indent
+                  + columns + sep =\MessageBreak
+        \the\multicol@leftmargin\space
+        + \the\col@number\space
+        x \the\hsize\space
+        + \the\count@\space
+        x \the\columnsep
+     }%
+\ifvmode\else\errmessage{Multicol Error}\fi
+   \nointerlineskip
+   \setbox\z@\hbox{p}\global\dimen\tw@\dp\z@
+   \moveright\multicol@leftmargin
+   \if@RTL\hbox to\full@width{%
+    \ifdim\dp\mult@rightbox>\dimen\tw@
+       \global\dimen\tw@\dp\mult@rightbox \fi
+    \box\mult@rightbox
+    \llap{\phantom p}%
+     \revprocess@cols\mult@gfirstbox{%
+       \ifdim\dp\count@>\dimen\tw@
+         \global\dimen\tw@\dp\count@ \fi
+       \hss{\columnseprulecolor\vrule
+              \@width\columnseprule}\hss\box\count@}%
+}\else%
+    \hbox to\full@width{%
+     \process@cols\mult@gfirstbox{%
+       \ifdim\dp\count@>\dimen\tw@
+         \global\dimen\tw@\dp\count@ \fi
+       \box\count@
+       \hss{\columnseprulecolor\vrule
+              \@width\columnseprule}\hss}%
+     \ifdim\dp\mult@rightbox>\dimen\tw@
+       \global\dimen\tw@\dp\mult@rightbox \fi
+     \box\mult@rightbox
+     \rlap{\phantom p}%
+    }\fi%
+ \kern-\dimen\tw@
+ \ifdim\dimen\tw@ = \mc@gridwarn
+   \PackageWarning{multicol}%
+     {Very deep columns!\MessageBreak
+      Grid alignment might be broken}%
+ \fi
+}
+\def\right@footnote{%
+  \hbox to \textwidth
+  {\beginR \vbox{\kern -3\p@
+   \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}}
+\long\def\@footnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\textwidth \@parboxrestore
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\strut}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
+\long\def\@RTLfootnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\@RTLtrue\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\textwidth \@parboxrestore
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces #1\strut}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
+\long\def\@LTRfootnotetext#1{%
+    \begingroup
+    \setbox\footins
+    \vbox{\@RTLfalse\reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\textwidth \@parboxrestore
+    \bidi@footnotetext@dir{#1}%
+    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
+    {\rule{\z@}{\footnotesep}\ignorespaces\rmfamily #1\strut}}%
+     \bidi@footnotetext@after
+    \insert\footins{\unvbox\footins}%
+    \endgroup}
+\long\def\@mpRTLfootnotetext#1{%
+  \global\setbox\@mpfootins\vbox{\@RTLtrue%
+    \unvbox\@mpfootins
+    \reset@font\footnotesize
+    \hsize\textwidth
+    \@parboxrestore
+    \protected@edef\@currentlabel
+         {\csname p@mpfootnote\endcsname\@thefnmark}%
+    \color@begingroup
+     \bidi@footnotetext@dir{#1}
+    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+    \color@endgroup}}
+\long\def\@mpLTRfootnotetext#1{%
+  \global\setbox\@mpfootins\vbox{\@RTLfalse%
+    \unvbox\@mpfootins
+    \reset@font\footnotesize
+    \hsize\textwidth
+    \@parboxrestore
+    \protected@edef\@currentlabel
+         {\csname p@mpfootnote\endcsname\@thefnmark}%
+    \color@begingroup
+     \bidi@footnotetext@dir{#1}
+    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces\rmfamily#1\@finalstrut\strutbox}%
+    \color@endgroup}}
+\long\def\@mpfootnotetext#1{%
+  \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootins
+    \reset@font\footnotesize
+    \hsize\textwidth
+    \@parboxrestore
+    \protected@edef\@currentlabel
+         {\csname p@mpfootnote\endcsname\@thefnmark}%
+    \color@begingroup
+     \bidi@footnotetext@dir{#1}
+    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\@finalstrut\strutbox}%
+    \color@endgroup}}
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% 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 `multicol-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-bidi.def
index ff5a928b915..ed17f193b6a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `pdfpages-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `pdfpages-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{pdfpages-bidi.def}[2010/03/01 v0.1 adaptations for pdfpages package]
 \renewcommand*{\includepdf}[2][]{%
   \begingroup
   \@RTLfalse
@@ -60,7 +57,7 @@
   \AM@ClearShipoutPicture
 }
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pstricks-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pstricks-bidi.def
index 1b74ae9d0ca..96e9fce73dd 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pstricks-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/pstricks-bidi.def
@@ -1,20 +1,17 @@
 %%
 %% This is file `pstricks-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `pstricks-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{pstricks-bidi.def}[2010/03/01 v0.1 adaptations for pstricks package]
 \def\pspicture{\begingroup\@RTLfalse\pst@ifstar\pst@picture}%
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-bidi.def
index 48feca2db03..5784b0222d1 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `ragged2e-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `ragged2e-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{ragged2e-bidi.def}[2010/03/01 v0.2 adaptations for ragged2e package]
 \renewcommand{\Centering}{%
    \ifx\\\@raggedtwoe@savedcr
       \let\\\@centercr
@@ -98,7 +95,7 @@
 \def\RaggedLeft{\if@RTL\origin@RaggedRight\else\origin@RaggedLeft\fi}
 \def\RaggedRight{\if@RTL\origin@RaggedLeft\else\origin@RaggedRight\fi}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport3-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport3-bidi.def
index cde23698756..24281980dfc 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/rapport3-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/rapport3-bidi.def
@@ -1,17 +1,151 @@
 %%
 %% This is file `rapport3-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `rapport3-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{rapport3-bidi.def}[2010/03/01 v0.1 adaptations for rapport3 class]
+\if@titlepage
+\renewcommand*\TitleFont{\rmfamily}
+\renewcommand*\maketitle{%
+  \begin{titlepage}%
+    \let\footnotesize\small
+    \let\footnoterule\relax
+    \let \footnote \thanks
+    \let \LTRfootnote \LTRthanks
+    \let \RTLfootnote \RTLthanks
+    \long\def\@makefntext##1{\parindent\z@
+         \def\labelitemi{\textendash}\@revlabeltrue
+         \leavevmode\@textsuperscript{\@thefnmark}\kern1em\relax ##1}
+    \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+    \if@compatibility\setcounter{page}{0}\fi
+    \null\vfil
+    \vskip 60\p@
+    \begin{center}%
+      \TitleFont
+      {\LARGE \def\\{\penalty -\@M}
+        \if@allcaps
+          \expandafter\uc@nothanks\@title\thanks\relax
+        \else
+          \@title
+        \fi\par}%
+      \vskip 3em%
+      {\large
+        \lineskip .75em \parindent\z@
+        \begin{tabular}[t]{c}%
+          \if@allcaps
+            \expandafter\uc@authornothanks\@author\and\relax
+          \else
+            \@author
+          \fi
+        \end{tabular}\par}%
+      \vskip 1.5em%
+      {\large
+        \if@allcaps
+          \uppercase\expandafter{\@date}%
+        \else
+          \@date
+        \fi\par}%
+      \end{center}\par
+    \@thanks
+    \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@title\@empty
+  \global\let\@date\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\def\uc@nothanks#1\thanks{\uppercase{#1}\futurelet\@tempa\uc@tx}
+\def\uc@authornothanks#1\and{\uc@nothanks#1\thanks\relax
+    \futurelet\@tempa\uc@ax}
+\def\uc@ax{%
+  \ifx\@tempa\relax
+  \else
+    \\ \andname \\ \expandafter\uc@authornothanks
+  \fi}
+\def\uc@tx{\ifx\@tempa\relax
+    \else \expandafter\uc@ty \fi}
+\def\uc@ty#1{\thanks{#1}\uc@nothanks}
+\else
+\renewcommand*\maketitle{\par
+  \begingroup
+    \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+    \def\@makefnmark{\rlap{%
+      \@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext{\@xmakefntext{%
+      \@textsuperscript{\normalfont\@thefnmark}}}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@title\@empty
+  \global\let\@date\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+  }
+\def\@maketitle{%
+  \newpage
+  \null
+  \vskip 2em%
+\if@titlecentered
+  \begin{center}%
+    \let \footnote \thanks
+    \let \LTRfootnote \LTRthanks
+    \let \RTLfootnote \RTLthanks
+    {\LARGE \TitleFont \@title \par}%
+    \vskip 1.5em%
+    {\large \TitleFont
+      \lineskip .5em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+    \vskip 1em%
+    {\large \TitleFont \@date}%
+  \end{center}%
+ \else
+     {\LARGE \TitleFont \head@style \@title \par} \vskip 1.5em
+     {\large \TitleFont \lineskip .5em \tabcolsep\z@
+             \def\and{%%% \begin{tabular} has already started
+                      \end{tabular}\hskip 1em plus .17fil
+                      \begin{tabular}[t]{l}}%% \end{tabular} will come
+             \begin{tabular}[t]{l}\@author\end{tabular}\par}
+     \vskip 1em {\large \TitleFont \@date}
+ \fi
+  \par
+  \vskip 1.5em}
+\fi
 \renewcommand*\@regtocline[3]{%
   \ifnum #1>\c@tocdepth
   \else
@@ -103,7 +237,7 @@
 \renewcommand*\theequation{%
   \ifnum \c@chapter>\z@ \thechapter\@SepMark\fi\@arabic\c@equation}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/refrep-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/refrep-bidi.def
index 609a6a46819..8446921e028 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/refrep-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/refrep-bidi.def
@@ -1,17 +1,121 @@
 %%
 %% This is file `refrep-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `refrep-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{refrep-bidi.def}[2010/03/01 v0.1 adaptations for refrep class]
+\if@titlepage
+  \renewcommand\maketitle{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let\footnote\thanks
+  \let\LTRfootnote\LTRthanks
+  \let\RTLfootnote\RTLthanks
+  \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+  \def\@makefnmark%
+      {\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+  \long\def\@makefntext##1{%
+       \@setpar{\@@par
+          \@tempdima = \hsize
+          \advance\@tempdima -1em
+          \parshape \@ne 1em \@tempdima}%
+       \par\parindent 1em \noindent
+       \hb@xt@\z@{\hss\@textsuperscript{\normalfont\@thefnmark}\,}##1}
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\LARGE \@title \par}%
+    \vskip 3em%
+    {\large
+     \lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\large \@date \par}%       % Set date in \large size.
+  \end{center}\par
+  \@thanks
+  \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+  }
+\else
+  \renewcommand\maketitle{\par
+    \begingroup
+      \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+      \def\@makefnmark%
+          {\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+      \long\def\@makefntext##1{%
+         \@setpar{\@@par
+            \@tempdima = \hsize
+            \advance\@tempdima -1em
+            \parshape \@ne 1em \@tempdima}%
+         \par\parindent 1em \noindent
+         \hb@xt@\z@{\hss\@textsuperscript{\normalfont\@thefnmark}\,}##1}
+      \if@twocolumn
+        \ifnum \col@number=\@ne
+          \@maketitle
+        \else
+          \twocolumn[\@maketitle]%
+        \fi
+      \else
+        \newpage
+        \global\@topnum\z@   % Prevents figures from going at top of page.
+        \@maketitle
+      \fi
+      \thispagestyle{empty}\@thanks
+    \endgroup
+    \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+  \def\@maketitle{%
+    \newpage
+    \null
+    \longthickrule\vskip1.5em%
+    \let \footnote \thanks
+    \let \LTRfootnote \LTRthanks
+    \let \RTLfootnote \RTLthanks
+    {\secshape \parskip\z@ \parindent\z@
+    \Large\bfseries \@title \par}%
+    \vskip1.5em\longthickrule\vskip1.5em%
+    {\normalsize
+      \lineskip .5em%
+      \begin{flushright}%
+        {\slshape\@author\par}
+        \vskip 1em%
+        {\@date}%
+      \end{flushright}\par}%
+    \vskip 1.5em}
+\fi
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
@@ -38,7 +142,7 @@
 \renewcommand\theparagraph     {\thesubsubsection\@SepMark\@arabic\c@paragraph}
 \renewcommand\thesubparagraph  {\theparagraph\@SepMark\@arabic\c@subparagraph}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/report-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/report-bidi.def
index f833c54b770..9f02d7c0b05 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/report-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/report-bidi.def
@@ -1,17 +1,108 @@
 %%
 %% This is file `report-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `report-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{report-bidi.def}[2010/03/01 v0.2 adaptations for standard report class]
+  \if@titlepage
+  \renewcommand\maketitle{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\LARGE \@title \par}%
+    \vskip 3em%
+    {\large
+     \lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\large \@date \par}%       % Set date in \large size.
+  \end{center}\par
+  \@thanks
+  \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\else
+\renewcommand\maketitle{\par
+  \begingroup
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+    \long\def\@makefntext##1{\parindent 1em\noindent
+            \hb@xt@1.8em{%
+                \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \@maketitle
+    \fi
+    \thispagestyle{plain}\@thanks
+  \endgroup
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\LTRthanks\relax
+  \global\let\RTLthanks\relax
+  \global\let\maketitle\relax
+  \global\let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\def\@maketitle{%
+  \newpage
+  \null
+  \vskip 2em%
+  \begin{center}%
+  \let \footnote \thanks
+  \let \LTRfootnote \LTRthanks
+  \let \RTLfootnote \RTLthanks
+    {\LARGE \@title \par}%
+    \vskip 1.5em%
+    {\large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+    \vskip 1em%
+    {\large \@date}%
+  \end{center}%
+  \par
+  \vskip 1.5em}
+\fi
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
@@ -41,7 +132,7 @@
 \renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}
 \def\@makechapterhead#1{%
   \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft \normalfont
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi \normalfont
     \ifnum \c@secnumdepth >\m@ne
         \huge\bfseries \@chapapp\space \thechapter
         \par\nobreak
@@ -53,7 +144,7 @@
   }}
 \def\@makeschapterhead#1{%
   \vspace*{50\p@}%
-  {\parindent \z@ \raggedleft
+  {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi
     \normalfont
     \interlinepenalty\@M
     \Huge \bfseries  #1\par\nobreak
@@ -81,44 +172,44 @@
 \if@twoside
   \def\ps@headings{%
       \let\@oddfoot\@empty\let\@evenfoot\@empty
-      \def\@evenhead{\sl\thepage\hfil\beginR\leftmark\endR}%
-      \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
+      \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
-            \beginR\@chapapp\ \thechapter. \ \endR%
+            \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \ \if@RTLmain\endR\fi%
         \fi
-        \beginR##1\endR}}{}}%
+        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}{}}%
     \def\sectionmark##1{%
       \markright {\MakeUppercase{%
         \ifnum \c@secnumdepth >\z@
-          \beginR\thesection. \ \endR%
+          \if@RTLmain\beginR\fi\thesection. \ \if@RTLmain\endR\fi%
         \fi
-        \beginR##1\endR}}}}
+        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}}
 \else
   \def\ps@headings{%
     \let\@oddfoot\@empty
-    \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
+    \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
-            \beginR\@chapapp\ \thechapter. \ \endR%
+            \if@RTLmain\beginR\fi\@chapapp\ \thechapter. \ \if@RTLmain\endR\fi%
         \fi
-        \beginR##1\endR}}}}
+        \if@RTLmain\beginR\fi##1\if@RTLmain\endR\fi}}}}
 \fi
 \def\ps@myheadings{%
     \let\@oddfoot\@empty\let\@evenfoot\@empty
-    \def\@evenhead{\sl\thepage\hfil\beginR\leftmark\endR}%
-    \def\@oddhead{\sl\beginR\rightmark\endR\hfil\thepage}%
+    \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      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-bidi.def
index 92e79307189..63091c1a5ce 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-bidi.def
@@ -1,17 +1,179 @@
 %%
 %% This is file `scrartcl-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `scrartcl-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{scrartcl-bidi.def}[2010/03/01 v0.1 adaptations for scrartcl class]
+\renewcommand*\maketitle[1][1]{%
+  \if@titlepage
+    \begin{titlepage}
+      \setcounter{page}{%
+        #1%
+      }%
+      \let\footnotesize\small
+      \let\footnoterule\relax
+      \let\footnote\thanks
+      \let\LTRfootnote\LTRthanks
+      \let\RTLfootnote\RTLthanks
+      \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+      \let\@oldmakefnmark\@makefnmark
+      \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
+      \ifx\@extratitle\@empty \else
+        \noindent\@extratitle\next@tpage\cleardoubleemptypage
+        \thispagestyle{empty}%
+      \fi
+      \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+      \ifx\@titlehead\@empty \else
+        \begin{minipage}[t]{\textwidth}%
+        \@titlehead
+        \end{minipage}\par
+      \fi
+      \null\vfill
+      \begin{center}
+        \ifx\@subject\@empty \else
+          {\subject@font \@subject \par}%
+          \vskip 3em
+        \fi
+        {\titlefont\huge \@title\par}%
+        \vskip 1em
+        {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+        \vskip 2em
+        {\Large \lineskip 0.75em
+          \begin{tabular}[t]{c}
+            \@author
+          \end{tabular}\par
+        }%
+        \vskip 1.5em
+        {\Large \@date \par}%
+        \vskip \z@ \@plus3fill
+        {\Large \@publishers \par}%
+        \vskip 3em
+      \end{center}\par
+      \@thanks
+      \vfill\null
+      \if@twoside\next@tpage
+        \begin{minipage}[t]{\textwidth}
+          \@uppertitleback
+        \end{minipage}\par
+        \vfill
+        \begin{minipage}[b]{\textwidth}
+          \@lowertitleback
+        \end{minipage}
+      \fi
+      \ifx\@dedication\@empty \else
+        \next@tpage\null\vfill
+        {\centering \Large \@dedication \par}%
+        \vskip \z@ \@plus3fill
+        \if@twoside \next@tpage\cleardoubleemptypage \fi
+      \fi
+    \end{titlepage}
+  \else
+    \par
+    \@tempcnta=%
+    #1%
+    \relax\ifnum\@tempcnta=1\else
+      \ClassWarning{\KOMAClassName}{%
+        Optional argument of \string\maketitle\space ignored
+        at\MessageBreak
+        notitlepage-mode%
+      }%
+    \fi
+    \begingroup
+      \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+      \let\@oldmakefnmark\@makefnmark
+      \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+      \if@twocolumn
+        \ifnum \col@number=\@ne
+          \@maketitle
+        \else
+          \twocolumn[\@maketitle]%
+        \fi
+      \else
+        \newpage
+        \global\@topnum\z@
+        \@maketitle
+      \fi
+      \thispagestyle{\titlepagestyle}\@thanks
+    \endgroup
+  \fi
+  \setcounter{footnote}{0}%
+  \let\thanks\relax
+  \let\LTRthanks\relax
+  \let\RTLthanks\relax
+  \let\maketitle\relax
+  \let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\@subtitle\@empty
+  \global\let\@extratitle\@empty
+  \global\let\@titlehead\@empty
+  \global\let\@subject\@empty
+  \global\let\@publishers\@empty
+  \global\let\@uppertitleback\@empty
+  \global\let\@lowertitleback\@empty
+  \global\let\@dedication\@empty
+  \global\let\author\relax
+  \global\let\title\relax
+  \global\let\extratitle\relax
+  \global\let\titlehead\relax
+  \global\let\subject\relax
+  \global\let\publishers\relax
+  \global\let\uppertitleback\relax
+  \global\let\lowertitleback\relax
+  \global\let\dedication\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}%
+\renewcommand*{\@maketitle}{%
+  \clearpage
+  \let\footnote\thanks
+  \let\LTRfootnote\LTRthanks
+  \let\RTLfootnote\RTLthanks
+  \ifx\@extratitle\@empty \else
+    \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+  \fi
+  \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+  \ifx\@titlehead\@empty \else
+    \begin{minipage}[t]{\textwidth}
+      \@titlehead
+    \end{minipage}\par
+  \fi
+  \null
+  \vskip 2em%
+  \begin{center}%
+    \ifx\@subject\@empty \else
+      {\subject@font \@subject \par}
+      \vskip 1.5em
+    \fi
+    {\titlefont\huge \@title \par}%
+    \vskip .5em
+    {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+    \vskip 1em
+    {\Large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}
+        \@author
+      \end{tabular}\par
+    }%
+    \vskip 1em%
+    {\Large \@date \par}%
+    \vskip \z@ \@plus 1em
+    {\Large \@publishers \par}
+    \ifx\@dedication\@empty \else
+      \vskip 2em
+      {\Large \@dedication \par}
+    \fi
+  \end{center}%
+  \par
+  \vskip 2em
+}%
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >\m@ne\relax
     \addpenalty{\@secpenalty}%
@@ -86,7 +248,7 @@
   \theparagraph\@SepMark\@arabic\c@subparagraph
 }
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrbook-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrbook-bidi.def
index 740469b9f3c..037d59efc81 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrbook-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrbook-bidi.def
@@ -1,17 +1,179 @@
 %%
 %% This is file `scrbook-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `scrbook-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{scrbook-bidi.def}[2010/03/01 v0.1 adaptations for scrbook class]
+\renewcommand*\maketitle[1][1]{%
+  \if@titlepage
+    \begin{titlepage}
+      \setcounter{page}{%
+        #1%
+      }%
+      \let\footnotesize\small
+      \let\footnoterule\relax
+      \let\footnote\thanks
+      \let\LTRfootnote\LTRthanks
+      \let\RTLfootnote\RTLthanks
+      \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+      \let\@oldmakefnmark\@makefnmark
+      \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
+      \ifx\@extratitle\@empty \else
+        \noindent\@extratitle\next@tpage\cleardoubleemptypage
+        \thispagestyle{empty}%
+      \fi
+      \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+      \ifx\@titlehead\@empty \else
+        \begin{minipage}[t]{\textwidth}%
+        \@titlehead
+        \end{minipage}\par
+      \fi
+      \null\vfill
+      \begin{center}
+        \ifx\@subject\@empty \else
+          {\subject@font \@subject \par}%
+          \vskip 3em
+        \fi
+        {\titlefont\huge \@title\par}%
+        \vskip 1em
+        {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+        \vskip 2em
+        {\Large \lineskip 0.75em
+          \begin{tabular}[t]{c}
+            \@author
+          \end{tabular}\par
+        }%
+        \vskip 1.5em
+        {\Large \@date \par}%
+        \vskip \z@ \@plus3fill
+        {\Large \@publishers \par}%
+        \vskip 3em
+      \end{center}\par
+      \@thanks
+      \vfill\null
+      \if@twoside\next@tpage
+        \begin{minipage}[t]{\textwidth}
+          \@uppertitleback
+        \end{minipage}\par
+        \vfill
+        \begin{minipage}[b]{\textwidth}
+          \@lowertitleback
+        \end{minipage}
+      \fi
+      \ifx\@dedication\@empty \else
+        \next@tpage\null\vfill
+        {\centering \Large \@dedication \par}%
+        \vskip \z@ \@plus3fill
+        \if@twoside \next@tpage\cleardoubleemptypage \fi
+      \fi
+    \end{titlepage}
+  \else
+    \par
+    \@tempcnta=%
+    #1%
+    \relax\ifnum\@tempcnta=1\else
+      \ClassWarning{\KOMAClassName}{%
+        Optional argument of \string\maketitle\space ignored
+        at\MessageBreak
+        notitlepage-mode%
+      }%
+    \fi
+    \begingroup
+      \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+      \let\@oldmakefnmark\@makefnmark
+      \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+      \if@twocolumn
+        \ifnum \col@number=\@ne
+          \@maketitle
+        \else
+          \twocolumn[\@maketitle]%
+        \fi
+      \else
+        \newpage
+        \global\@topnum\z@
+        \@maketitle
+      \fi
+      \thispagestyle{\titlepagestyle}\@thanks
+    \endgroup
+  \fi
+  \setcounter{footnote}{0}%
+  \let\thanks\relax
+  \let\LTRthanks\relax
+  \let\RTLthanks\relax
+  \let\maketitle\relax
+  \let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\@subtitle\@empty
+  \global\let\@extratitle\@empty
+  \global\let\@titlehead\@empty
+  \global\let\@subject\@empty
+  \global\let\@publishers\@empty
+  \global\let\@uppertitleback\@empty
+  \global\let\@lowertitleback\@empty
+  \global\let\@dedication\@empty
+  \global\let\author\relax
+  \global\let\title\relax
+  \global\let\extratitle\relax
+  \global\let\titlehead\relax
+  \global\let\subject\relax
+  \global\let\publishers\relax
+  \global\let\uppertitleback\relax
+  \global\let\lowertitleback\relax
+  \global\let\dedication\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}%
+\renewcommand*{\@maketitle}{%
+  \clearpage
+  \let\footnote\thanks
+  \let\LTRfootnote\LTRthanks
+  \let\RTLfootnote\RTLthanks
+  \ifx\@extratitle\@empty \else
+    \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+  \fi
+  \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+  \ifx\@titlehead\@empty \else
+    \begin{minipage}[t]{\textwidth}
+      \@titlehead
+    \end{minipage}\par
+  \fi
+  \null
+  \vskip 2em%
+  \begin{center}%
+    \ifx\@subject\@empty \else
+      {\subject@font \@subject \par}
+      \vskip 1.5em
+    \fi
+    {\titlefont\huge \@title \par}%
+    \vskip .5em
+    {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+    \vskip 1em
+    {\Large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}
+        \@author
+      \end{tabular}\par
+    }%
+    \vskip 1em%
+    {\Large \@date \par}%
+    \vskip \z@ \@plus 1em
+    {\Large \@publishers \par}
+    \ifx\@dedication\@empty \else
+      \vskip 2em
+      {\Large \@dedication \par}
+    \fi
+  \end{center}%
+  \par
+  \vskip 2em
+}%
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
@@ -142,7 +304,7 @@
   \@arabic\c@equation
 }
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-bidi.def
index 338d43229d2..8893e6eee9a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-bidi.def
@@ -1,17 +1,179 @@
 %%
 %% This is file `scrreprt-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `scrreprt-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{scrreprt-bidi.def}[2010/03/01 v0.1 adaptations for scrreprt class]
+\renewcommand*\maketitle[1][1]{%
+  \if@titlepage
+    \begin{titlepage}
+      \setcounter{page}{%
+        #1%
+      }%
+      \let\footnotesize\small
+      \let\footnoterule\relax
+      \let\footnote\thanks
+      \let\LTRfootnote\LTRthanks
+      \let\RTLfootnote\RTLthanks
+      \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+      \let\@oldmakefnmark\@makefnmark
+      \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
+      \ifx\@extratitle\@empty \else
+        \noindent\@extratitle\next@tpage\cleardoubleemptypage
+        \thispagestyle{empty}%
+      \fi
+      \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+      \ifx\@titlehead\@empty \else
+        \begin{minipage}[t]{\textwidth}%
+        \@titlehead
+        \end{minipage}\par
+      \fi
+      \null\vfill
+      \begin{center}
+        \ifx\@subject\@empty \else
+          {\subject@font \@subject \par}%
+          \vskip 3em
+        \fi
+        {\titlefont\huge \@title\par}%
+        \vskip 1em
+        {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+        \vskip 2em
+        {\Large \lineskip 0.75em
+          \begin{tabular}[t]{c}
+            \@author
+          \end{tabular}\par
+        }%
+        \vskip 1.5em
+        {\Large \@date \par}%
+        \vskip \z@ \@plus3fill
+        {\Large \@publishers \par}%
+        \vskip 3em
+      \end{center}\par
+      \@thanks
+      \vfill\null
+      \if@twoside\next@tpage
+        \begin{minipage}[t]{\textwidth}
+          \@uppertitleback
+        \end{minipage}\par
+        \vfill
+        \begin{minipage}[b]{\textwidth}
+          \@lowertitleback
+        \end{minipage}
+      \fi
+      \ifx\@dedication\@empty \else
+        \next@tpage\null\vfill
+        {\centering \Large \@dedication \par}%
+        \vskip \z@ \@plus3fill
+        \if@twoside \next@tpage\cleardoubleemptypage \fi
+      \fi
+    \end{titlepage}
+  \else
+    \par
+    \@tempcnta=%
+    #1%
+    \relax\ifnum\@tempcnta=1\else
+      \ClassWarning{\KOMAClassName}{%
+        Optional argument of \string\maketitle\space ignored
+        at\MessageBreak
+        notitlepage-mode%
+      }%
+    \fi
+    \begingroup
+      \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
+      \let\@oldmakefnmark\@makefnmark
+      \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+      \if@twocolumn
+        \ifnum \col@number=\@ne
+          \@maketitle
+        \else
+          \twocolumn[\@maketitle]%
+        \fi
+      \else
+        \newpage
+        \global\@topnum\z@
+        \@maketitle
+      \fi
+      \thispagestyle{\titlepagestyle}\@thanks
+    \endgroup
+  \fi
+  \setcounter{footnote}{0}%
+  \let\thanks\relax
+  \let\LTRthanks\relax
+  \let\RTLthanks\relax
+  \let\maketitle\relax
+  \let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\@subtitle\@empty
+  \global\let\@extratitle\@empty
+  \global\let\@titlehead\@empty
+  \global\let\@subject\@empty
+  \global\let\@publishers\@empty
+  \global\let\@uppertitleback\@empty
+  \global\let\@lowertitleback\@empty
+  \global\let\@dedication\@empty
+  \global\let\author\relax
+  \global\let\title\relax
+  \global\let\extratitle\relax
+  \global\let\titlehead\relax
+  \global\let\subject\relax
+  \global\let\publishers\relax
+  \global\let\uppertitleback\relax
+  \global\let\lowertitleback\relax
+  \global\let\dedication\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}%
+\renewcommand*{\@maketitle}{%
+  \clearpage
+  \let\footnote\thanks
+  \let\LTRfootnote\LTRthanks
+  \let\RTLfootnote\RTLthanks
+  \ifx\@extratitle\@empty \else
+    \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+  \fi
+  \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+  \ifx\@titlehead\@empty \else
+    \begin{minipage}[t]{\textwidth}
+      \@titlehead
+    \end{minipage}\par
+  \fi
+  \null
+  \vskip 2em%
+  \begin{center}%
+    \ifx\@subject\@empty \else
+      {\subject@font \@subject \par}
+      \vskip 1.5em
+    \fi
+    {\titlefont\huge \@title \par}%
+    \vskip .5em
+    {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+    \vskip 1em
+    {\Large
+      \lineskip .5em%
+      \begin{tabular}[t]{c}
+        \@author
+      \end{tabular}\par
+    }%
+    \vskip 1em%
+    {\Large \@date \par}%
+    \vskip \z@ \@plus 1em
+    {\Large \@publishers \par}
+    \ifx\@dedication\@empty \else
+      \vskip 2em
+      {\Large \@dedication \par}
+    \fi
+  \end{center}%
+  \par
+  \vskip 2em
+}%
 \renewcommand*\l@part[2]{%
   \ifnum \c@tocdepth >-2\relax
     \addpenalty{-\@highpenalty}%
@@ -99,7 +261,7 @@
   \@arabic\c@equation
 }
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/stabular-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/stabular-bidi.def
index 2a3dcf43115..58b3c837a9a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/stabular-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/stabular-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `stabular-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `stabular-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{stabular-bidi.def}[2010/03/01 v0.1 adaptations for stabular package]
 \def\@stabular{\if@RTL\global\@RTLtabtrue\fi
    \leavevmode \bgroup \if@RTLtab\beginR \fi
    \let\@acol\@tabacol
@@ -39,7 +36,7 @@
   \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
     \@preamble}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabls-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabls-bidi.def
index 63a4bf2d15f..caa17c1eed9 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabls-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tabls-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `tabls-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `tabls-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{tabls-bidi.def}[2010/03/01 v0.1 adaptations for tabls package]
 \def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup
                  \global\@RTLtabfalse}
 
@@ -47,7 +44,7 @@
  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
  \@preamble}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabulary-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabulary-bidi.def
index d29dbb9b343..266127839e9 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabulary-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tabulary-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `tabulary-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `tabulary-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{tabulary-bidi.def}[2010/03/01 v0.1 adaptations for tabulary package]
 \def\@testpach{\@chclass
  \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
   \ifnum \@lastchclass=7 5 \else
@@ -42,7 +39,7 @@
    \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi
      \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tikz-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tikz-bidi.def
index 47cf45e4839..b384fdc082f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tikz-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tikz-bidi.def
@@ -1,23 +1,20 @@
 %%
 %% This is file `tikz-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `tikz-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{tikz-bidi.def}[2010/03/01 v0.1 adaptations for tikz package]
 \let\origin@tikzpicture=\tikzpicture
 \let\origin@endtikzpicture=\endtikzpicture
 \def\tikzpicture{\LTR\origin@tikzpicture}
 \def\endtikzpicture{\origin@endtikzpicture\endLTR}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-bidi.def
index 3ba4475c941..81826afc359 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `tocbibind-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `tocbibind-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{tocbibind-bidi.def}[2010/03/01 v0.1 adaptations for tocbibind package]
 \if@dotocbib
   \@ifpackageloaded{natbib}{}{% natbib not loaded
     \renewcommand{\bibsection}{\t@cb@bchapsec}
@@ -42,7 +39,7 @@
 
 \fi
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocloft-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocloft-bidi.def
index 4d9801e230c..7bd3ce6a3d6 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocloft-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocloft-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `tocloft-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `tocloft-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{tocloft-bidi.def}[2010/03/01 v0.1 adaptations for tocloft package]
 \if@cfthaspart
 \renewcommand*{\l@part}[2]{
   \@cftdopartfalse
@@ -319,7 +316,7 @@
    \if@RTL\leftskip\else\rightskip\fi \@tocrmarg\relax
    \textit{#1}\protect\par}}}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-bidi.def
index b83aaa7c0eb..8cfd05bf693 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `tocstyle-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `tocstyle-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{tocstyle-bidi.def}[2010/03/01 v0.1 adaptations for tocstyle package]
 \renewcommand*{\tocstyle@dottedtocline}[5]{%
   \let\numberline\tocstyle@numberline
   \ifnum #1>\c@tocdepth \else
@@ -258,7 +255,7 @@
   \@tempa
 }
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-bidi.def
index 8ee58c0a467..37513381c86 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-bidi.def
@@ -1,17 +1,14 @@
 %%
 %% This is file `wrapfig-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `wrapfig-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{wrapfig-bidi.def}[2010/03/01 v0.2 adaptations for wrapfig package]
 \let\WF@@everypar\n@everypar
 \def\WF@putfigmaybe{%
 \ifinner
@@ -19,7 +16,7 @@
   \let\pagetotal\maxdimen % kludge flag for "not top of page"
 \else % outer page
   \@tempdima\pagedepth % save page depth
-   {\advance\parskip\if@RTL\@tempdimb\else\@tempdima\fi\vskip-\parskip}% back up to baseline
+   {\advance\parskip\if@RTL\baselineskip\else\@tempdima\fi\vskip-\parskip}% back up to baseline
    \penalty\interlinepenalty % update pg. parameters
    \@tempdimb\pagegoal \advance\@tempdimb-\pagetotal % room left on page
    \ifdim\@tempdimb<\z@ % \WF@info{Page overfull already;}%
@@ -88,7 +85,7 @@
   \aftergroup\WF@startwrapping % after the \endgroup which immediately follows
 \fi}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xcolor-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xcolor-bidi.def
new file mode 100644
index 00000000000..b769811fcd0
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/bidi/xcolor-bidi.def
@@ -0,0 +1,127 @@
+%%
+%% This is file `xcolor-bidi.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2009-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{xcolor-bidi.def}[2010/03/01 v0.1 adaptations for xcolor package]
+\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}%
+  \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@
+  \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@
+  {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}\if@RTL\endL\fi}
+\DeclareRobustCommand\color
+ {\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\@ifnextchar[\@undeclaredcolor\@declaredcolor}
+\def\@undeclaredcolor[#1]#2%
+ {\begingroup
+  \let\@@cls\@empty
+  \XC@getmodclr12{#1}{#2}{}%
+   {\ifblendcolors
+      \ifx\colorblend\@empty\else
+        \edef\@@mix{\expandafter\@gobble\colorblend}\@tempswafalse
+        \XC@coremodel\@@mod\@@clr\@xcolor@{}{}\@@mod\@@clr
+      \fi
+    \fi
+    \ifconvertcolorsU
+      \edef\@@tmp{\XC@tgt@mod{\@@mod}}%
+      \convertcolorspec\@@mod\@@clr\@@tmp\@@clr \let\@@mod\@@tmp
+    \fi
+    \ifmaskcolors
+      \convertcolorspec\@@mod\@@clr\XC@mmod\@@clr
+      \let\@@mod\XC@mmod
+      \XC@inflate\@@mod\XC@mclr\@@clr\@@tmp
+      \expandafter\XC@mul\@@tmp,\@@clr
+    \fi
+    \edef\@@tmp{\noexpand\XC@undeclaredcolor{\@@mod}{\@@clr}}%
+    \expandafter\endgroup\@@tmp}}
+\def\@declaredcolor#1%
+ {\XC@edef\XC@@tmp{#1}\XC@@tstfalse
+  \ifcase\XC@type\XC@@tmp\relax \XC@@tsttrue\or \relax\else
+    \ifblendcolors\XC@@tsttrue\fi \ifmaskcolors\XC@@tsttrue\fi
+    \ifconvertcolorsU\XC@@tsttrue\fi
+  \fi
+  \ifXC@@tst
+    \expandafter\XC@declaredcolor\else
+    \expandafter\XC@declaredc@lor\fi}
+\def\XC@undeclaredcolor#1#2%
+ {\@ifundefinedmodel{#1}%
+   {\c@lor@error{model `#1'}}%
+   {\@nameuse{color@#1}\current@color{#2}%
+    \edef\XC@current@color{\noexpand\xcolor@{}{\current@color}{#1}{#2}}%
+    \XC@display}\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
+\def\XC@declaredc@lor
+ {\XC@let@Nc\XC@current@color{\string\color@\XC@@tmp}%
+  \edef\current@color{\XC@current@color}%
+  \XC@display\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
+\DeclareRobustCommand\bidicolor
+ {\@ifnextchar[\@bidiundeclaredcolor\@bidideclaredcolor}
+\def\@bidiundeclaredcolor[#1]#2%
+ {\begingroup
+  \let\@@cls\@empty
+  \XC@getmodclr12{#1}{#2}{}%
+   {\ifblendcolors
+      \ifx\colorblend\@empty\else
+        \edef\@@mix{\expandafter\@gobble\colorblend}\@tempswafalse
+        \XC@coremodel\@@mod\@@clr\@xcolor@{}{}\@@mod\@@clr
+      \fi
+    \fi
+    \ifconvertcolorsU
+      \edef\@@tmp{\XC@tgt@mod{\@@mod}}%
+      \convertcolorspec\@@mod\@@clr\@@tmp\@@clr \let\@@mod\@@tmp
+    \fi
+    \ifmaskcolors
+      \convertcolorspec\@@mod\@@clr\XC@mmod\@@clr
+      \let\@@mod\XC@mmod
+      \XC@inflate\@@mod\XC@mclr\@@clr\@@tmp
+      \expandafter\XC@mul\@@tmp,\@@clr
+    \fi
+    \edef\@@tmp{\noexpand\XC@bidiundeclaredcolor{\@@mod}{\@@clr}}%
+    \expandafter\endgroup\@@tmp}}
+\def\XC@bidiundeclaredcolor#1#2%
+ {\@ifundefinedmodel{#1}%
+   {\c@lor@error{model `#1'}}%
+   {\@nameuse{color@#1}\current@color{#2}%
+    \edef\XC@current@color{\noexpand\xcolor@{}{\current@color}{#1}{#2}}%
+    \XC@display}}
+\def\@bidideclaredcolor#1%
+ {\XC@edef\XC@@tmp{#1}\XC@@tstfalse
+  \ifcase\XC@type\XC@@tmp\relax \XC@@tsttrue\or \relax\else
+    \ifblendcolors\XC@@tsttrue\fi \ifmaskcolors\XC@@tsttrue\fi
+    \ifconvertcolorsU\XC@@tsttrue\fi
+  \fi
+  \ifXC@@tst
+    \expandafter\XC@bidideclaredcolor\else
+    \expandafter\XC@bidideclaredc@lor\fi}
+\def\XC@bidideclaredcolor
+ {\XC@split\XC@@tmp
+  \edef\@@tmp{\noexpand\@bidiundeclaredcolor[\@@mod]{\@@clr}}%
+  \expandafter\endgroup\@@tmp}
+\def\XC@bidideclaredc@lor
+ {\XC@let@Nc\XC@current@color{\string\color@\XC@@tmp}%
+  \edef\current@color{\XC@current@color}%
+  \XC@display}
+\def\color@box#1#2{\color@b@x\relax{\bidicolor#1{#2}}}
+\def\color@fbox#1#2#3#{\protect\color@fb@x{#1}{#2}{#3}}
+\def\color@fb@x#1#2#3#4%
+ {\color@b@x{\fboxsep\z@\bidicolor#1{#2}\XC@fbox}%
+   {\@ifxempty{#3}{\bidicolor#1}{\bidicolor#3}{#4}}}
+%% 
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 
+%% 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 `xcolor-bidi.def'.
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-bidi.def
index 0f7ac55e696..208a8211f52 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-bidi.def
@@ -1,23 +1,20 @@
 %%
 %% This is file `xltxtra-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx  (with options: `xltxtra-bidi.def')
+
 %% 
 %%   __________________________________
-%%   Copyright © 2009 Vafa Khalighi
+%%   Copyright © 2009-2010 Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+\ProvidesFile{xltxtra-bidi.def}[2010/03/01 v0.1 adaptations for xltxtra package]
 \let\@@XeTeX\XeTeX
 \def\XeTeX{\@ensure@LTR{\@@XeTeX}}
 \let\@@XeLaTeX\XeLaTeX
 \def\XeLaTeX{\@ensure@LTR{\@@XeLaTeX}}
 %% 
-%% Copyright © 2009      by Vafa Khalighi     <vafa@users.berlios.de>
+%% 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
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 05a38886bde..768baa32541 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -107,6 +107,7 @@ $Master = "$mydir/../..";
  'biblatex-mla',"die 'skipping, depends on experimental biblatex'",
  'bibtool',	"die 'skipping, requires compilation'",
  'bibtopicprefix', "&MAKEflatten",
+ 'bidi',	"&MAKEflatten",
  'bin-cjkutils',"&MAKEbin_cjkutils",
  'bitfield',	"die 'skipping, obsolete on CTAN'",
  'blanks',	"die 'skipping, unknown license (and c.1992)'",
author	Karl Berry <karl@freefriends.org>	2010-01-11 18:46:44 +0000
committer	Karl Berry <karl@freefriends.org>	2010-01-11 18:46:44 +0000
commit	b2653703ac55bf05f550a80ffa1fe05c5fe8bd47 (patch)
tree	f1134c0157d1fefadb188b15f095c13674484ea9 /Master
parent	47bbbc330ace9242ab5ee3af16c08d19a1496ac6 (diff)