bidi (12feb11)

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

83 files changed, 2305 insertions, 4951 deletions

diff --git a/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
index 52cde7535d2..44be8b78f37 100644
--- a/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `amsart-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -100,7 +100,7 @@
   \endlist
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -109,67 +109,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
index c0c465556db..7c3d7fd1725 100644
--- a/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `amsbook-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -118,7 +118,7 @@
   \skip@34\p@ \advance\skip@-\normalbaselineskip
   \vskip\skip@ }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -127,67 +127,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
index d112aedef91..8d1b080703e 100644
--- a/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def
@@ -7,13 +7,12 @@
 %% bidi.dtx  (with options: `amsmath-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \ProvidesFile{amsmath-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for amsmath package for XeTeX engine]
-\everydisplay\@xp{\the\everydisplay \@displaytrue}
 \renewcommand{\numberwithin}[3][\arabic]{%
   \@ifundefined{c@#2}{\@nocounterr{#2}}{%
     \@ifundefined{c@#3}{\@nocnterr{#3}}{%
@@ -28,7 +27,7 @@
 \DeclareRobustCommand{\[}{\begin{equation*}}
 \DeclareRobustCommand{\]}{\end{equation*}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -37,67 +36,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def
index bf7cac5007c..6d92481ea60 100644
--- a/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `amsthm-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -15,7 +15,7 @@
 \ProvidesFile{amsthm-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for amsthm package for XeTeX engine]
 \def\@thmcountersep{\@SepMark}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -24,67 +24,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def
index a06ed5b298c..8036a52c23e 100644
--- a/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `array-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -69,7 +69,7 @@
 \def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
 \def\endarray{\crcr \egroup\if@RTLtab\egroup\endR\egroup\fi \egroup \@arrayright \gdef\@preamble{}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -78,67 +78,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def
index a6156c352b9..880cf1c007d 100644
--- a/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `article-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -194,7 +194,7 @@
        {\@latex@warning{Empty `thebibliography' environment}}%
       \endlist}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -203,67 +203,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def
index dea5d544d43..e8951d28d0e 100644
--- a/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `artikel1-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -249,7 +249,7 @@
   \vskip 1.5em}
 \fi
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -258,67 +258,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def
index 4c1eff19056..24a07ae1e50 100644
--- a/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `artikel2-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -252,7 +252,7 @@
   \vskip 1.5em}
 \fi
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -261,67 +261,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def
index d59f8580f4c..792b772fe4a 100644
--- a/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `artikel3-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -260,7 +260,7 @@
   \vskip 1.5em}
 \fi
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -269,67 +269,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def
index e46ef620e66..77a20e5fae7 100644
--- a/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `arydshln-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -148,7 +148,7 @@
 \let\adl@org@classz\@classz
 }{}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -157,67 +157,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index dc6aff8cc09..8eb97700715 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -7,15 +7,15 @@
 %% bidi.dtx  (with options: `bidi.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2010/09/28}
-\def\bidiversion{v1.1.5a}
-\def\bidicommit{commit 98}
+\def\bididate{2011/03/21}
+\def\bidiversion{v1.1.6}
+\def\bidicommit{commit 145}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidicommit>
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -23,7 +23,7 @@ bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J
 Description: A convenient interface for typesetting bidirectional^^J
 texts in plain TeX and LaTeX.  The package includes adaptations for use^^J
 with many other commonly-used packages.^^J
-Copyright © 2009-2010 Vafa Khalighi^^J
+Copyright © 2009–2011 Vafa Khalighi^^J
 \bidiversion, <\bidicommit>, \bididate^^J
 License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J
 Home: http://bitbucket.org/vafa/bidi^^J
@@ -82,7 +82,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
   \ifLuaTeX
     \input{luatex-bidi.def}
   \else
-    \PackageError{bidi}{TeX engines other than XeTeX and LuaTeX are not yet supported}
+    \PackageError{bidi}{TeX engines other than XeTeX and LuaTeX are not yet supported}{}
   \fi
 \fi
 \if@developmentversion
@@ -90,7 +90,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \fi
 \ProcessOptions
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -99,67 +99,6 @@ Location on CTAN: /macros/latex/contrib/bidi}
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.tex b/Master/texmf-dist/tex/latex/bidi/bidi.tex
index 4898791e48b..c243718f5c1 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.tex
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex
@@ -7,21 +7,21 @@
 %% bidi.dtx  (with options: `bidi.tex')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
-\def\bididate{2010/09/28}
+\def\bididate{2011/03/21}
 \def\bidiversion{v0.1}
-\def\bidicommit{commit 98}
+\def\bidicommit{commit 145}
 \catcode`@=11
 \edef\bidiinfo{%
 bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J
 Description: A convenient interface for typesetting bidirectional^^J
 texts in plain TeX and LaTeX.  The package includes adaptations for use^^J
 with many other commonly-used packages.^^J
-Copyright © 2009-2010 Vafa Khalighi^^J
+Copyright © 2009–2011 Vafa Khalighi^^J
 \bidiversion, <\bidicommit>, \bididate^^J
 License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J
 Home: http://bitbucket.org/vafa/bidi^^J
@@ -60,7 +60,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \fi
 \catcode`@=12
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -69,67 +69,6 @@ Location on CTAN: /macros/latex/contrib/bidi}
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty
index 8256a9c44bc..42dcaf517ed 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `bidi2in1.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -69,7 +69,7 @@
 \global\let\and\relax
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -78,67 +78,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidicode.sty b/Master/texmf-dist/tex/latex/bidi/bidicode.sty
index 2b63e5b28d0..5d0dc2243a8 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidicode.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidicode.sty
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `bidicode.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -146,7 +146,7 @@
 \def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt}
 \def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -155,67 +155,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty
index b1e08f3d043..b05160b3902 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `bidiftnxtra.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -160,7 +160,7 @@
   \color@endbox
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -169,67 +169,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls
index 343c1c3a62f..aa630523974 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls
+++ b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `bidimoderncv.cls')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -261,7 +261,7 @@
 \newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}
 \let\@openbib@code\@empty
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -270,67 +270,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidipoem.sty b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty
index ad4b8d2a8e5..ac0316520ea 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidipoem.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `bidipoem.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -209,7 +209,7 @@
 \expandafter\def\csname modernpoem*\endcsname{\let\poem@obeylines=\obeylines\modernpoem}
 \expandafter\def\csname endmodernpoem*\endcsname{\endmodernpoem}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -218,67 +218,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls
index 729bff96e6c..65cc961b054 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls
+++ b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `bidipresentation.cls')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -85,7 +85,7 @@
     \setlength{\parsep}{0ex}}
                {\endlist}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -94,67 +94,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def
index 8f728d0369c..11b2ed98488 100644
--- a/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `boek-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -177,7 +177,7 @@
   \global\let\and\relax
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -186,67 +186,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def
index 1adc0f3219a..56f0e6cf60a 100644
--- a/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `boek3-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -177,7 +177,7 @@
   \global\let\and\relax
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -186,67 +186,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def
index 8d8459dc9ef..3c40183ab2d 100644
--- a/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `book-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -212,7 +212,7 @@
        {\@latex@warning{Empty `thebibliography' environment}}%
       \endlist}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -221,67 +221,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def
index 82d72339c91..26d2fe5c146 100644
--- a/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `bookest-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -46,7 +46,7 @@
   \vskip 30\p@
   }}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -55,67 +55,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def
index 22d2cd94c71..0ffad7f8647 100644
--- a/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `breqn-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -68,7 +68,7 @@
   }%
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -77,67 +77,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def
index c9bc8fc1350..2a5d9470cb7 100644
--- a/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `caption-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -15,7 +15,7 @@
 \ProvidesFile{caption-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for caption package for XeTeX engine]
 \let\@makecaption\caption@makecaption
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -24,67 +24,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def
index cb12013610c..83fbd418b4b 100644
--- a/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def
@@ -7,19 +7,20 @@
 %% bidi.dtx  (with options: `color-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \ProvidesFile{color-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for color package for XeTeX engine]
 \long\def\color@b@x#1#2#3{%
- \leavevmode\if@RTL\beginL\fi
+ \leavevmode\ifmmode\else\if@RTL\beginL\fi\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}
+      \box\z@}}\ifmmode\else\if@RTL\endL\fi\fi}
+\def\normalcolor{\let\current@color\default@color\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\set@color\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
 \DeclareRobustCommand\color{%
   \ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\@ifnextchar[\@undeclaredcolor\@declaredcolor}
 \def\@declaredcolor#1{%
@@ -53,8 +54,9 @@
 \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}}}
+\def\color@setgroup{\begingroup\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\set@color\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -63,67 +65,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def
index 858a0c0de08..2b831d48ced 100644
--- a/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `colortbl-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -51,7 +51,7 @@
         \unhbox\z@\if@RTL\endL\fi}%
   \prepnext@tok}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -60,67 +60,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty
index 98bbece0130..bc0cb3bd368 100644
--- a/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty
+++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `cvthemebidicasual.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -111,7 +111,7 @@
   \pagestyle{plain}}
 \AtBeginDocument{\makefooter}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -120,67 +120,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty
index d8355b813ca..bcf927646c7 100644
--- a/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty
+++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `cvthemebidiclassic.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -118,7 +118,7 @@
     {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}%
   }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -127,67 +127,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def
