xepersian update (12may10)

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

48 files changed, 407 insertions, 141 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
index 5cd7b3e37e1..0ec514552e2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
@@ -7,12 +7,12 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{algorithm-xepersian.def}[2010/03/01 v0.2 adaptations for algorithm package]
+\ProvidesFile{algorithm-xepersian.def}[2010/07/25 v0.2 adaptations for algorithm package]
 \def\ALG@name{\if@RTL الگوریتم\else Algorithm\fi}
 \def\ALGS@name{الگوریتم‌ها}
 \def\listalgorithmname{\if@RTL لیست \ALGS@name\else List of \ALG@name s\fi}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
index b4976b15573..cecdf0a3bbc 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
@@ -7,11 +7,11 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{algorithmic-xepersian.def}[2010/03/01 v0.2 adaptations for algorithmic package]
+\ProvidesFile{algorithmic-xepersian.def}[2010/07/25 v0.2 adaptations for algorithmic package]
 \def\algorithmicrequire{\if@RTL\textbf{ورودی:}\else\textbf{Require:}\fi}
 \def\algorithmicensure{\if@RTL\textbf{خروجی:}\else\textbf{Ensure:}\fi}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def
index 8cf59edcf0c..a765b4f75af 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def
@@ -7,7 +7,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsart-xepersian.def}[2010/03/01 v0.2 adaptations for amsart class]
+\ProvidesFile{amsart-xepersian.def}[2010/07/25 v0.2 adaptations for amsart class]
 \renewcommand \thepart {\@tartibi\c@part}
 \def\appendix{\par\c@section\z@ \c@subsection\z@
    \let\sectionname\appendixname
@@ -55,7 +55,7 @@
     \insert\footins{\unvbox\footins}%
     \endgroup}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def
index d08afdfbb3d..bbf0a3358ca 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def
@@ -7,7 +7,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{amsbook-xepersian.def}[2010/03/01 v0.3 adaptations for amsbook class]
+\ProvidesFile{amsbook-xepersian.def}[2010/07/25 v0.3 adaptations for amsbook class]
 \def\frontmatter{\cleardoublepage\pagenumbering{harfi}}
 \renewcommand \thepart {\@tartibi\c@part}
 \def\appendix{\par
@@ -57,7 +57,7 @@
     \insert\footins{\unvbox\footins}%
     \endgroup}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