new file mode 100644
index 00000000000..a47f518ed0e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def
@@ -0,0 +1,211 @@
+%%
+%% This is file `dblfnote-xetex-bidi.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bidi.dtx  (with options: `dblfnote-xetex-bidi.def')
+%% 
+%%   ______________________________________
+%%   Copyright © 2009–2011  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{dblfnote-xetex-bidi.def}[2011/03/01 v0.1 bidi adaptations for dblfnote package for XeTeX engine]
+\def\right@footnote{%
+  \hbox to \DFNcolumnwidth
+  {\beginR \vbox{\kern -3\p@
+   \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}}
+\def\@iiiminipage#1#2[#3]#4{%
+  \leavevmode
+  \@pboxswfalse
+  \setlength\@tempdima{#4}%
+  \def\@mpargs{{#1}{#2}[#3]{#4}}%
+  \setbox\@tempboxa\vbox\bgroup\hbox\bgroup\if@RTL\beginL\fi\if #1t\vtop\else\vbox\fi\bgroup
+    \color@begingroup
+      \hsize\@tempdima
+      \textwidth\hsize \columnwidth\hsize
+      \@parboxrestore
+      \def\right@footnote{%
+  \hbox to \columnwidth
+  {\beginR \vbox{\kern -3\p@
+   \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}}
+      \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}
+\AtBeginDocument{\let\dfn@latex@footnotetext\@footnotetext
+\let\@footnotetext\dfn@footnotetext}
+\long\def\dfn@LTRfootnotetext#1{{\setbox\dfn@boxa\vbox{
+        \let\insert\dfn@gobble
+        \columnwidth\DFNcolumnwidth \hbadness\c@DFNsloppiness
+        \def\@makefnmark{\smash{\dfn@makefnmark}}
+        \dfn@latex@LTRfootnotetext{#1}\par \boxmaxdepth\dfn@fnmaxdp}%
+        \dfn@dima\ht\dfn@boxa \advance\dfn@dima\dp\dfn@boxa
+        \ifdim\dfn@dima>\z@\else
+                \dfn@dima1sp\relax
+                \setbox\dfn@boxa\vbox{\vbox to1sp{\unvbox\dfn@boxa\vfil}}\fi
+        \global\setbox\dfn@ins\vbox{\boxmaxdepth\dfn@fnmaxdp
+                \ifvoid\dfn@ins\else
+                        \unvbox\dfn@ins \allowbreak \nointerlineskip \fi
+                \ifdfn@allowcbreak \unvbox \else \box \fi \dfn@boxa}%
+        \setbox\dfn@boxa\copy\dfn@ins
+        \dfn@split{.5\ht\dfn@boxa}\dfn@boxa\dfn@boxb\dfn@fnmaxdp\footnotesep
+        \advance\@tempdima\@tempdimb \@tempdimb\@tempdima
+        \advance\@tempdima-\dfn@fnht \global\dfn@fnht\@tempdimb
+        \insert\footins{\floatingpenalty\@MM \vbox to\@tempdima{}}%
+        \xdef\dfn@list{\dfn@list\@elt{\number\dfn@dima}{\number\@tempdima}}}}
+\AtBeginDocument{\let\dfn@latex@LTRfootnotetext\@LTRfootnotetext
+\let\@LTRfootnotetext\dfn@LTRfootnotetext}
+\long\def\dfn@RTLfootnotetext#1{{\setbox\dfn@boxa\vbox{
+        \let\insert\dfn@gobble
+        \columnwidth\DFNcolumnwidth \hbadness\c@DFNsloppiness
+        \def\@makefnmark{\smash{\dfn@makefnmark}}
+        \dfn@latex@RTLfootnotetext{#1}\par \boxmaxdepth\dfn@fnmaxdp}%
+        \dfn@dima\ht\dfn@boxa \advance\dfn@dima\dp\dfn@boxa
+        \ifdim\dfn@dima>\z@\else
+                \dfn@dima1sp\relax
+                \setbox\dfn@boxa\vbox{\vbox to1sp{\unvbox\dfn@boxa\vfil}}\fi
+        \global\setbox\dfn@ins\vbox{\boxmaxdepth\dfn@fnmaxdp
+                \ifvoid\dfn@ins\else
+                        \unvbox\dfn@ins \allowbreak \nointerlineskip \fi
+                \ifdfn@allowcbreak \unvbox \else \box \fi \dfn@boxa}%
+        \setbox\dfn@boxa\copy\dfn@ins
+        \dfn@split{.5\ht\dfn@boxa}\dfn@boxa\dfn@boxb\dfn@fnmaxdp\footnotesep
+        \advance\@tempdima\@tempdimb \@tempdimb\@tempdima
+        \advance\@tempdima-\dfn@fnht \global\dfn@fnht\@tempdimb
+        \insert\footins{\floatingpenalty\@MM \vbox to\@tempdima{}}%
+        \xdef\dfn@list{\dfn@list\@elt{\number\dfn@dima}{\number\@tempdima}}}}
+\AtBeginDocument{\let\dfn@latex@RTLfootnotetext\@RTLfootnotetext
+\let\@RTLfootnotetext\dfn@RTLfootnotetext}
+\def\dfn@RTLmakecol{{\ifvoid\footins\else
+        \dfn@dima\ht\footins
+        \@tempcnta\z@ \dfn@countins
+        \@tempdima\z@ \let\@elt\dfn@elt@getht
+        \dfn@list\@nil
+        \ifdim\@tempdima=\z@\else
+        \dfn@split\@tempdima\dfn@ins\dfn@boxa\z@\z@
+        \global\setbox\dfn@ins\box\dfn@ins
+        \@tempswatrue
+        \ifdfn@trysingle
+                \setbox\dfn@boxb\vbox{\unvcopy\@cclv}\@tempdima\@colroom
+                \advance\@tempdima-\ht\dfn@boxb \advance\@tempdima-\dp\dfn@boxb
+                \advance\@tempdima-\skip\footins
+                \advance\@tempdima-\ht\dfn@boxa
+                \ifdim\@tempdima<\z@\else \@tempswafalse
+                        \global\setbox\footins\vbox{\boxmaxdepth\dfn@fnmaxdp
+                                \footnoterule \unvbox\dfn@boxa}\fi\fi
+        \if@tempswa
+        \dfn@split{\dfn@dima}\dfn@boxa\dfn@boxb\dfn@fnmaxdp\footnotesep
+        \global\setbox\footins\vbox{\hbox{%
+                 \hskip \DFNcolumnwidth
+                 \hskip\DFNcolumnsep
+                \hbox to\DFNcolumnwidth{\vbox to\@tempdima{\footnoterule
+                        \unvbox\dfn@boxb\vss}\hss}
+                \hskip -\textwidth
+                \hbox to\DFNcolumnwidth{\ifvoid\dfn@boxa\else
+                        \vbox to\@tempdima{
+                                \setbox\@tempboxa\vbox{\footnoterule}
+                                \ifdfn@ruleboth \unvbox\@tempboxa
+                                \else \@tempdima\ht\@tempboxa
+                                        \advance\@tempdima\dp\@tempboxa
+                                        \vskip\@tempdima
+                                        \prevdepth\dp\@tempboxa \fi
+                                \unvbox\dfn@boxa\vss}\fi\hss}
+                                 \hskip \DFNcolumnsep
+                                 \hskip \DFNcolumnwidth}}\fi\fi
+        \global\dfn@fnht\z@
+        \ifx\dfn@list\@empty\else
+                \let\@elt\dfn@elt@adjust \dfn@dima\z@ \dfn@dimb\z@
+                \dfn@list \global\advance\dfn@fnht\dfn@dimb
+                \let\@elt\relax
+                \ifdim\dfn@dimb>\z@
+                        \xdef\dfn@list{\@elt{0}{\number\dfn@dimb}\dfn@list}%
+                        \insert\footins{\floatingpenalty\@MM
+                                \vbox to\dfn@dimb{}}\fi
+                \ifdim\dfn@fnht>\@tempdima
+                        \@tempdimb\@tempdima \advance\@tempdimb-\dfn@fnht
+                        \global\dfn@fnht\@tempdima
+                        \xdef\dfn@list{\dfn@list\@elt{0}{\number\@tempdimb}}%
+                        \xdef\dfn@afteroutput{\insert\footins{
+                                        \floatingpenalty\@MM
+                                        \vbox to\number\@tempdimb sp{}}%
+                                \global\let\noexpand\dfn@afteroutput\relax}%
+                \fi\fi
+        \fi}%
+        \let\footnoterule\relax \dfn@latex@makecol
+        \let\footnoterule\dfn@footnoterule}
+\def\dfn@LTRmakecol{{\ifvoid\footins\else
+        \dfn@dima\ht\footins
+        \@tempcnta\z@ \dfn@countins
+        \@tempdima\z@ \let\@elt\dfn@elt@getht
+        \dfn@list\@nil
+        \ifdim\@tempdima=\z@\else
+        \dfn@split\@tempdima\dfn@ins\dfn@boxa\z@\z@
+        \global\setbox\dfn@ins\box\dfn@ins
+        \@tempswatrue
+        \ifdfn@trysingle
+                \setbox\dfn@boxb\vbox{\unvcopy\@cclv}\@tempdima\@colroom
+                \advance\@tempdima-\ht\dfn@boxb \advance\@tempdima-\dp\dfn@boxb
+                \advance\@tempdima-\skip\footins
+                \advance\@tempdima-\ht\dfn@boxa
+                \ifdim\@tempdima<\z@\else \@tempswafalse
+                        \global\setbox\footins\vbox{\boxmaxdepth\dfn@fnmaxdp
+                                \footnoterule \unvbox\dfn@boxa}\fi\fi
+        \if@tempswa
+        \dfn@split{\dfn@dima}\dfn@boxa\dfn@boxb\dfn@fnmaxdp\footnotesep
+        \global\setbox\footins\vbox{\hbox{%
+                \hbox to\DFNcolumnwidth{\vbox to\@tempdima{\footnoterule
+                        \unvbox\dfn@boxb\vss}\hss}\hskip\DFNcolumnsep
+                \hbox to\DFNcolumnwidth{\ifvoid\dfn@boxa\else
+                        \vbox to\@tempdima{
+                                \setbox\@tempboxa\vbox{\footnoterule}
+                                \ifdfn@ruleboth \unvbox\@tempboxa
+                                \else \@tempdima\ht\@tempboxa
+                                        \advance\@tempdima\dp\@tempboxa
+                                        \vskip\@tempdima
+                                        \prevdepth\dp\@tempboxa \fi
+                                \unvbox\dfn@boxa\vss}\fi\hss}}}\fi\fi
+        \global\dfn@fnht\z@
+        \ifx\dfn@list\@empty\else
+                \let\@elt\dfn@elt@adjust \dfn@dima\z@ \dfn@dimb\z@
+                \dfn@list \global\advance\dfn@fnht\dfn@dimb
+                \let\@elt\relax
+                \ifdim\dfn@dimb>\z@
+                        \xdef\dfn@list{\@elt{0}{\number\dfn@dimb}\dfn@list}%
+                        \insert\footins{\floatingpenalty\@MM
+                                \vbox to\dfn@dimb{}}\fi
+                \ifdim\dfn@fnht>\@tempdima
+                        \@tempdimb\@tempdima \advance\@tempdimb-\dfn@fnht
+                        \global\dfn@fnht\@tempdima
+                        \xdef\dfn@list{\dfn@list\@elt{0}{\number\@tempdimb}}%
+                        \xdef\dfn@afteroutput{\insert\footins{
+                                        \floatingpenalty\@MM
+                                        \vbox to\number\@tempdimb sp{}}%
+                                \global\let\noexpand\dfn@afteroutput\relax}%
+                \fi\fi
+        \fi}%
+        \let\footnoterule\relax \dfn@latex@makecol
+        \let\footnoterule\dfn@footnoterule}
+\renewcommand{\dfn@makecol}{\if@RTLmain\dfn@RTLmakecol\else\dfn@LTRmakecol\fi}
+\newcommand{\RTLdfnmakecol}{\renewcommand{\dfn@makecol}{\dfn@RTLmakecol}}
+\newcommand{\LTRdfnmakecol}{\renewcommand{\dfn@makecol}{\dfn@LTRmakecol}}
+\DFNalwaysdouble
+%% 
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
+%% 
+%% It may be distributed and/or modified 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 “author-maintained” (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%%
+%% End of file `dblfnote-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def
index 2fc2db8b37e..748f461603f 100644
--- a/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `draftwatermark-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -16,7 +16,7 @@
 \renewcommand\SetWatermarkText[1]{%
   \def\sc@wm@text{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -25,67 +25,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def
new file mode 100644
index 00000000000..3b833c44eb6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def
@@ -0,0 +1,67 @@
+%%
+%% This is file `empheq-xetex-bidi.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bidi.dtx  (with options: `empheq-xetex-bidi.def')
+%% 
+%%   ______________________________________
+%%   Copyright © 2009–2011  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{empheq-xetex-bidi.def}[2011/03/01 v0.1 bidi adaptations for empheq package for XeTeX engine]
+\MHInternalSyntaxOn
+\AtBeginDocument{%
+  \@ifpackageloaded{fancybox}{%
+    \@ifpackageloaded{color}{\definecolor{shadowcolor}{rgb}{0,0,0}}%
+    {\renewcommand*\textcolor[2]{\normalcolor{#2}}}%
+    \renewcommand*\shadowbox{%
+      \@ifstar{\MH_set_boolean_T:n {shadowbox_star}
+               \VerbBox\EQ_shadowbox:n}
+              {\MH_set_boolean_F:n {shadowbox_star}
+               \VerbBox\EQ_shadowbox:n}}
+    \def\EQ_shadowbox:n #1{%
+      \sbox{\z@}{\fbox{#1}}%
+      \MH_if_boolean:nTF {shadowbox_star}{
+        \MH_setlength:dn \@tempdima{\z@}%
+      }{
+        \MH_setlength:dn \@tempdima{\dp\z@+\shadowsize}%
+      }
+      \raisebox{\@tempdima}{%
+      \if@RTL\makebox[\z@][r]{%
+          \kern\shadowsize \textcolor{shadowcolor}{%
+            \rule[-\dp\z@-\shadowsize]{\wd\z@}{\shadowsize}}%
+        }\else%
+        \makebox[\z@][l]{%
+          \kern\shadowsize \textcolor{shadowcolor}{%
+            \rule[-\dp\z@-\shadowsize]{\wd\z@}{\shadowsize}}%
+        }\fi%
+        \usebox\z@\textcolor{shadowcolor}{%
+          \rule[-\dp\z@-\shadowsize]{\shadowsize}{\ht\z@+\dp\z@}}}}%
+  }{}%
+}
+\renewenvironment{EmphEqMainEnv}{\@RTLfalse\collect@body\EQ_getbody:n}{%
+  \if_num:w \l_EQ_equationtype_int=\z@ %ZeroCheckpoint
+    \EQ_upgrade_error:
+  \else:
+    \EQ_post_process:
+    \ignorespacesafterend
+  \fi:}
+\MHInternalSyntaxOff
+%% 
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
+%% 
+%% It may be distributed and/or modified 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 “author-maintained” (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%%
+%% End of file `empheq-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def
index 2e3dccc1f4e..a32601948c2 100644
--- a/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `extarticle-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -187,7 +187,7 @@
 \renewcommand\theparagraph    {\thesubsubsection\@SepMark\@arabic\c@paragraph}
 \renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}%%
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -196,67 +196,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def
index 9f3048b454a..7fbf7dae6f1 100644
--- a/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `extbook-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -186,7 +186,7 @@
        {\@latex@warning{Empty `thebibliography' environment}}%
       \endlist}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -195,67 +195,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def
index 03b5e1a45a9..443b537a129 100644
--- a/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `extletter-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -48,7 +48,7 @@
   \hrule \@width .4\columnwidth
   \kern .6\p@}\hfil\endR}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -57,67 +57,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def b/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def
new file mode 100644
index 00000000000..eef353c8485
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def
@@ -0,0 +1,1600 @@
+%%
+%% This is file `extrafootnotefeatures.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bidi.dtx  (with options: `extrafootnotefeatures.def')
+%% 
+%%   ______________________________________
+%%   Copyright © 2009–2011  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{extrafootnotefeatures}[2011/03/01 v0.1 bidi extra footnote features for XeTeX engine]
+\let\m@mold@footnotetext\@footnotetext
+\let\m@mold@LTRfootnotetext\@LTRfootnotetext
+\let\m@mold@RTLfootnotetext\@RTLfootnotetext
+\let\m@mold@mpfootnotetext\@mpfootnotetext
+\let\m@mold@mpLTRfootnotetext\@mpLTRfootnotetext
+\let\m@mold@mpRTLfootnotetext\@mpRTLfootnotetext
+\newcommand{\normalfootnotes}{%
+  \let\@footnotetext\m@mold@footnotetext
+  \let\@LTRfootnotetext\m@mold@LTRfootnotetext
+  \let\@RTLfootnotetext\m@mold@RTLfootnotetext
+  \let\@mpfootnotetext\m@mold@mpfootnotetext
+  \let\@mpLTRfootnotetext\m@mold@mpLTRfootnotetext
+  \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext}
+\newif\if@RTLcolumnfootnotes
+\newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue}
+\newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse}
+\g@addto@macro\document{\textwidthfootnoterule}
+\newcommand*{\setSingleSpace}[1]{%
+  \def\m@m@singlespace{#1}%
+  \def\m@m@footnote@spacing{#1}%
+  \def\m@m@float@spacing{#1} %
+}
+\setSingleSpace{1}
+\newinsert\sideins
+\newcommand*{\multiplefootnotemarker}{3sp}
+\newcommand*{\m@mmf@prepare}{%
+  \kern-\multiplefootnotemarker
+  \kern\multiplefootnotemarker\relax}
+\newlength{\footmarkwidth}
+\newlength{\footmarksep}
+\newlength{\footparindent}
+\newcommand*{\footmarkstyle}[1]{\def\footscript##1{#1}}
+\newcommand{\footfootmark}{%
+  \ifdim\footmarkwidth < \z@
+    \llap{\hb@xt@ -\footmarkwidth{%
+            \hss\normalfont\footscript{\@thefnmark}}%
+          \hspace*{-\footmarkwidth}}%
+  \else
+    \ifdim\footmarkwidth = \z@
+      {\normalfont\footscript{\@thefnmark}}%
+    \else
+      \hb@xt@\footmarkwidth{\hss\normalfont\footscript{\@thefnmark}}%
+    \fi
+  \fi}
+\footmarkstyle{\textsuperscript{#1}}
+\setlength{\footmarkwidth}{1.8em}
+\setlength{\footparindent}{1em}
+\newcommand{\m@mdoextrafeet}{\extrafeetins}
+\newcommand*{\extrafeetins}{%
+  \setbox\@outputbox \vbox{%
+    \boxmaxdepth \@maxdepth
+    \unvbox\@outputbox
+    \ifvoid\footinsv@r\else\@footstartv@r\@footgroupv@r\fi
+    \extrafeetinshook}}
+\newcommand{\extrafeetinshook}{}
+\newcommand{\foottextfont}{\footnotesize}
+\newlength{\footinsdim}
+  \setlength{\footinsdim}{8in}   % standard for \dimen\footins
+\newcommand{\@preamfntext}{%
+  \interlinepenalty\interfootnotelinepenalty
+  \floatingpenalty \@MM
+  \splittopskip=\footnotesep
+  \splitmaxdepth=\dp\strutbox
+  \@parboxrestore}
+\newcommand{\m@mdoextrafeetmini}{%
+  \extrafeetminihook}
+\newcommand{\extrafeetendmini}{%
+  \ifvoid\@mpfootinsv@r\else
+    \vskip\skip\@mpfootins
+    \normalcolor\footnoterule\mp@footgroupv@r
+  \fi
+  \extrafeetendminihook}
+\newcommand{\extrafeetendminihook}{}
+\newcommand{\m@mdoextrafeetendmini}{\extrafeetendmini}
+\def\endminipage{%
+  \par
+  \unskip
+  \ifvoid\@mpfootins\else
+    \vskip\skip\@mpfootins
+    \normalcolor
+    \footnoterule
+    \unvbox\@mpfootins
+  \fi
+  \m@mdoextrafeetendmini
+  \@minipagefalse
+  \color@endgroup
+   \egroup
+ \if@RTL\endL\fi
+  \egroup
+  \egroup
+  \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa\leavevmode}}
+\newcommand{\m@make@footstart}[1]{%
+  \@namedef{@footstart#1}{%
+    \vskip\bigskipamount
+    \leftskip=\z@
+    \rightskip=\z@
+    \footnoterule}}
+\newinsert\footinsv@r
+  \skip\footinsv@r\bigskipamount
+  \count\footinsv@r=1000 % no magnifcation
+  \dimen\footinsv@r=\footinsdim
+\m@make@footstart{v@r}
+\newcommand{\@footgroupv@r}{}
+\newinsert\@mpfootinsv@r
+\newcommand{\mp@footgroupv@r}{}
+\newcount\m@m@k \newdimen\m@m@h
+\newcommand*{\m@mrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3
+  \@@line{\if@RTLcolumnfootnotes\beginR\fi\splittopskip=\m@m@h \vbadness=\@M \hfilneg
+  \valign{##\vfill\cr\m@mdosplits}\if@RTLcolumnfootnotes\endR\fi}}
+\newcommand*{\m@mdosplits}{\ifnum\m@m@k>0 \noalign{\hfil}\m@msplitoff
+  \global\advance\m@m@k-1\cr\m@mdosplits\fi}
+\newcommand*{\m@msplitoff}{\dimen0=\ht0
+  \divide\dimen0 by\m@m@k \advance\dimen0 by\m@m@h
+  \setbox2 \vsplit0 to \dimen0
+  \unvbox2 }
+\newcommand{\twocolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@twocolfootnotetext
+  \let\@LTRfootnotetext\@twocolLTRfootnotetext
+  \let\@RTLfootnotetext\@twocolRTLfootnotetext
+  \dimen\footinsv@r=2\footinsdim
+  \count\footinsv@r=500\relax
+  \m@make@twocol@footgroup{v@r}%
+  \let\@footgroupv@r\@twocol@footgroupv@r
+  \let\@mpfootnotetext\@mptwocolfootnotetext
+  \let\@mpLTRfootnotetext\@mptwocolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mptwocolRTLfootnotetext
+  \m@make@mptwocol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mptwocol@footgroupv@r}
+\newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@twocolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@twocolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@twocolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@twocolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preamtwofmt}{%
+  \hsize .45\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@twocolfootfmt}[1]{%
+  \@preamtwofmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mptwocolfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@twocolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mptwocolLTRfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@twocolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mptwocolRTLfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@twocolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\twocolumnfootstyle}[1]{%
+  \m@make@twocolfootnotetext{#1}%
+  \m@make@mptwocolfootnotetext{#1}%
+  \m@make@twocolfootfmt{#1}%
+  \m@make@twocol@footgroup{#1}%
+  \m@make@mptwocol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@twocolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mptwocolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@twocol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mptwocol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@twocolfootnotetext}[1]{%
+  \@namelongdef{@twocolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@twocolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mptwocolfootnotetext}[1]{%
+\@namelongdef{@mptwocolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@twocolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@twocolfootfmt}[1]{%
+  \@namedef{@twocolfootfmt#1}##1{%
+    \@preamtwofmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@twocol@footgroup}[1]{%
+  \@namedef{@twocol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{\tw@}{\splittopskip}}}}
+\newcommand{\m@make@mptwocol@footgroup}[1]{%
+\@namedef{@mptwocol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\tw@}{\splittopskip}}}}
+\newcommand{\threecolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@threecolfootnotetext
+  \let\@LTRfootnotetext\@threecolLTRfootnotetext
+  \let\@RTLfootnotetext\@threecolRTLfootnotetext
+  \dimen\footinsv@r=3\footinsdim
+  \count\footinsv@r=333\relax
+  \m@make@threecol@footgroup{v@r}%
+  \let\@footgroupv@r\@threecol@footgroupv@r
+  \let\@mpfootnotetext\@mpthreecolfootnotetext
+  \let\@mpLTRfootnotetext\@mpthreecolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mpthreecolRTLfootnotetext
+  \m@make@mpthreecol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mpthreecol@footgroupv@r}
+\newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@threecolfootfmt{#1}%
+  \color@endgroup}\m@mmf@prepare}
+\newcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@threecolfootfmt{#1}%
+  \color@endgroup}\m@mmf@prepare}
+\newcommand{\@threecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@threecolfootfmt{#1}%
+  \color@endgroup}\m@mmf@prepare}
+\newcommand{\@preamthreefmt}{%
+  \hsize .3\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@threecolfootfmt}[1]{%
+  \@preamthreefmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mpthreecolfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@threecolfootfmt{#1}%
+  \color@endgroup}\m@mmf@prepare}
+\newcommand{\@mpthreecolLTRfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@threecolfootfmt{#1}%
+  \color@endgroup}\m@mmf@prepare}
+\newcommand{\@mpthreecolRTLfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@threecolfootfmt{#1}%
+  \color@endgroup}\m@mmf@prepare}
+\newcommand{\threecolumnfootstyle}[1]{%
+  \m@make@threecolfootnotetext{#1}%
+  \m@make@mpthreecolfootnotetext{#1}%
+  \m@make@threecolfootfmt{#1}%
+  \m@make@threecol@footgroup{#1}%
+  \m@make@mpthreecol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+    \@nameuse{@threecolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+    \@nameuse{@mpthreecolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@threecol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mpthreecol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=3\footinsdim
+  \expandafter\count\csname footins#1\endcsname=333\relax}
+\newcommand{\m@make@threecolfootnotetext}[1]{%
+\@namelongdef{@threecolfootnotetext#1}##1{%
+  \insert\@nameuse{footins#1}{%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\@nameuse{foottextfont#1}%
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@threecolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@mpthreecolfootnotetext}[1]{%
+\@namelongdef{@mpthreecolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@threecolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@threecolfootfmt}[1]{%
+\@namelongdef{@threecolfootfmt#1}##1{%
+  \@preamthreefmt
+  {\@nameuse{footfootmark#1}\strut
+   {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@threecol@footgroup}[1]{%
+\@namedef{@threecol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{footins#1}}{\thr@@}{\splittopskip}}}}
+\newcommand{\m@make@mpthreecol@footgroup}[1]{%
+\@namedef{@mpthreecol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\thr@@}{\splittopskip}}}}
+\newcommand{\fourcolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@fourcolfootnotetext
+  \let\@LTRfootnotetext\@fourcolLTRfootnotetext
+  \let\@RTLfootnotetext\@fourcolRTLfootnotetext
+  \dimen\footinsv@r=4\footinsdim
+  \count\footinsv@r=250\relax
+  \m@make@fourcol@footgroup{v@r}%
+  \let\@footgroupv@r\@fourcol@footgroupv@r
+  \let\@mpfootnotetext\@mpfourcolfootnotetext
+  \let\@mpLTRfootnotetext\@mpfourcolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mpfourcolRTLfootnotetext
+  \m@make@mpfourcol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mpfourcol@footgroupv@r}
+\newcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fourcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fourcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@fourcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fourcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preamfourfmt}{%
+  \hsize .25\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@fourcolfootfmt}[1]{%
+  \@preamfourfmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mpfourcolfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fourcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpfourcolLTRfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fourcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpfourcolRTLfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fourcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\fourcolumnfootstyle}[1]{%
+  \m@make@fourcolfootnotetext{#1}%
+  \m@make@mpfourcolfootnotetext{#1}%
+  \m@make@fourcolfootfmt{#1}%
+  \m@make@fourcol@footgroup{#1}%
+  \m@make@mpfourcol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@fourcolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mpfourcolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@fourcol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mpfourcol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@fourcolfootnotetext}[1]{%
+  \@namelongdef{@fourcolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@fourcolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mpfourcolfootnotetext}[1]{%
+\@namelongdef{@mpfourcolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@fourcolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@fourcolfootfmt}[1]{%
+  \@namedef{@fourcolfootfmt#1}##1{%
+    \@preamfourfmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@fourcol@footgroup}[1]{%
+  \@namedef{@fourcol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{4}{\splittopskip}}}}
+\newcommand{\m@make@mpfourcol@footgroup}[1]{%
+\@namedef{@mpfourcol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{4}{\splittopskip}}}}
+\newcommand{\fivecolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@fivecolfootnotetext
+  \let\@LTRfootnotetext\@fivecolLTRfootnotetext
+  \let\@RTLfootnotetext\@fivecolRTLfootnotetext
+  \dimen\footinsv@r=5\footinsdim
+  \count\footinsv@r=200\relax
+  \m@make@fivecol@footgroup{v@r}%
+  \let\@footgroupv@r\@fivecol@footgroupv@r
+  \let\@mpfootnotetext\@mpfivecolfootnotetext
+  \let\@mpLTRfootnotetext\@mpfivecolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mpfivecolRTLfootnotetext
+  \m@make@mpfivecol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mpfivecol@footgroupv@r}
+\newcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fivecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fivecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@fivecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fivecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preamfivefmt}{%
+  \hsize .2\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@fivecolfootfmt}[1]{%
+  \@preamfivefmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mpfivecolfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fivecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpfivecolLTRfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fivecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpfivecolRTLfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@fivecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\fivecolumnfootstyle}[1]{%
+  \m@make@fivecolfootnotetext{#1}%
+  \m@make@mpfivecolfootnotetext{#1}%
+  \m@make@fivecolfootfmt{#1}%
+  \m@make@fivecol@footgroup{#1}%
+  \m@make@mpfivecol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@fivecolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mpfivecolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@fivecol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mpfivecol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@fivecolfootnotetext}[1]{%
+  \@namelongdef{@fivecolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@fivecolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mpfivecolfootnotetext}[1]{%
+\@namelongdef{@mpfivecolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@fivecolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@fivecolfootfmt}[1]{%
+  \@namedef{@fivecolfootfmt#1}##1{%
+    \@preamfivefmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@fivecol@footgroup}[1]{%
+  \@namedef{@fivecol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{5}{\splittopskip}}}}
+\newcommand{\m@make@mpfivecol@footgroup}[1]{%
+\@namedef{@mpfivecol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{5}{\splittopskip}}}}
+\newcommand{\sixcolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@sixcolfootnotetext
+  \let\@LTRfootnotetext\@sixcolLTRfootnotetext
+  \let\@RTLfootnotetext\@sixcolRTLfootnotetext
+  \dimen\footinsv@r=6\footinsdim
+  \count\footinsv@r=166\relax
+  \m@make@sixcol@footgroup{v@r}%
+  \let\@footgroupv@r\@sixcol@footgroupv@r
+  \let\@mpfootnotetext\@mpsixcolfootnotetext
+  \let\@mpLTRfootnotetext\@mpsixcolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mpsixcolRTLfootnotetext
+  \m@make@mpsixcol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mpsixcol@footgroupv@r}
+\newcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sixcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sixcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@sixcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sixcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preamsixfmt}{%
+  \hsize .16\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@sixcolfootfmt}[1]{%
+  \@preamsixfmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mpsixcolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \global\setbox\@mpfootinsv@r\vbox{%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sixcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpsixcolLTRfootnotetext}[1]{\@RTLfalse%
+  \global\setbox\@mpfootinsv@r\vbox{%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sixcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpsixcolRTLfootnotetext}[1]{\@RTLtrue%
+  \global\setbox\@mpfootinsv@r\vbox{%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sixcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\sixcolumnfootstyle}[1]{%
+  \m@make@sixcolfootnotetext{#1}%
+  \m@make@mpsixcolfootnotetext{#1}%
+  \m@make@sixcolfootfmt{#1}%
+  \m@make@sixcol@footgroup{#1}%
+  \m@make@mpsixcol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@sixcolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mpsixcolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@sixcol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mpsixcol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@sixcolfootnotetext}[1]{%
+  \@namelongdef{@sixcolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@sixcolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mpsixcolfootnotetext}[1]{%
+\@namelongdef{@mpsixcolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@sixcolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@sixcolfootfmt}[1]{%
+  \@namedef{@sixcolfootfmt#1}##1{%
+    \@preamsixfmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@sixcol@footgroup}[1]{%
+  \@namedef{@sixcol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{6}{\splittopskip}}}}
+\newcommand{\m@make@mpsixcol@footgroup}[1]{%
+\@namedef{@mpsixcol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{6}{\splittopskip}}}}
+\newcommand{\sevencolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@sevencolfootnotetext
+  \let\@LTRfootnotetext\@sevencolLTRfootnotetext
+  \let\@RTLfootnotetext\@sevencolRTLfootnotetext
+  \dimen\footinsv@r=7\footinsdim
+  \count\footinsv@r=142\relax
+  \m@make@sevencol@footgroup{v@r}%
+  \let\@footgroupv@r\@sevencol@footgroupv@r
+  \let\@mpfootnotetext\@mpsevencolfootnotetext
+  \let\@mpLTRfootnotetext\@mpsevencolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mpsevencolRTLfootnotetext
+  \m@make@mpsevencol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mpsevencol@footgroupv@r}
+\newcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sevencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sevencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@sevencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sevencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preamsevenfmt}{%
+  \hsize .142\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@sevencolfootfmt}[1]{%
+  \@preamsevenfmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mpsevencolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \global\setbox\@mpfootinsv@r\vbox{%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sevencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpsevencolLTRfootnotetext}[1]{\@RTLfalse%
+  \global\setbox\@mpfootinsv@r\vbox{%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sevencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpsevencolRTLfootnotetext}[1]{\@RTLtrue%
+  \global\setbox\@mpfootinsv@r\vbox{%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@sevencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\sevencolumnfootstyle}[1]{%
+  \m@make@sevencolfootnotetext{#1}%
+  \m@make@mpsevencolfootnotetext{#1}%
+  \m@make@sevencolfootfmt{#1}%
+  \m@make@sevencol@footgroup{#1}%
+  \m@make@mpsevencol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@sevencolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mpsevencolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@sevencol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mpsevencol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@sevencolfootnotetext}[1]{%
+  \@namelongdef{@sevencolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@sevencolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mpsevencolfootnotetext}[1]{%
+\@namelongdef{@mpsevencolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@sevencolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@sevencolfootfmt}[1]{%
+  \@namedef{@sevencolfootfmt#1}##1{%
+    \@preamsevenfmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@sevencol@footgroup}[1]{%
+  \@namedef{@sevencol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{7}{\splittopskip}}}}
+\newcommand{\m@make@mpsevencol@footgroup}[1]{%
+\@namedef{@mpsevencol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{7}{\splittopskip}}}}
+\newcommand{\eightcolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@eightcolfootnotetext
+  \let\@LTRfootnotetext\@eightcolLTRfootnotetext
+  \let\@RTLfootnotetext\@eightcolRTLfootnotetext
+  \dimen\footinsv@r=8\footinsdim
+  \count\footinsv@r=125\relax
+  \m@make@eightcol@footgroup{v@r}%
+  \let\@footgroupv@r\@eightcol@footgroupv@r
+  \let\@mpfootnotetext\@mpeightcolfootnotetext
+  \let\@mpLTRfootnotetext\@mpeightcolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mpeightcolRTLfootnotetext
+  \m@make@mpeightcol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mpeightcol@footgroupv@r}
+\newcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@eightcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@eightcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@eightcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@eightcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preameightfmt}{%
+  \hsize .125\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@eightcolfootfmt}[1]{%
+  \@preameightfmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mpeightcolfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@eightcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpeightcolLTRfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@eightcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpeightcolRTLfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@eightcolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\eightcolumnfootstyle}[1]{%
+  \m@make@eightcolfootnotetext{#1}%
+  \m@make@mpeightcolfootnotetext{#1}%
+  \m@make@eightcolfootfmt{#1}%
+  \m@make@eightcol@footgroup{#1}%
+  \m@make@mpeightcol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@eightcolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mpeightcolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@eightcol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mpeightcol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@eightcolfootnotetext}[1]{%
+  \@namelongdef{@eightcolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@eightcolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mpeightcolfootnotetext}[1]{%
+\@namelongdef{@mpeightcolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@eightcolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@eightcolfootfmt}[1]{%
+  \@namedef{@eightcolfootfmt#1}##1{%
+    \@preameightfmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@eightcol@footgroup}[1]{%
+  \@namedef{@eightcol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{8}{\splittopskip}}}}
+\newcommand{\m@make@mpeightcol@footgroup}[1]{%
+\@namedef{@mpeightcol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{8}{\splittopskip}}}}
+\newcommand{\ninecolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@ninecolfootnotetext
+  \let\@LTRfootnotetext\@ninecolLTRfootnotetext
+  \let\@RTLfootnotetext\@ninecolRTLfootnotetext
+  \dimen\footinsv@r=9\footinsdim
+  \count\footinsv@r=111\relax
+  \m@make@ninecol@footgroup{v@r}%
+  \let\@footgroupv@r\@ninecol@footgroupv@r
+  \let\@mpfootnotetext\@mpninecolfootnotetext
+  \let\@mpLTRfootnotetext\@mpninecolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mpninecolRTLfootnotetext
+  \m@make@mpninecol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mpninecol@footgroupv@r}
+\newcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@ninecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@ninecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@ninecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@ninecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preamninefmt}{%
+  \hsize .1\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@ninecolfootfmt}[1]{%
+  \@preamninefmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mpninecolfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@ninecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpninecolLTRfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@ninecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mpninecolRTLfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@ninecolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\ninecolumnfootstyle}[1]{%
+  \m@make@ninecolfootnotetext{#1}%
+  \m@make@mpninecolfootnotetext{#1}%
+  \m@make@ninecolfootfmt{#1}%
+  \m@make@ninecol@footgroup{#1}%
+  \m@make@mpninecol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@ninecolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mpninecolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@ninecol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mpninecol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@ninecolfootnotetext}[1]{%
+  \@namelongdef{@ninecolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@ninecolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mpninecolfootnotetext}[1]{%
+\@namelongdef{@mpninecolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@ninecolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@ninecolfootfmt}[1]{%
+  \@namedef{@ninecolfootfmt#1}##1{%
+    \@preamninefmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@ninecol@footgroup}[1]{%
+  \@namedef{@ninecol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{9}{\splittopskip}}}}
+\newcommand{\m@make@mpninecol@footgroup}[1]{%
+\@namedef{@mpninecol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{9}{\splittopskip}}}}
+\newcommand{\tencolumnfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@tencolfootnotetext
+  \let\@LTRfootnotetext\@tencolLTRfootnotetext
+  \let\@RTLfootnotetext\@tencolRTLfootnotetext
+  \dimen\footinsv@r=10\footinsdim
+  \count\footinsv@r=100\relax
+  \m@make@tencol@footgroup{v@r}%
+  \let\@footgroupv@r\@tencol@footgroupv@r
+  \let\@mpfootnotetext\@mptencolfootnotetext
+  \let\@mpLTRfootnotetext\@mptencolLTRfootnotetext
+  \let\@mpRTLfootnotetext\@mptencolRTLfootnotetext
+  \m@make@mptencol@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mptencol@footgroupv@r}
+\newcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@tencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@tencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@tencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue%
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@tencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@preamtenfmt}{%
+  \hsize .1\hsize
+  \parindent=\z@
+  \tolerance=5000\relax
+  \leavevmode}
+\newcommand{\@tencolfootfmt}[1]{%
+  \@preamtenfmt
+  {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
+\newcommand{\@mptencolfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@tencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mptencolLTRfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \if@RTLcolumnfootnotes\beginL\fi
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@tencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\@mptencolRTLfootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@tencolfootfmt{#1}%
+  \color@endgroup}%
+  \m@mmf@prepare}
+\newcommand{\tencolumnfootstyle}[1]{%
+  \m@make@tencolfootnotetext{#1}%
+  \m@make@mptencolfootnotetext{#1}%
+  \m@make@tencolfootfmt{#1}%
+  \m@make@tencol@footgroup{#1}%
+  \m@make@mptencol@footgroup{#1}%
+  \m@make@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+     \@nameuse{@tencolfootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+     \@nameuse{@mptencolfootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@tencol@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mptencol@footgroup#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=2\footinsdim
+  \expandafter\count\csname footins#1\endcsname=500\relax}
+\newcommand{\m@make@tencolfootnotetext}[1]{%
+  \@namelongdef{@tencolfootnotetext#1}##1{%
+    \insert\@nameuse{footins#1}{%
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \@preamfntext
+    \protected@edef\@currentlabel{%
+      \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+    \color@begingroup
+      \@nameuse{@tencolfootfmt#1}{##1}%
+    \color@endgroup}%
+    \m@mmf@prepare}}
+\newcommand{\m@make@mptencolfootnotetext}[1]{%
+\@namelongdef{@mptencolfootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+  \color@begingroup
+    \@nameuse{@tencolfootfmt#1}{##1}%
+  \color@endgroup}\m@mmf@prepare}}
+\newcommand{\m@make@tencolfootfmt}[1]{%
+  \@namedef{@tencolfootfmt#1}##1{%
+    \@preamtenfmt
+    {\@nameuse{footfootmark#1}\strut
+     {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}}
+\newcommand{\m@make@tencol@footgroup}[1]{%
+  \@namedef{@tencol@footgroup#1}{{%
+    \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+     \m@mrigidbalance{\@nameuse{footins#1}}{10}{\splittopskip}}}}
+\newcommand{\m@make@mptencol@footgroup}[1]{%
+\@namedef{@mptencol@footgroup#1}{{%
+  \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox
+  \m@mrigidbalance{\@nameuse{@mpfootins#1}}{10}{\splittopskip}}}}
+\newcommand{\m@munvxh}[1]{%
+  \setbox0=\vbox{\unvbox#1%
+    \global\setbox1=\lastbox}%
+  \unhbox1
+  \unskip
+  \unskip
+  \unpenalty
+  \hskip\m@mipn@skip}
+\newcommand{\m@mungebox}{%
+  \setbox0=\hbox{\m@munvxh0}%
+  \dp0=\z@
+  \ht0=\footfudgefactor\wd0
+  \box0
+  \penalty0}
+\newskip\m@mipn@skip
+\newcommand*{\m@minterparanoteglue}[1]{%
+  {\foottextfont\global\m@mipn@skip=#1\relax}}
+\m@minterparanoteglue{1em plus.4em minus.4em}
+\newcommand*{\m@mmakehboxofhboxes}{\setbox0=\hbox{}%
+  \loop
+    \unpenalty
+    \setbox2=\lastbox
+  \ifhbox2
+    \setbox0=\hbox{\box2\unhbox0}
+  \repeat}
+\newcommand*{\m@mremovehboxes}{\setbox0=\lastbox
+  \ifhbox0{\m@mremovehboxes}\unhbox0 \fi}
+\newcommand*{\footfudgefiddle}{64}
+\newcommand{\paragraphfootnotes}{%
+  \@namedef{foottextfontv@r}{\foottextfont}%  % [RS]
+  \let\@footnotetext\@parafootnotetext
+  \dimen\footinsv@r=\footinsdim
+  \count\footinsv@r=1000\relax
+  \m@make@para@footgroup{v@r}%
+  \let\@footgroupv@r\@para@footgroupv@r
+  \let\@mpfootnotetext\@mpparafootnotetext
+  \m@make@mppara@footgroup{v@r}%
+  \let\mp@footgroupv@r\@mppara@footgroupv@r
+  {\foottextfont
+   \dimen0=\baselineskip
+   \multiply\dimen0 by 1024
+   \divide\dimen0 by \hsize \multiply\dimen0 by \footfudgefiddle
+   \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}}
+\newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\foottextfont
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \setbox0=\vbox{\hsize=\maxdimen
+    \color@begingroup
+      \noindent \@parafootfmt{#1}%
+    \color@endgroup}%
+  \m@mungebox}\m@mmf@prepare}
+\newcommand{\@parafootfmt}[1]{%
+  \parindent=\z@
+  \parfillskip=0pt \@plus 1fil
+  {\footfootmark\strut {\foottextfont #1}\penalty-10}}
+\newcommand{\@mpparafootnotetext}[1]{%
+  \global\setbox\@mpfootinsv@r\vbox{%
+    \unvbox\@mpfootinsv@r
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\foottextfont
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote\endcsname\@thefnmark}%
+    \setbox0=\vbox{\hsize=\maxdimen
+      \color@begingroup
+      \noindent \@parafootfmt{#1}%
+      \color@endgroup}%
+  \m@mungebox}\m@mmf@prepare}
+\newcommand{\paragraphfootstyle}[1]{%
+  \m@make@parafootnotetext{#1}%
+  \m@make@mpparafootnotetext{#1}%
+  \m@make@parafootfmt{#1}%
+  \m@make@para@footgroup{#1}%
+  \m@make@mppara@footgroup{#1}%
+  \m@make@para@footstart{#1}%
+  \@namelongdef{@footnotetext#1}##1{%
+    \@nameuse{@parafootnotetext#1}{##1}}%
+  \@namelongdef{@mpfootnotetext#1}##1{%
+    \@nameuse{@mpparafootnotetext#1}{##1}}%
+  \@namedef{@footgroup#1}{\@nameuse{@para@footgroup#1}}%
+  \@namedef{mp@footgroup#1}{\@nameuse{@mppara@footgroup#1}}%
+  \@namedef{@footstart#1}{\@nameuse{@para@footstart#1}}%
+  \expandafter\dimen\csname footins#1\endcsname=\footinsdim
+  \expandafter\count\csname footins#1\endcsname=1000\relax
+  {\@nameuse{foottextfont#1}%
+   \dimen0=\baselineskip
+   \multiply\dimen0 by 1024
+   \divide\dimen0 by \hsize \multiply\dimen0 by 64
+   \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}}
+\newcommand{\m@make@parafootnotetext}[1]{%
+\@namelongdef{@parafootnotetext#1}##1{%
+  \insert\@nameuse{footins#1}{
+  \def\baselinestretch{\m@m@footnote@spacing}%
+  \reset@font\@nameuse{foottextfont#1}%
+  \@preamfntext
+  \protected@edef\@currentlabel{%
+    \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}%
+  \setbox0=\vbox{\hsize=\maxdimen
+    \color@begingroup
+      \noindent \@nameuse{@parafootfmt#1}{##1}%
+    \color@endgroup}%
+  \m@mungebox}\m@mmf@prepare}}
+\newcommand{\m@make@mpparafootnotetext}[1]{%
+\@namelongdef{@mpparafootnotetext#1}##1{%
+  \global\setbox\@nameuse{@mpfootins#1}\vbox{%
+    \unvbox\@nameuse{@mpfootins#1}
+    \def\baselinestretch{\m@m@footnote@spacing}%
+    \reset@font\@nameuse{foottextfont#1}%
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+      \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}%
+    \setbox0=\vbox{\hsize=\maxdimen
+      \color@begingroup
+        \noindent \@nameuse{@parafootfmt#1}{##1}%
+      \color@endgroup}%
+    \m@mungebox}\m@mmf@prepare}}
+\newcommand{\m@make@parafootfmt}[1]{%
+\@namelongdef{@parafootfmt#1}##1{%
+  \parindent=\z@
+  \parfillskip=0pt \@plus 1fil
+  {\@nameuse{footfootmark#1}\strut
+   {\@nameuse{foottextfont#1}##1}\penalty-10}}}
+\newcommand{\m@make@para@footgroup}[1]{%
+\@namedef{@para@footgroup#1}{%
+  \unvbox\@nameuse{footins#1}
+  \m@mmakehboxofhboxes
+  \setbox0=\hbox{\unhbox0 \m@mremovehboxes}%
+  \@nameuse{foottextfont#1}%
+  \noindent\unhbox0\par}}
+\newcommand{\m@make@mppara@footgroup}[1]{%
+\@namedef{@mppara@footgroup#1}{%
+  \unvbox\@nameuse{@mpfootins#1}
+  \m@mmakehboxofhboxes
+  \setbox0=\hbox{\unhbox0 \m@mremovehboxes}%
+  \@nameuse{foottextfont#1}%
+  \noindent\unhbox0\par}}
+\newcommand{\m@make@para@footstart}[1]{%
+\@namedef{@para@footstart#1}{%
+  \vskip\bigskipamount
+  \leftskip=\z@
+  \rightskip=\z@
+  \parindent=\z@
+  \vskip\skip\@nameuse{footins#1}%
+  \footnoterule}}
+\newcommand*{\m@m@makecolfloats}{%
+  \xdef\@freelist{\@freelist\@midlist}%
+  \global\let\@midlist\@empty
+  \@combinefloats}
+\newcommand*{\m@m@makecoltext}{%
+  \ifvbox\@kludgeins
+    \@makespecialcolbox
+  \else
+    \setbox\@outputbox \vbox to\@colht{%
+      \@texttop
+      \dimen@ \dp\@outputbox
+      \unvbox \@outputbox
+      \vskip -\dimen@
+      \@textbottom}%
+  \fi}
+\newcommand*{\m@m@makecolintro}{}
+\newcommand*{\m@mopfootnote}{\setbox\@outputbox \vbox{%
+  \boxmaxdepth\@maxdepth
+  \@tempdima\dp\@cclv
+  \unvbox\@cclv
+  \vskip-\@tempdima
+  \vskip \skip\footins
+  \color@begingroup
+    \normalcolor
+    \footnoterule
+    \unvbox \footins
+  \color@endgroup}}
+\newcommand*{\m@mopsidebar}{%
+  \ifvoid\sideins\else
+    \setbox\@outputbox \vbox{%
+      \sidecontents
+      \unvbox\@outputbox}
+  \fi}
+\gdef\mem@makecol{%
+  \m@m@makecolintro
+  \ifvoid\footins
+    \setbox\@outputbox \box\@cclv
+  \else
+    \m@mopfootnote
+  \fi
+  \m@mdoextrafeet
+  \m@m@makecolfloats
+  \m@mopsidebar
+  \m@m@makecoltext
+  \global \maxdepth \@maxdepth}
+\newcommand{\feetabovefloat}{\gdef\@makecol{\mem@makecol}}
+\feetabovefloat%
+%% 
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
+%% 
+%% It may be distributed and/or modified 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 “author-maintained” (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%%
+%% End of file `extrafootnotefeatures.def'.
diff --git a/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def
index 99112d5ac42..1555d258ae4 100644
--- a/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `extreport-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -190,7 +190,7 @@
 \renewcommand\thetable{%
   \ifnum \c@chapter>\z@\thechapter\@SepMark\fi\@arabic\c@table}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -199,67 +199,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
index 56b0f365213..31932746262 100644
--- a/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `fancyhdr-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -25,7 +25,7 @@
         \parbox[t]{\headwidth}{\centering\if@RTLmain\beginR\else\beginL\fi#3\if@RTLmain\endR\else\endL\fi}\hfill
         \llap{\parbox[t]{\headwidth}{\raggedleft\if@RTLmain\beginR\else\beginL\fi#4\if@RTLmain\endR\else\endL\fi}}}}\endL}\if@RTLmain\beginR\else\beginL\fi#5\if@RTLmain\endR\else\endL\fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -34,67 +34,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def
index ac0d95abf50..628ed9e067e 100644
--- a/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `fleqn-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -43,7 +43,7 @@
        \endL\egroup
      \endtrivlist}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -52,67 +52,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def
new file mode 100644
index 00000000000..3b2e4d22538
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def
@@ -0,0 +1,32 @@
+%%
+%% This is file `float-xetex-bidi.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bidi.dtx  (with options: `float-xetex-bidi.def')
+%% 
+%%   ______________________________________
+%%   Copyright © 2009–2011  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{float-xetex-bidi.def}[2011/02/06 v0.1 bidi adaptations for float package for XeTeX engine]
+\renewcommand\floatc@plain[2]{\setbox\@tempboxa\hbox{{\@fs@cfont #1:} #2}%
+  \ifdim\wd\@tempboxa>\hsize {\@fs@cfont #1:} #2\par
+    \else\hbox to\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}\fi}
+%% 
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
+%% 
+%% It may be distributed and/or modified 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 “author-maintained” (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%%
+%% End of file `float-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def
index 6115fedf545..407a5c743f1 100644
--- a/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `flowfram-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -146,7 +146,7 @@
 #2\relax
 \fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -155,67 +155,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def
index f210512b7c6..7a77b57f6d3 100644
--- a/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def
@@ -7,14 +7,14 @@
 %% bidi.dtx  (with options: `footnote-luatex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \ProvidesFile{footnote-luatex-bidi.def}[2010/07/25 v0.1 bidi footnote macros for LuaTeX engine]
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -23,67 +23,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
index abbe0e7229b..b27fdd8975a 100644
--- a/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `footnote-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -97,9 +97,9 @@
 \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
-   \if@tempswa\if@RTL\rtl\else\ltr\fi\fi
+   \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{%
@@ -202,7 +202,7 @@
   \@pboxswfalse
   \setlength\@tempdima{#4}%
   \def\@mpargs{{#1}{#2}[#3]{#4}}%
-  \setbox\@tempboxa\vbox\bgroup\hbox\bgroup\if@RTL\beginL\fi\vbox\bgroup
+  \setbox\@tempboxa\vbox\bgroup\hbox\bgroup\if@RTL\beginL\fi\if #1t\vtop\else\vbox\fi\bgroup
     \color@begingroup
       \hsize\@tempdima
       \textwidth\hsize \columnwidth\hsize
@@ -245,7 +245,7 @@
   \@RTLfootnotetext}
 \leftfootnoterule
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -254,67 +254,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def
new file mode 100644
index 00000000000..d4961612e8d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def
@@ -0,0 +1,174 @@
+%%
+%% This is file `framed-xetex-bidi.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bidi.dtx  (with options: `framed-xetex-bidi.def')
+%% 
+%%   ______________________________________
+%%   Copyright © 2009–2011  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{framed-xetex-bidi.def}[2011/03/01 v0.1 bidi adaptations for framed package for XeTeX engine]
+\chardef\FrameRestore=\catcode`\| % for debug
+\catcode`\|=\catcode`\% % (debug: insert space after backslash)
+\def\fb@put@frame#1#2{\relax
+ \ifdim\pagegoal=\maxdimen \pagegoal\vsize \fi
+|   \message{=============== Entering putframe ====================^^J
+|     \pagegoal=\the\pagegoal,  \pagetotal=\the\pagetotal. }%
+ \ifinner
+   \fb@putboxa#1%
+   \fb@afterframe
+ \else
+  \dimen@\pagegoal \advance\dimen@-\pagetotal % natural space left on page
+  \ifdim\dimen@<2\baselineskip % Too little room on page
+|   \message{Page has only \the\dimen@\space room left; eject. }%
+    \eject \fb@adjheight \fb@put@frame#1#2%
+  \else % there's appreciable room left on the page
+     \fb@sizeofframe#1%
+|    \message{\string\pagetotal=\the\pagetotal,
+|        \string\pagegoal=\the\pagegoal,
+|        \string\pagestretch=\the\pagestretch,
+|        \string\pageshrink=\the\pageshrink,
+|        \string\fb@frh=\fb@frh. \space}
+|    \message{Box of size \the\ht\@tempboxa\space + \fb@frh}%
+     \begingroup % temporarily set \dimen@ to be...
+     \advance\dimen@.8\pageshrink  % maximum space available on page
+     \advance\dimen@-\fb@frh\relax % space available for frame's contents
+     \expandafter\endgroup
+     % expand \ifdim, then restore \dimen@ to real room left on page
+     \ifdim\dimen@>\ht\@tempboxa % whole box does fit
+|       \message{fits in \the\dimen@. }%
+        % Use vsplit anyway to capture the marks
+        % !!!???!!! MERGE THIS WITH THE else CLAUSE!!!
+        \fb@putboxa#1%
+        \fb@afterframe
+     \else % box must be split
+|       \message{must be split to fit in \the\dimen@. }%
+        % update frame measurement to use \FirstFrameCommand or \MidFrameCommand
+        \fb@sizeofframe#2%
+        \setbox\@tempboxa\vbox{% simulate frame and flexiblity of the page:
+           \vskip \fb@frh \@plus\pagestretch \@minus.8\pageshrink
+           \kern137sp\kern-137sp\penalty-30
+           \unvbox\@tempboxa}%
+        \edef\fb@resto@set{\boxmaxdepth\the\boxmaxdepth
+                           \splittopskip\the\splittopskip}%
+        \boxmaxdepth\z@ \splittopskip\z@
+|       \message{Padded box of size \the\ht\@tempboxa\space split to \the\dimen@}%
+        % Split box here
+        \setbox\tw@\vsplit\@tempboxa to\dimen@
+|       \toks99\expandafter{\splitfirstmark}%
+|       \toks98\expandafter{\splitbotmark}%
+|       \message{Marks are: \the\toks99, \the\toks98. }%
+        \setbox\tw@\vbox{\unvbox\tw@}% natural-sized
+|       \message{Natural height of split box is \the\ht\tw@, leaving
+|          \the\ht\@tempboxa\space remainder. }%
+        % If the split-to size > (\vsize-\topskip), then set box to full size
+        \begingroup
+        \advance\dimen@\topskip
+        \expandafter\endgroup
+        \ifdim\dimen@>\pagegoal
+|         \message{Frame is big -- Use up the full column. }%
+          \dimen@ii\pagegoal
+          \advance\dimen@ii -\topskip
+          \advance\dimen@ii \FrameHeightAdjust\relax
+        \else  % suspect this is wrong:
+          % If the split-to size > feasible room_on_page, rebox it smaller.
+          \advance\dimen@.8\pageshrink
+          \ifdim\ht\tw@>\dimen@
+|           \message{Box too tall; rebox it to \the\dimen@. }%
+            \dimen@ii\dimen@
+          \else % use natural size
+            \dimen@ii\ht\tw@
+          \fi
+        \fi
+        % Re-box contents to desired size \dimen@ii
+        \advance\dimen@ii -\fb@frh
+        \setbox\tw@\vbox to\dimen@ii \bgroup
+        % remove simulated frame and page flexibility:
+        \vskip -\fb@frh \@plus-\pagestretch \@minus-.8\pageshrink
+        \unvbox\tw@ \unpenalty\unpenalty
+        \ifdim\lastkern=-137sp % whole box went to next page
+|          \message{box split at beginning! }%
+           % need work here???
+           \egroup \fb@resto@set \eject % (\vskip for frame size was discarded)
+           \fb@adjheight
+           \fb@put@frame#1#2% INSERTED ???
+        \else % Got material split off at the head
+           \egroup \fb@resto@set
+           \ifvoid\@tempboxa % it all fit after all
+|             \message{box split at end! }%
+              \setbox\@tempboxa\box\tw@
+              \fb@putboxa#1%
+              \fb@afterframe
+           \else % it really did split
+|             \message{box split as expected. Its reboxed height is \the\ht\tw@. }%
+              \ifdim\wd\tw@>\z@
+                \wd\tw@\wd\@tempboxa
+                \centerline{#2{\hboxL{\box\tw@}}}%  ??? \centerline bad idea
+              \else
+|               \message{Zero width means likely blank. Don't frame it (guess)}%
+                \box\tw@
+              \fi
+              \hrule \@height\z@ \@width\hsize
+              \eject
+              \fb@adjheight
+              \fb@put@frame\LastFrameCommand\MidFrameCommand
+  \fi\fi\fi\fi\fi
+}
+\def\fb@putboxa#1{%
+  \ifvoid\@tempboxa
+    PackageWarning{framed}{Boxa is void -- discard it. }%
+  \else
+|   \message{Frame and place boxa. }%
+|   %{\showoutput\showbox\@tempboxa}%
+    \centerline{#1{\hboxL{\box\@tempboxa}}}%
+  \fi
+}
+\catcode`\|=\FrameRestore
+\def\FrameRestore{%
+   \let\if@nobreak\iffalse
+   \let\if@noskipsec\iffalse
+   \let\-\@dischyph
+   \let\'\@acci\let\`\@accii\let\=\@acciii
+   %  \message{FrameRestore:
+   %    \@totalleftmargin=\the \@totalleftmargin,
+   %    \rightmargin=\the\rightmargin,
+   %    \@listdepth=\the\@listdepth.  }%
+   % Test if we are in a list (or list-like paragraph)
+   \ifnum \ifdim\@totalleftmargin>\z@ 1\fi
+          \ifdim\rightmargin>\z@ 1\fi
+          \ifnum\@listdepth>0 1\fi 0>\z@
+     %     \message{In a list: \linewidth=\the\linewidth, \@totalleftmargin=\the\@totalleftmargin,
+     %       \parshape=\the\parshape, \columnwidth=\the\columnwidth, \hsize=\the\hsize,
+     %       \labelwidth=\the\labelwidth. }%
+     \@setminipage % snug fit around the item
+     % Now try to propageate changes of width from \hsize to list parameters.
+     % This is deficient, but a more advanced way to indicate modification to text
+     % dimensions is not (yet) provided; in particular, no separate left/right
+     % adjustment.
+     \advance\linewidth-\columnwidth \advance\linewidth\hsize
+     \parshape\@ne \@totalleftmargin \linewidth
+   \else % Not in list
+     \linewidth=\hsize
+     %\message{No list, set \string\linewidth=\the\hsize. }%
+   \fi
+   \sloppy
+}
+%% 
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
+%% 
+%% It may be distributed and/or modified 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 “author-maintained” (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%%
+%% End of file `framed-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def
index 76d214714dc..e2814ee7e57 100644
--- a/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `graphicx-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -118,7 +118,7 @@
     \Gscale@box\@tempa[\@tempb]{\box\@tempboxa}%
   \@end@tempboxa}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -127,67 +127,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def
index 4b26c2c9ad9..8c343952f1a 100644
--- a/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `hyperref-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -240,7 +240,7 @@
 }%
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -249,67 +249,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def
index bd07376610d..3a6089f66f4 100644
--- a/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def
@@ -7,17 +7,17 @@
 %% bidi.dtx  (with options: `leqno-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \ProvidesFile{leqno-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for leqno tag for XeTeX engine]
 \renewcommand\@eqnnum{\hb@xt@.01\p@{}%
-                      \rlap{\normalfont\normalcolor
-                        \hskip -\displaywidth\if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
+                      \rlap{
+                        \hskip -\displaywidth{\normalfont\normalcolor\if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -26,67 +26,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def
index 05f614afc06..a0ffe540043 100644
--- a/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `letter-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -37,7 +37,7 @@
   \hrule \@width .4\columnwidth
   \kern .6\p@}\hfil\endR}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -46,67 +46,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def
index c00cd9254e7..3dc19079fff 100644
--- a/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `listings-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -22,7 +22,7 @@
       \gdef\thelstlisting{\@arabic\c@lstlisting}
   \fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -31,67 +31,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
index 3c72e77d425..4b1b9ba4f45 100644
--- a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `loadingorder-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -25,9 +25,12 @@
 \bidi@isloaded{breqn}
 \bidi@isloaded{caption}
 \bidi@isloaded{color}
+\bidi@isloaded{dblfnote}
 \bidi@isloaded{xcolor}
 \bidi@isloaded{colortbl}
+\bidi@isloaded{float}
 \bidi@isloaded{flowfram}
+\bidi@isloaded{framed}
 \bidi@isloaded{xltxtra}
 \bidi@isloaded{xunicode}
 \bidi@isloaded{wrapfig}
@@ -35,6 +38,7 @@
 \bidi@isloaded{hyperref}
 \bidi@isloaded{fancyhdr}
 \bidi@isloaded{draftwatermark}
+\bidi@isloaded{empheq}
 \bidi@isloaded{pdfpages}
 \bidi@isloaded{listings}
 \bidi@isloaded{pstricks}
@@ -78,15 +82,24 @@
   \@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@dblfnoteloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package dblfnote after bidi package. Please load package dblfnote before bidi package, and then try to run xelatex on your document again}{}]{dblfnote}
+  \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@floatloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package float after bidi package. Please load package float before bidi package, and then try to run xelatex on your document again}{}]{float}
+  \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@framedloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package framed after bidi package. Please load package framed before bidi package, and then try to run xelatex on your document again}{}]{framed}
+  \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%
@@ -108,6 +121,9 @@
   \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@empheqloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package empheq after bidi package. Please load package empheq before bidi package, and then try to run xelatex on your document again}{}]{empheq}
+  \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%
@@ -188,7 +204,7 @@
   \fi%
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -197,67 +213,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def
index 06b3b49e3f1..0c4aef7282d 100644
--- a/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `longtable-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -24,7 +24,7 @@
     \endgraf\vskip\baselineskip}%
   \hss}}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -33,67 +33,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
index 9541dabe4f4..7582a9588e1 100644
--- a/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `luatex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -16,7 +16,7 @@
 \directlua { tex.enableprimitives('',{'pagedir','bodydir','pardir','textdir','mathdir'}) }
 \input{footnote-luatex-bidi.def}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -25,67 +25,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def
index 6d5affc37f1..82e84d441d5 100644
--- a/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `memoir-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -169,7 +169,7 @@
   \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi
   \begin{bibitemlist}{#1}}{\end{bibitemlist}\postbibhook}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -178,67 +178,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def
index 2d52ee15c16..39dbdbc3eac 100644
--- a/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `minitoc-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -47,11 +47,11 @@
      \@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}%
+     \hb@xt@\@pnumwidth{{\hfil\normalfont \normalcolor #5}}%
     \par}%
   \fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -60,67 +60,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def
index c67f9439e74..6c65aa23e9a 100644
--- a/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `multicol-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -159,7 +159,7 @@
         \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\@finalstrut\strutbox}%
     \color@endgroup}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -168,67 +168,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def
index c110b5bcf75..f2bf9192548 100644
--- a/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `pdfpages-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -61,7 +61,7 @@
   \AM@ClearShipoutPicture
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -70,67 +70,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def
index 25701ae4b5f..9eed285ba8f 100644
--- a/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def
@@ -7,18 +7,22 @@
 %% bidi.dtx  (with options: `pgf-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{pgf-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for pgf package for XeTeX engine]
+\ProvidesFile{pgf-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for pgf package for XeTeX engine]
+\AtBeginDocument{%
+\@ifdefinitionfileloaded{tikz-xetex-bidi}{}{%
 \let\origin@pgfpicture=\pgfpicture
 \let\origin@endpgfpicture=\endpgfpicture
-\def\pgfpicture{\ifmmode\else\beginL\fi\origin@pgfpicture}
-\def\endpgfpicture{\origin@endpgfpicture\ifmmode\else\endL\fi}
+\def\pgfpicture{\ifmmode\else\LTR\beginL\fi\origin@pgfpicture}
+\def\endpgfpicture{\origin@endpgfpicture\ifmmode\else\endL\endLTR\fi}%
+}%
+}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -27,67 +31,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def
index dd69319b175..b90bfad213c 100644
--- a/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def
@@ -7,14 +7,14 @@
 %% bidi.dtx  (with options: `plain-luatex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \directlua { tex.enableprimitives('',tex.extraprimitives()) }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -23,67 +23,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def
index 8ff5e9efa17..6b8b236e844 100644
--- a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `plain-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -63,8 +63,8 @@
 \def\endLTR{\par}
 \def\RTL{\par\@RTLtrue\@RTL@footnotetrue\hsize\linewidth\parshape\z@}
 \def\endRTL{\par}
-\def\ltr{\if@RTL\par\@RTLfalse\@RTL@footnotefalse\fi}
-\def\rtl{\if@RTL\relax\else\par\@RTLtrue\@RTL@footnotetrue\fi}
+\def\@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
@@ -95,7 +95,7 @@
 \def\leftline#1{\line{\if@RTL\beginR\fi#1\if@RTL\endR\fi\hss}}
 \def\rightline#1{\line{\hss\if@RTL\beginR\fi#1\if@RTL\endR\fi}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -104,67 +104,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def
index 892c0a6fcad..146e53aef6c 100644
--- a/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `pstricks-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -15,10 +15,10 @@
 \ProvidesFile{pstricks-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for pstricks package for XeTeX engine]
 \let\origin@pspicture=\pspicture
 \let\origin@endpspicture=\endpspicture
-\def\pspicture{\ifmmode\else\beginL\fi\origin@pspicture}
-\def\endpspicture{\origin@endpspicture\ifmmode\else\endL\fi}
+\def\pspicture{\ifmmode\else\LTR\beginL\fi\origin@pspicture}
+\def\endpspicture{\origin@endpspicture\ifmmode\else\endL\endLTR\fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -27,67 +27,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def
index aed45d0ff59..16112c72f12 100644
--- a/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `quotchap-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -29,7 +29,7 @@
   \vbox to\z@{\leavevmode\copy\@quotebox\vss}
   \global\let\@printcites\relax}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -38,67 +38,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def
index 3c17745e5f6..677127bbd31 100644
--- a/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `ragged2e-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -99,7 +99,7 @@
 \def\RaggedLeft{\if@RTL\origin@RaggedRight\else\origin@RaggedLeft\fi}
 \def\RaggedRight{\if@RTL\origin@RaggedLeft\else\origin@RaggedRight\fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -108,67 +108,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def
index 397a608f90a..7470dfe997e 100644
--- a/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `rapport1-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -255,7 +255,7 @@
   \vskip 1.5em}
 \fi
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -264,67 +264,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def
index bd831e058b0..bb259140621 100644
--- a/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `rapport3-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -277,7 +277,7 @@
     \hyphenpenalty=\@M \exhyphenpenalty=\@M
     \if@RTL\leftskip\else\rightskip\fi=0cm plus .7\hsize\relax}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -286,67 +286,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def
index e52d20094a8..74a857791e9 100644
--- a/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `refrep-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -196,7 +196,7 @@
        {\@latex@warning{Empty `thebibliography' environment}}%
       \endlist}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -205,67 +205,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def
index bf7bed12d51..bf6849a3661 100644
--- a/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `report-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -202,7 +202,7 @@
        {\@latex@warning{Empty `thebibliography' environment}}%
       \endlist}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -211,67 +211,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
index a4117efd059..955f937585a 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `scrartcl-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -336,7 +336,7 @@
   \marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -345,67 +345,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
index ad1e667ceb7..e77e74fc6e9 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `scrbook-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -392,7 +392,7 @@
   \marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -401,67 +401,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def
index 6995a26b5ab..687746166c4 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `scrlettr-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -92,7 +92,7 @@
  \fromsig\strut}\par
  \vspace{1.5\baselineskip}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -101,67 +101,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
index ca490196160..1990e2b7ef8 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `scrreprt-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -349,7 +349,7 @@
   \marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -358,67 +358,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def
index 7c624e09759..5b93faacfb0 100644
--- a/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `stabular-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -40,7 +40,7 @@
   \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
     \@preamble}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -49,67 +49,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def
index 722e78f0043..84de63e1190 100644
--- a/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `subfigure-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -18,7 +18,7 @@
 \let\p@subtable=\thetable%
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -27,67 +27,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def
index 9c55e7c6cc1..d7d0bd2d0b6 100644
--- a/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `tabls-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -48,7 +48,7 @@
  \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi
  \@preamble}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -57,67 +57,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def
index d0343fa12f1..41dd19885e1 100644
--- a/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `tabulary-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -43,7 +43,7 @@
    \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi
      \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -52,67 +52,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def
index 074a624351f..06b83b144e5 100644
--- a/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `tikz-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -17,10 +17,10 @@
 \let\origin@endtikzpicture=\endtikzpicture
 \let\pgfutil@minipage=\minipage
 \let\pgfutil@endminipage=\endminipage
-\def\tikzpicture{\ifmmode\else\beginL\fi\origin@tikzpicture}
-\def\endtikzpicture{\origin@endtikzpicture\ifmmode\else\endL\fi}
+\def\tikzpicture{\ifmmode\else\LTR\beginL\fi\origin@tikzpicture}
+\def\endtikzpicture{\origin@endtikzpicture\ifmmode\else\endL\endLTR\fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -29,67 +29,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def
index 6087359c8dd..808885f3f4f 100644
--- a/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `titlesec-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -20,7 +20,7 @@
   \advance\rightskip\z@ \@plus 1fil
 \parfillskip\z@}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -29,67 +29,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def
index 2a8c9036c7f..540aca61b1a 100644
--- a/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `titletoc-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -57,7 +57,7 @@
   \advance\if@RTL\leftskip\else\rightskip\fi#2\relax
   \def\@pnumwidth{#2}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -66,67 +66,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def
index 81fced33540..605e7195db4 100644
--- a/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `tocbibind-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -44,7 +44,7 @@
 
 \fi
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -53,67 +53,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def
index 5733209febf..714f671384f 100644
--- a/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `tocloft-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -321,7 +321,7 @@
    \if@RTL\leftskip\else\rightskip\fi \@tocrmarg\relax
    \textit{#1}\protect\par}}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -330,67 +330,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def
index 6bba0375ce3..f2dbcb6102e 100644
--- a/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `tocstyle-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -224,7 +224,7 @@
           \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
           mu$}\hfill
        \nobreak
-       \hb@xt@\@pnumwidth{\hfil \normalfont \normalcolor #5}%
+       \hb@xt@\@pnumwidth{{\hfil \normalfont \normalcolor #5}}%
        \par}%
     \fi}%
   \ifx\@dottedtocline\@tempa\else
@@ -259,7 +259,7 @@
   \@tempa
 }
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -268,67 +268,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def
index ca974d32524..305941d3544 100644
--- a/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `wrapfig-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -89,7 +89,7 @@
   \aftergroup\WF@startwrapping % after the \endgroup which immediately follows
 \fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -98,67 +98,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def
index f7a2508b878..15b37c04979 100644
--- a/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def
@@ -7,18 +7,19 @@
 %% bidi.dtx  (with options: `xcolor-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
 \ProvidesFile{xcolor-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for xcolor package for XeTeX engine]
 \long\def\color@b@x#1#2#3%
- {\leavevmode\if@RTL\beginL\fi
+ {\leavevmode\ifmmode\else\if@RTL\beginL\fi\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}
+  {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}\ifmmode\else\if@RTL\endL\fi\fi}
+\def\normalcolor{\let\current@color\default@color\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\set@color\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
 \DeclareRobustCommand\color
  {\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\@ifnextchar[\@undeclaredcolor\@declaredcolor}
 \def\@undeclaredcolor[#1]#2%
@@ -114,8 +115,9 @@
 \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}}}
+\def\color@setgroup{\begingroup\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\set@color\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -124,67 +126,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index cdeef5c3993..6b362fa39c7 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -64,8 +64,8 @@
 \def\endLTR{\par}
 \def\RTL{\par\@RTLtrue\@RTL@footnotetrue\hsize\linewidth\parshape\z@}
 \def\endRTL{\par}
-\def\ltr{\if@RTL\par\@RTLfalse\@RTL@footnotefalse\fi}
-\def\rtl{\if@RTL\relax\else\par\@RTLtrue\@RTL@footnotetrue\fi}
+\def\@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
@@ -101,7 +101,7 @@
 \DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}}
 \def\rcases#1{\left.\vcenter{\normalbaselines\m@th
     \ialign{$##\hfil$&\quad{##}\hfil\crcr#1\crcr}}\,\right\}}
-\def\SepMark#1{\gdef\@SepMark{\hskip0pt#1\hskip0pt}}
+\def\SepMark#1{\gdef\@SepMark{\if@RTL‏\fi#1\if@RTL‏\fi}}
 \SepMark{.}
 \def\@thmcountersep{\@SepMark}
 \def\setRTLbibitems{\@RTLbibitemstrue\@LTRbibitemsfalse}
@@ -241,7 +241,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
         \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
         mu$}\hfill
      \nobreak
-     \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
+     \hb@xt@\@pnumwidth{{\hfil\normalfont \normalcolor #5}}%
      \par}%
   \fi}
 \def\RTL@outputdblcol{%
@@ -315,12 +315,12 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
  \if@RTL\endL\fi
   \egroup
   \egroup
-  \expandafter\@iiiparbox\@mpargs{\leavevmode\unvbox\@tempboxa}}
+  \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa\leavevmode}}
 \long\def\@iiiparbox#1#2[#3]#4#5{%
   \leavevmode
   \@pboxswfalse
   \setlength\@tempdima{#4}%
-  \@begin@tempboxa\vbox{\hbox{\if@RTL\beginL\fi\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}\if@RTL\endL\fi}}%
+  \@begin@tempboxa\vbox{\hbox{\if@RTL\beginL\fi\if #1t\vtop\else\vbox\fi{\hsize\@tempdima\@parboxrestore#5\@@par}\if@RTL\endL\fi}}%
     \ifx\relax#2\else
       \setlength\@tempdimb{#2}%
       \edef\@parboxto{to\the\@tempdimb}%
@@ -459,7 +459,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
     \hb@xt@\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}%
   \fi
   \vskip\belowcaptionskip}
-\everydisplay{\predisplaydirection=0 }
+\everydisplay\expandafter{\the\everydisplay\predisplaydirection=0 }
 \def\@eqnnum{{\normalfont \normalcolor \if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}
 \input{footnote-xetex-bidi.def}
 \@ifclassloaded{article}{\input{article-xetex-bidi.def}}{}
@@ -495,6 +495,8 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{}
 \@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{}
 \@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{}
+\@ifpackageloaded{empheq}{\input{empheq-xetex-bidi.def}}{}
+\@ifpackageloaded{float}{\input{float-xetex-bidi.def}}{}
 \@ifpackageloaded{flowfram}{\input{flowfram-xetex-bidi.def}}{}
 \@ifpackageloaded{xltxtra}{\input{xltxtra-xetex-bidi.def}}{}
 \@ifpackageloaded{wrapfig}{\input{wrapfig-xetex-bidi.def}}{}
@@ -502,6 +504,8 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{hyperref}{\input{hyperref-xetex-bidi.def}}{}
 \@ifpackageloaded{fancyhdr}{\input{fancyhdr-xetex-bidi.def}}{}
 \@ifpackageloaded{draftwatermark}{\input{draftwatermark-xetex-bidi.def}}{}
+\@ifpackageloaded{dblfnote}{\input{dblfnote-xetex-bidi.def}}{}
+\@ifpackageloaded{framed}{\input{framed-xetex-bidi.def}}{}
 \@ifpackageloaded{pdfpages}{\input{pdfpages-xetex-bidi.def}}{}
 \@ifpackageloaded{listings}{\input{listings-xetex-bidi.def}}{}
 \@ifpackageloaded{pstricks}{\input{pstricks-xetex-bidi.def}}{}
@@ -523,8 +527,9 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{tocstyle}{\input{tocstyle-xetex-bidi.def}}{}
 \@ifpackageloaded{tocbibind}{\@ifclassloaded{memoir}{}{\input{tocbibind-xetex-bidi.def}}}{}
 \@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xetex-bidi.def}}}{}