index 61e20ac0b40..9cc8a5b8dc7 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
@@ -8,14 +8,14 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{article-xepersian.def}[2010/03/01 v0.1 adaptations for standard article class]
+\ProvidesFile{article-xepersian.def}[2010/07/25 v0.2 adaptations for standard article class]
 \renewcommand \thepart {\@tartibi\c@part}
 \renewcommand\appendix{\par
   \setcounter{section}{0}%
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
new file mode 100644
index 00000000000..b73d1fbc603
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
@@ -0,0 +1,31 @@
+%%
+%% This is file `artikel1-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{artikel1-xepersian.def}[2010/07/25 v0.1 adaptations for artikel1 class]
+\renewcommand*\thepart{\@tartibi\c@part}
+\renewcommand*\appendix{\par
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \gdef\thesection{\@harfi\c@section}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `artikel1-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
new file mode 100644
index 00000000000..899d0568b1b
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
@@ -0,0 +1,31 @@
+%%
+%% This is file `artikel2-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{artikel2-xepersian.def}[2010/07/25 v0.1 adaptations for artikel2 class]
+\renewcommand*\thepart{\@tartibi\c@part}
+\renewcommand*\appendix{\par
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \gdef\thesection{\@harfi\c@section}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `artikel2-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
new file mode 100644
index 00000000000..50009efea7a
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
@@ -0,0 +1,31 @@
+%%
+%% This is file `artikel3-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{artikel3-xepersian.def}[2010/07/25 v0.1 adaptations for artikel3 class]
+\renewcommand*\thepart{\@tartibi\c@part}
+\renewcommand*\appendix{\par
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \gdef\thesection{\@harfi\c@section}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `artikel3-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
index 566712095fd..db50370a881 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
@@ -8,10 +8,10 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{backref-xepersian.def}[2010/03/01 v0.1 adaptations for backref package]
+\ProvidesFile{backref-xepersian.def}[2010/07/25 v0.1 adaptations for backref package]
 \def\backrefpagesname{\if@RTL صفحات\else pages\fi}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
index d5bd5ad8a7e..99841b43929 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
@@ -8,11 +8,10 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{bidicode-xepersian.def}[2010/03/01 v0.1 Persian captions for bidicode package]
-\lst@UserCommand\lstlistlistingname{فهرست مثال‌ها} % \lstlistoflistings
-\lst@UserCommand\lstlistingname{مثال}
+\ProvidesFile{bidicode-xepersian.def}[2010/07/25 v0.0 Persian captions for bidicode package]
+
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
new file mode 100644
index 00000000000..5cf47029e48
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
@@ -0,0 +1,27 @@
+%%
+%% This is file `bidimoderncv-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{bidimoderncv-xepersian.def}[2010/07/25 v0.1 adaptations for bidimoderncv class]
+\def\refname{\if@RTL تألیفات\else Publications\fi}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `bidimoderncv-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
new file mode 100644
index 00000000000..bf946caf8ab
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
@@ -0,0 +1,36 @@
+%%
+%% This is file `boek-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{boek-xepersian.def}[2010/07/25 v0.1 adaptations for boek class]
+\renewcommand*\thepart{\@tartibi\c@part}
+\renewcommand*\frontmatter{%
+  \cleardoublepage
+  \@mainmatterfalse
+  \pagenumbering{harfi}}
+\renewcommand*\appendix{\par
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\thechapter{\@harfi\c@chapter}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `boek-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
new file mode 100644
index 00000000000..1200bc1589d
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
@@ -0,0 +1,36 @@
+%%
+%% This is file `boek3-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{boek3-xepersian.def}[2010/07/25 v0.1 adaptations for boek3 class]
+\renewcommand*\thepart{\@tartibi\c@part}
+\renewcommand*\frontmatter{%
+  \cleardoublepage
+  \@mainmatterfalse
+  \pagenumbering{harfi}}
+\renewcommand*\appendix{\par
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\thechapter{\@harfi\c@chapter}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `boek3-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
index e9f5e8a0549..77d84e3e23b 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
@@ -8,15 +8,11 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{book-xepersian.def}[2010/03/01 v0.1 adaptations for standard book class]
+\ProvidesFile{book-xepersian.def}[2010/07/25 v0.2 adaptations for standard book class]
 \renewcommand\frontmatter{%
     \cleardoublepage
   \@mainmatterfalse
   \pagenumbering{harfi}}
-\renewcommand\mainmatter{%
-    \cleardoublepage
-  \@mainmattertrue
-  \pagenumbering{arabic}}
 \renewcommand \thepart {\@tartibi\c@part}
 \renewcommand\appendix{\par
   \setcounter{chapter}{0}%
@@ -25,7 +21,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
index b48318f1d72..708cf9a8cc2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{bookest-xepersian.def}[2010/03/01 v0.1 adaptations for bookest class]
+\ProvidesFile{bookest-xepersian.def}[2010/07/25 v0.1 adaptations for bookest class]
 \renewcommand \thepart {\@tartibi\c@part}
 \renewcommand\appendix{\par
   \setcounter{chapter}{0}%
@@ -17,7 +17,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
index 0c118b3d91f..cd59aac7c6d 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{breqn-xepersian.def}[2010/03/01 v0.1 adaptations for breqn package]
+\ProvidesFile{breqn-xepersian.def}[2010/07/25 v0.1 adaptations for breqn package]
 \def\@dmath[#1]{\if@RTL\@RTLfalse\addfontfeatures{Mapping=farsidigits}\fi%
   \everydisplay\expandafter{\the\everydisplay \display@setup}%
   \if@noskipsec \leavevmode \fi
@@ -49,7 +49,7 @@
 \ignorespaces
 }
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
index 82a8ddf5da2..3027f0bd04a 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{commands-ltx.def}[2010/03/01 v0.2 Persian localisation of LaTeX2e commands]
+\ProvidesFile{commands-ltx.def}[2010/07/25 v0.2 Persian localisation of LaTeX2e commands]
 \eqcommand[\پرش‌کوتاه‌بالای‌نمایش]{\abovedisplayshortskip}
 \eqcommand[\پرش‌بالای‌نمایش]{\abovedisplayskip}
 \eqcommand[\نام‌چکیده]{\abstractname}
@@ -478,7 +478,7 @@
 \eqcommand[\مدپهن]{\widetilde}
 \eqcommand[\عرض]{\width}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
index f1caba559da..1a9fd3da2d1 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
@@ -8,9 +8,9 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{commands-xepersian.def}[2010/03/01 v0.0 Persian localisation of XePersian commands]
+\ProvidesFile{commands-xepersian.def}[2010/07/25 v0.0 Persian localisation of XePersian commands]
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
index 75438cafdf4..e6b78d707ff 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{enumerate-xepersian.def}[2010/03/01 v0.1 adaptations for enumerate package]
+\ProvidesFile{enumerate-xepersian.def}[2010/07/25 v0.1 adaptations for enumerate package]
 \def\@enloop@{%
   \ifx ا\@entemp         \def\@tempa{\@enLabel\harfi  }\else
   \ifx ی\@entemp         \def\@tempa{\@enLabel\adadi  }\else
@@ -26,7 +26,7 @@
              \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \@tempa}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
index 5bf7651d489..479b70d75a5 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{environments-ltx.def}[2010/03/01 v0.1 Persian localisation of LaTeX2e environments]
+\ProvidesFile{environments-ltx.def}[2010/07/25 v0.1 Persian localisation of LaTeX2e environments]
 \eqenvironment[چکیده]{abstract}
 \eqenvironment[پیوست]{appendix}
 \eqenvironment[آرایه]{array}
@@ -52,7 +52,7 @@
 \eqenvironment[کلمه‌به‌کلمه*]{verbatim*}
 \eqenvironment[شعر]{verse}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
index 0406231135f..48f30f83127 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
@@ -8,9 +8,9 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{environments-xepersian.def}[2010/03/01 v0.1 Persian localisation of XePersian and bidi environments]
+\ProvidesFile{environments-xepersian.def}[2010/07/25 v0.1 Persian localisation of XePersian and bidi environments]
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
new file mode 100644
index 00000000000..5cc1473c03e
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
@@ -0,0 +1,31 @@
+%%
+%% This is file `extarticle-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{extarticle-xepersian.def}[2010/07/25 v0.1 adaptations for extarticle class]
+\renewcommand\thepart         {\@tartibi\c@part}
+\renewcommand\appendix{\par
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \gdef\thesection{\@harfi\c@section}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `extarticle-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
index 153353797e4..4c58d982dd1 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
@@ -8,15 +8,11 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{extbook-xepersian.def}[2010/03/01 v0.1 adaptations for extbook class]
+\ProvidesFile{extbook-xepersian.def}[2010/07/25 v0.1 adaptations for extbook class]
 \renewcommand\frontmatter{%
     \cleardoublepage
   \@mainmatterfalse
   \pagenumbering{harfi}}
-\renewcommand\mainmatter{%
-    \cleardoublepage
-  \@mainmattertrue
-  \pagenumbering{arabic}}
 \renewcommand \thepart {\@tartibi\c@part}
 \renewcommand\appendix{\par
   \setcounter{chapter}{0}%
@@ -25,7 +21,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
new file mode 100644
index 00000000000..2d70835da18
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
@@ -0,0 +1,32 @@
+%%
+%% This is file `extreport-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{extreport-xepersian.def}[2010/07/25 v0.1 adaptations for extreport class]
+\renewcommand\thepart         {\@tartibi\c@part}
+\renewcommand\appendix{\par
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\thechapter{\@harfi\c@chapter}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `extreport-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
index befb2d3ce56..94a26618de2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{flowfram-xepersian.def}[2010/03/01 v0.1 adaptations for flowfram package]
+\ProvidesFile{flowfram-xepersian.def}[2010/07/25 v0.1 adaptations for flowfram package]
 \def\@outputpage{%
 \begingroup
   \let\protect\noexpand
@@ -38,7 +38,7 @@
   \setcounter{displayedframe}{0}%
   \let\firstmark\botmark}
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def
index 8df109fb1f0..d0c1882cfba 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{footnote-bidi-xepersian.def}[2010/03/01 v0.2 footnote macros for xepersian package]
+\ProvidesFile{footnote-bidi-xepersian.def}[2010/07/25 v0.2 footnote macros for xepersian package]
 \long\def\@footnotetext#1{%
     \begingroup
     \setbox\footins
@@ -94,7 +94,7 @@
         \rule\z@\footnotesep\ignorespaces\latinfont#1\@finalstrut\strutbox}%
     \color@endgroup}}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
index 7a4551b5720..b5c9dd4825c 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{hyperref-xepersian.def}[2010/03/01 v0.1 bilingual captions for hyperref package]
+\ProvidesFile{hyperref-xepersian.def}[2010/07/25 v0.3 bilingual captions for hyperref package]
   \def\equationautorefname{\if@RTL معادله\else Equation\fi}%
   \def\footnoteautorefname{\if@RTL زیرنویس\else footnote\fi}%
   \def\itemautorefname{\if@RTL فقره\else item\fi}%
@@ -28,14 +28,15 @@
 \AtBeginDocument{%
 \let\HyOrg@appendix\appendix
 \def\appendix{%
-  \@ifundefined{chapter}%
-    {\gdef\theHsection{\arabic{section}}}%
-    {\gdef\theHchapter{\arabic{chapter}}}%
+  \ltx@IfUndefined{chapter}%
+    {\gdef\theHsection{\Alph{section}}}%
+    {\gdef\theHchapter{\Alph{chapter}}}%
   \xdef\Hy@chapapp{\Hy@appendixstring}%
   \HyOrg@appendix
-}}
+}
+}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
index 49431d25b2a..3a8e77b5f66 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{kashida-xepersian.def}[2010/03/01 v0.1 implementation of Kashida for xepersian package]
+\ProvidesFile{kashida-xepersian.def}[2010/07/25 v0.1 implementation of Kashida for xepersian package]
 \chardef\zwj="200D % zero-width joiner
 \chardef\ksh="0640 % kashida
 