+\DeclareOption{extrafootnotefeatures}{\input{extrafootnotefeatures.def}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -533,67 +538,6 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def
index d6b68f5ef28..02e95db82fb 100644
--- a/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def
@@ -7,7 +7,7 @@
 %% bidi.dtx  (with options: `xltxtra-xetex-bidi.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2009–2010  Vafa Khalighi
+%%   Copyright © 2009–2011  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
@@ -18,7 +18,7 @@
 \let\@@XeLaTeX\XeLaTeX
 \def\XeLaTeX{\@ensure@LTR{\@@XeLaTeX}}
 %% 
-%% Copyright © 2009–2010  Vafa Khalighi <vafakhlgh@gmail.com>
+%% Copyright © 2009–2011  Vafa Khalighi <vafakhlgh@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -27,67 +27,6 @@
 %% This work is “author-maintained” (as per LPPL maintenance status)
 %% by Vafa Khalighi.
 %% 
-%% In addition to the terms of LPPL any distributed version
-%% (unchanged or modified) of bidi has to keep the statement
-%% about the moral obligation for using bidi. In case of major
-%% changes where this would not be appropriate the author of the
-%% changed version should contact the copyright holder.
-%% 
-%% 
-%% 
-%% Moral obligation for using bidi:
-%% ____________________________________
-%% 
-%% Users of bidi who wish to include or use bidi or a modified
-%% version in a proprietary and commercially market product are asked
-%% under certain conditions (see below) for the payment of a license
-%% fee.  The size of this fee is to be determined, in each instance,
-%% by the commercial user, depending on his/her judgment of the value of
-%% bidi for his/her product.
-%% 
-%% 
-%% The conditions for this are as follows:
-%% 
-%% The producer of a proprietary and commercially market product
-%% that involves typesetting using bidi is asked to determine
-%% the value of a license fee for using bidi if
-%% 
-%%    - the product is a document and the producer has decided to
-%%      include bidi to typeset (parts of) the document or has
-%%      directed the author of the document to include bidi (for
-%%      example, by providing a class file to be used by the author)
-%% 
-%%    - the product is a LaTeX class or package that includes bidi
-%% 
-%% 
-%% There is no moral obligation in case
-%% 
-%%    - the product is a document but producer has not directed
-%%      the author to include bidi (in that case the moral obligation
-%%      lies with the author of the document)
-%% 
-%%    - the product does not involve typesetting, e.g., consists, for
-%%      example, of distributing bidi and its documentation.
-%% 
-%%    - the product is not proprietary, i.e., is made available as free
-%%      software itself (which doesn't prohibit its commercial marketing)
-%% 
-%%    - bidi is used for non-commercial purposes
-%% 
-%% 
-%% Determinating a license fee might result in a license fee of zero
-%% (i.e., no payment) in case a producer has determined that the use
-%% of bidi has no enhancing effect on the product. This is a
-%% plausible scenario, i.e., in the above two cases the producer is
-%% only asked to evaluate the value of bidi for the product
-%% not for the payment of a license fee per se (which might or might
-%% not follow from this evaluation).
-%% 
-%%  The license fee, if any, can be payed to the author of
-%%  the program who can be contacted at
-%% 
-%%      vafakhlgh@gmail.com
-%% 
 %% 
 %% 
 %%