@@ -51,7 +51,7 @@
 
 \XeTeXinterchartokenstate=1
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
index 306fcabac27..438347ffeb1 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
@@ -8,11 +8,11 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{listings-xepersian.def}[2010/03/01 v0.1 bilingual captions for listings package]
+\ProvidesFile{listings-xepersian.def}[2010/07/25 v0.1 bilingual captions for listings package]
 \def\lstlistingname{برنامهٔ}
 \def\lstlistlistingname{فهرست برنامه‌ها}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def
index 121f3572cd1..27ef500ee47 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def
@@ -8,12 +8,11 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{loadingorder-bidi-xepersian.def}[2010/03/01 v0.1 making sure that xepersian is the last package loaded]
+\ProvidesFile{loadingorder-bidi-xepersian.def}[2010/07/25 v0.2 making sure that xepersian is the last package loaded]
 \bidi@isloaded{algorithmic}
 \bidi@isloaded{algorithm}
 \bidi@isloaded{backref}
 \bidi@isloaded{enumerate}
-\bidi@isloaded{subfigure}
 \bidi@isloaded{tocloft}
 \AtBeginDocument{
   \if@bidi@algorithmicloaded@\else
@@ -28,15 +27,12 @@
   \if@bidi@enumerateloaded@\else
     \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package enumerate after xepersian package. Please load package enumerate before xepersian package, and then try to run xelatex on your document again}{}]{enumerate}
   \fi%
-  \if@bidi@subfigureloaded@%
-      \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package subfigure before xepersian package. Please load package subfigure after xepersian package, and then try to run xelatex on your document again}{}]{subfigure}
-\else\fi%
   \if@bidi@tocloftloaded@\else
     \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package tocloft after xepersian package. Please load package tocloft before xepersian package, and then try to run xelatex on your document again}{}]{tocloft}
   \fi%
 }
 %% 
-%% Copyright © 2009-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
index 478436ef1dd..9f4b75ceee8 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{localise-xepersian.def}[2010/03/01 v0.2 Persian localisation of LaTeX2e]
+\ProvidesFile{localise-xepersian.def}[2010/07/25 v0.2 Persian localisation of LaTeX2e]
 \catcode`‌=11
 \newcommand\eqcommand[2][]{\let#1=#2}
 \newcommand\eqenvironment[2][]{\newenvironment{#1}{\begin{#2}}{\end{#2}}}
@@ -18,7 +18,7 @@
 \input{environments-xepersian.def}
 \input{misccommandsenvironments-ltx.def}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
index 09621583539..dde1d98e7e0 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{memoir-xepersian.def}[2010/03/01 v0.1 adaptations for memoir class]
+\ProvidesFile{memoir-xepersian.def}[2010/07/25 v0.1 adaptations for memoir class]
 \renewcommand{\@memfront}{%
   \@smemfront\pagenumbering{harfi}}
 \renewcommand{\setthesection}{\thechapter\@SepMark\harfi{section}}
@@ -21,7 +21,7 @@
   \gdef\thechapter{\@harfi\c@chapter}%
   \anappendixtrue}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
index e64473ffdea..4c3730e7e89 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{minitoc-xepersian.def}[2010/03/01 v0.1 bilingual captions for minitoc package]
+\ProvidesFile{minitoc-xepersian.def}[2010/07/25 v0.1 bilingual captions for minitoc package]
 \def\ptctitle{\if@RTL فهرست مطالب\else Table of Contents\fi}%
 \def\plftitle{\if@RTL لیست تصاویر\else List of Figures\fi}%
 \def\plttitle{\if@RTL لیست جداول\else List of Tables\fi}%
@@ -19,7 +19,7 @@
 \def\slftitle{\if@RTL اشکال\else Figures\fi}%
 \def\slttitle{\if@RTL جداول\else Tables\fi}%
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/misccommandsenvironments-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/misccommandsenvironments-ltx.def
index 00e93b8e752..e8115574d33 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/misccommandsenvironments-ltx.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/misccommandsenvironments-ltx.def
@@ -8,11 +8,11 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{misccommandsenvironments-ltx.def}[2010/03/01 v0.1 Persian localisation of LaTeX2e miscellaneous commands and environments]
+\ProvidesFile{misccommandsenvironments-ltx.def}[2010/07/25 v0.1 Persian localisation of LaTeX2e miscellaneous commands and environments]
 \eqcommand[\نوشتار]{\document}
 \eqcommand[\endنوشتار]{\enddocument}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def
index cc94697399e..ded4f799125 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{multicol-xepersian.def}[2010/03/01 v0.1 adaptations for multicol package]
+\ProvidesFile{multicol-xepersian.def}[2010/07/25 v0.1 adaptations for multicol package]
 \long\def\@footnotetext#1{%
     \begingroup
     \setbox\footins
@@ -94,7 +94,7 @@
         \rule\z@\footnotesep\ignorespaces\latinfont#1\@finalstrut\strutbox}%
     \color@endgroup}}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
new file mode 100644
index 00000000000..4f853efb39f
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
@@ -0,0 +1,32 @@
+%%
+%% This is file `rapport1-xepersian.def',
+
+%% 
+%%   __________________________________
+%%   Copyright © 2008-2010 Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{rapport1-xepersian.def}[2010/07/25 v0.1 adaptations for rapport1 class]
+\renewcommand*\thepart{\@tartibi\c@part}
+\renewcommand*\appendix{\par
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\thechapter{\@harfi\c@chapter}}
+%% 
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%% 
+%%
+%% End of file `rapport1-xepersian.def'.
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
index 3446b83c74c..01252bc4664 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{rapport3-xepersian.def}[2010/03/01 v0.1 adaptations for rapport3 class]
+\ProvidesFile{rapport3-xepersian.def}[2010/07/25 v0.2 adaptations for rapport3 class]
 \renewcommand*\thepart{\@tartibi\c@part}
 \renewcommand*\appendix{\par
   \setcounter{chapter}{0}%
@@ -16,7 +16,7 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
index 272181bbdb8..a32128d7a1b 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{refrep-xepersian.def}[2010/03/01 v0.1 adaptations for refrep class]
+\ProvidesFile{refrep-xepersian.def}[2010/07/25 v0.2 adaptations for refrep class]
 \renewcommand \thepart {\@tartibi\c@part}
 \renewcommand\appendix{\par
   \setcounter{chapter}{0}%
@@ -17,7 +17,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
index a344706fc00..b62a906a35c 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{report-xepersian.def}[2010/03/01 v0.1 adaptations for standard report class]
+\ProvidesFile{report-xepersian.def}[2010/07/25 v0.2 adaptations for standard report class]
 \renewcommand \thepart {\@tartibi\c@part}
 \renewcommand\appendix{\par
   \setcounter{chapter}{0}%
@@ -17,7 +17,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
index f74704361d5..aaf7d7766c6 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrartcl-xepersian.def}[2010/03/01 v0.1 adaptations for scrartcl class]
+\ProvidesFile{scrartcl-xepersian.def}[2010/07/25 v0.2 adaptations for scrartcl class]
 \renewcommand*{\thepart}{\@tartibi\c@part}
 \renewcommand*\appendix{\par%
   \setcounter{section}{0}%
@@ -38,7 +38,7 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
index a6936a71b2f..7c808cfa876 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrbook-xepersian.def}[2010/03/01 v0.1 adaptations for scrbook class]
+\ProvidesFile{scrbook-xepersian.def}[2010/07/25 v0.2 adaptations for scrbook class]
 \renewcommand*\frontmatter{%
   \if@twoside\cleardoubleoddpage\else\clearpage\fi
   \@mainmatterfalse\pagenumbering{harfi}%
@@ -43,7 +43,7 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
index 7f00988b109..3ee4cbd25c3 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrreprt-xepersian.def}[2010/03/01 v0.1 adaptations for scrreprt class]
+\ProvidesFile{scrreprt-xepersian.def}[2010/07/25 v0.2 adaptations for scrreprt class]
 \renewcommand*{\thepart}{\@tartibi\c@part}
 \renewcommand*\appendix{\par%
   \setcounter{chapter}{0}%
@@ -39,7 +39,7 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
index b219ceab75b..5a091c4a095 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
@@ -8,7 +8,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{tocloft-xepersian.def}[2010/03/01 v0.1 bilingual captions for tocloft package]
+\ProvidesFile{tocloft-xepersian.def}[2010/07/25 v0.1 bilingual captions for tocloft package]
 \renewcommand*{\cftchapname}{\if@RTL فصل\else chapter\fi}
 \renewcommand*{\cftsecname}{\if@RTL قسمت\else section\fi}
 \renewcommand*{\cftsubsecname}{\if@RTL زیرقسمت\else subsection\fi}
@@ -20,7 +20,7 @@
 \renewcommand*{\cfttabname}{\if@RTL جدول\else table\fi}
 \renewcommand*{\cftsubtabname}{\if@RTL زیرجدول\else subtable\fi}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
index 01e0db67075..0b8be962f81 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
@@ -9,7 +9,7 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{xepersian-magazine}[2009/01/05 v0.1 Typesetting Persian magazines in XeLaTeX (Author: Vafa Khalighi)]
+\ProvidesClass{xepersian-magazine}[2010/07/25 v0.2 Typesetting Persian magazines in XeLaTeX]
 \RequirePackage{ifthen}
 \newlength{\xepersian@imgsize}
 \newlength{\xepersian@coltitsize}
@@ -878,7 +878,7 @@ indexblock environment may only appear inside frontpage environment.
 {\noindent #2}\\
 }
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
index be84093a13e..29be7643a9f 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{xepersian-mathsdigitspec}
-  [2009/04/22 v1.0.1 Unicode Persian maths digits in XeLaTeX (Author: Vafa Khalighi)]
+  [2010/07/25 v0.6 Unicode Persian maths digits in XeLaTeX]
 \@zf@mathfalse
 \def\@preamblecmds{}
 \newcommand\not@onlypreamble[1]{{%
@@ -38,21 +38,17 @@
     \XKV@rm}{#2}}\@tempa
   \xepersian@PackageInfo{Defining the default Persian maths digits font as '#2'}
   \DeclareSymbolFont{OPERATORS}   {EU1}{\zf@family} {m}{n}
-  \SetSymbolFont{OPERATORS}{bold}{EU1}{\zf@family} {bx}{n}
-  \DeclareMathAlphabet      {\mathit}{EU1}{\zf@family}{m}{it}
-  \DeclareSymbolFontAlphabet{\mathrm}    {OPERATORS}
-  \DeclareMathAlphabet      {\mathbf}{EU1}{\zf@family}{bx}{n}
   \def\persianmathsdigits{%
-  \SetMathCode{`0}{\mathalpha}{OPERATORS}{"06F0}
-  \SetMathCode{`1}{\mathalpha}{OPERATORS}{"06F1}
-  \SetMathCode{`2}{\mathalpha}{OPERATORS}{"06F2}
-  \SetMathCode{`3}{\mathalpha}{OPERATORS}{"06F3}
-  \SetMathCode{`4}{\mathalpha}{OPERATORS}{"06F4}
-  \SetMathCode{`5}{\mathalpha}{OPERATORS}{"06F5}
-  \SetMathCode{`6}{\mathalpha}{OPERATORS}{"06F6}
-  \SetMathCode{`7}{\mathalpha}{OPERATORS}{"06F7}
-  \SetMathCode{`8}{\mathalpha}{OPERATORS}{"06F8}
-  \SetMathCode{`9}{\mathalpha}{OPERATORS}{"06F9}
+  \SetMathCode{`0}{\mathord}{OPERATORS}{"06F0}
+  \SetMathCode{`1}{\mathord}{OPERATORS}{"06F1}
+  \SetMathCode{`2}{\mathord}{OPERATORS}{"06F2}
+  \SetMathCode{`3}{\mathord}{OPERATORS}{"06F3}
+  \SetMathCode{`4}{\mathord}{OPERATORS}{"06F4}
+  \SetMathCode{`5}{\mathord}{OPERATORS}{"06F5}
+  \SetMathCode{`6}{\mathord}{OPERATORS}{"06F6}
+  \SetMathCode{`7}{\mathord}{OPERATORS}{"06F7}
+  \SetMathCode{`8}{\mathord}{OPERATORS}{"06F8}
+  \SetMathCode{`9}{\mathord}{OPERATORS}{"06F9}
   \SetMathCode{`\%}{\mathbin}{OPERATORS}{`٪}
   \SetMathCharDef{\decimalseparator}{\mathpunct}{OPERATORS}{"066B}}
 }
@@ -92,9 +88,10 @@
 \def\AutoMathsDigits{\def\SetMathsDigits{\ifx\persianmathsdigits\undefied\else\if@Latin\else\persianmathsdigits\fi\fi}}
 \AutoMathsDigits
 \everymath{\SetMathsDigits}
-\everydisplay{\SetMathsDigits}
+\g@addto@macro\document{\everydisplay{\predisplaydirection=0\SetMathsDigits}
+\@ifpackageloaded{amsmath}{\everydisplay\@xp{\the\everydisplay \@displaytrue}}{}}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
index f60c1b1a404..61cf7217efd 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
@@ -9,8 +9,8 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xepersian-multiplechoice}[2009/03/21 v0.1
-                    Multiple Choice Questionnaire class for Persian in XeLaTeX (Author: Vafa Khalighi)]
+\ProvidesPackage{xepersian-multiplechoice}[2010/07/25 v0.2
+                    Multiple Choice Questionnaire class for Persian in XeLaTeX]
 \RequirePackage{pifont}
 \RequirePackage{fullpage}
 \RequirePackage{ifthen}
@@ -144,7 +144,7 @@
  \questiontitle{سؤال \thequestion:}
 \ProcessOptions
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
index bcc170cae8d..34e89588c66 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
@@ -9,7 +9,7 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xepersian-persiancal}[2010/03/01 v0.1 provides Persian calendar]
+\ProvidesPackage{xepersian-persiancal}[2010/07/25 v0.1 provides Persian calendar]
 
 \newif\ifXePersian@leap \newif\ifXePersian@kabiseh
 \newcount\XePersian@i  \newcount\XePersian@y  \newcount\XePersian@m  \newcount\XePersian@d
@@ -177,7 +177,7 @@
 دی\or بهمن\or
 اسفند\fi}
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
index e3bad8a76dc..d115ff66f6b 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
@@ -9,43 +9,28 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v1.0.4}
-\def\xepersianrevision{revision 153}
-\def\xepersiandate{2010/03/01}
-\ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space <\xepersianrevision>
+\def\xepersianversion{v1.0.6}
+\def\xepersiancommit{commit 18}
+\def\xepersiandate{2010/07/25}
+\ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space <\xepersiancommit>
 Persian typesetting in XeLaTeX]
 \RequirePackage{fontspec}
 \RequirePackage{xepersian-persiancal}
 \RequirePackage{xepersian-mathsdigitspec}
 \RequirePackage{etoolbox}
 \RequirePackage[RTLdocument]{bidi}
-\g@addto@macro\document{%
-\special{pdf: docinfo <<
-/Creator (X∃Persian \xepersianversion\space <\xepersianrevision> Copyright © 2008-2010 Vafa Khalighi)
-         >>}}
 \edef\xepersianinfo{%
 xepersian package (Persian for LaTeX over XeTeX)^^J
 Description: The package supports Persian^^J
 typesetting, using fonts provided in the distribution.^^J
 Copyright © 2008-2010 Vafa Khalighi^^J
-\xepersianversion, <\xepersianrevision>, \xepersiandate^^J
+\xepersianversion, <\xepersiancommit>, \xepersiandate^^J
 License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J
-Home: http://xepersian.berlios.de^^J
+Home: http://bitbucket.org/vafa/xepersian^^J
 Location on CTAN: /macros/xetex/latex/xepersian}
 \typeout{\xepersianinfo}
 \edef\xepersian@everyjob{\the\everyjob}
 \everyjob{\xepersian@everyjob\typeout{\xepersianinfo}}
-\gdef\@latex@error#1#2{%
-   \GenericError{%
-      \space\space\space\@spaces\@spaces\@spaces
-   }{%
-      XePersian Error: #1%
-   }{%
-      Oops! either you have done something wrong or it is a xepersian bug. Please first produce a similar file without using XePersian package and then compile it with xelatex, if you got the same error, then either you have been certainly doing something wrong or it is a LaTeX bug, otherwise please report the error with a minimal tex file which shows the error to  the Author of XePersian.%
-   }{#2}%
-}
-\gdef\@latexbug{%
-  \@latex@error{This may be a XePersian bug}{Please inform the Author of XePersian}}
 \AtBeginDocument{\ifdefined\persianfont\relax\else%
 \PackageError{xepersian}{Oops! you have not specified any font for the main text of the document. Please specify a font for the main text of the document by using \settextfont\space CS, and then try to run xelatex on your document again}%
 \fi}
@@ -149,12 +134,12 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \def\setpersianfont{%
 \let\normalfont\persianfont%
 \persianfont}
-\def\lr#1{\begingroup\beginL\latinfont#1\endL\endgroup}
-\def\rl#1{\begingroup\beginR\persianfont#1\endR\endgroup}
-\def\latin{\bgroup\LatinAlphs\par\@RTLfalse\@Latintrue\@RTL@footnotefalse\resetlatinfont}
-\def\endlatin{\par\egroup}
-\def\persian{\bgroup\PersianAlphs\par\@RTLtrue\@RTL@footnotetrue\setpersianfont}
-\def\endpersian{\par\egroup}
+\def\lr#1{\LRE{\latinfont#1}}
+\def\rl#1{\RLE{\persianfont#1}}
+\def\latin{\LTR\LatinAlphs\@Latintrue\@RTL@footnotefalse\resetlatinfont}
+\def\endlatin{\endLTR}
+\def\persian{\RTL\PersianAlphs\@RTL@footnotetrue\setpersianfont}
+\def\endpersian{\endRTL}
 \def\Latin{\if@RTL\par\LatinAlphs\@RTLfalse\@Latintrue\@RTL@footnotefalse\resetlatinfont\fi}
 \def\Persian{\if@RTL\relax\else\par\PersianAlphs\@RTLtrue\@Latinfalse\@RTL@footnotetrue\setpersianfont\fi}
 \let\originaltoday=\today
@@ -251,9 +236,9 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \def\pagename{\if@RTL صفحه\else Page\fi}
 \def\headtoname{\if@RTL به\else To\fi}
 \def\proofname{\if@RTL اثبات\else Proof\fi}
-\def\@harfi#1{\ifcase#1\or الف\char"200D\or ب\or پ\or ت\or ث\or
+\def\@harfi#1{\ifcase#1\or الف‍\or ب\or پ\or ت\or ث\or
 ج\or چ\or ح\or خ\or د\or ذ\or ر\or ز\or س\or ش\or ص\or ض\or ع\or غ\or
-ف\or ق\or ک\or گ\or ل\or م\or ن\or ه\or و\or ی\else\@ctrerr\fi}
+ف\or ق\or ک\or گ\or ل\or م\or ن\or و\or ه\or ی\else\@ctrerr\fi}
 \def\harfi#1{\expandafter\@harfi\csname c@#1\endcsname}
 \def\@adadi#1{\ifcase#1 \or یک\or دو\or سه\or چهار\or پنج\or شش\or هفت\or هشت\or نه\or ده\or یازده\or دوازده\or سیزده\or چهارده\or پانزده\or شانزده\or هفده\or هجده\or نوزده\or بیست\else\@ctrerr\fi}
 \def\adadi#1{\expandafter\@adadi\csname c@#1\endcsname}
@@ -285,7 +270,7 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \def\abjad@zero{}
 \def\abj@num@i#1{%
   \ifcase#1\or الف\or ب\or ج\or د%
-           \or ه\char"200D\or و\or ز\or ح\or ط\fi
+           \or ه‍\or و\or ز\or ح\or ط\fi
   \ifnum#1=\z@\abjad@zero\fi}
 \def\abj@num@ii#1{%
   \ifcase#1\or ی\or ک\or ل\or م\or ن%
@@ -325,13 +310,22 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \@ifpackageloaded{multicol}{\input{multicol-xepersian.def}}{}
 \@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xepersian.def}}}{}
 \@ifclassloaded{article}{\input{article-xepersian.def}}{}
+\@ifclassloaded{extarticle}{\input{extarticle-xepersian.def}}{}
+\@ifclassloaded{artikel1}{\input{artikel1-xepersian.def}}{}
+\@ifclassloaded{artikel2}{\input{artikel2-xepersian.def}}{}
+\@ifclassloaded{artikel3}{\input{artikel3-xepersian.def}}{}
 \@ifclassloaded{amsart}{\input{amsart-xepersian.def}}{}
+\@ifclassloaded{bidimoderncv}{\input{bidimoderncv-xepersian.def}}{}
 \@ifclassloaded{report}{\input{report-xepersian.def}}{}
+\@ifclassloaded{extreport}{\input{extreport-xepersian.def}}{}
+\@ifclassloaded{rapport1}{\input{rapport1-xepersian.def}}{}
 \@ifclassloaded{rapport3}{\input{rapport3-xepersian.def}}{}
 \@ifclassloaded{scrartcl}{\input{scrartcl-xepersian.def}}{}
 \@ifclassloaded{scrbook}{\input{scrbook-xepersian.def}}{}
 \@ifclassloaded{scrreprt}{\input{scrreprt-xepersian.def}}{}
 \@ifclassloaded{amsbook}{\input{amsbook-xepersian.def}}{}
+\@ifclassloaded{boek3}{\input{boek3-xepersian.def}}{}
+\@ifclassloaded{boek}{\input{boek-xepersian.def}}{}
 \@ifclassloaded{bookest}{\input{bookest-xepersian.def}}{}
 \@ifclassloaded{extbook}{\input{extbook-xepersian.def}}{}
 \@ifclassloaded{book}{\input{book-xepersian.def}}{}
@@ -341,7 +335,7 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \DeclareOption{localise}{\input{localise-xepersian.def}}
 \ProcessOptions
 %% 
-%% Copyright © 2008-2010      by Vafa Khalighi     <vafa@users.berlios.de>
+%% Copyright © 2008-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of