xepersian (31oct12)

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

57 files changed, 225 insertions, 209 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
index 7770f601b5b..4c8603ecedf 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
@@ -17,7 +17,7 @@
 \def\ALGS@name{الگوریتم‌ها}
 \def\listalgorithmname{\if@RTL فهرست \ALGS@name\else List of \ALG@name s\fi}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
index 6b64ea83b0c..5e131d72438 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
@@ -16,7 +16,7 @@
 \def\algorithmicrequire{\if@RTL\textbf{ورودی:}\else\textbf{Require:}\fi}
 \def\algorithmicensure{\if@RTL\textbf{خروجی:}\else\textbf{Ensure:}\fi}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def
index d09ae8e6953..88c6b9c3ec2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def
@@ -17,50 +17,52 @@
 \def\appendix{\par\c@section\z@ \c@subsection\z@
    \let\sectionname\appendixname
    \def\thesection{\@harfi\c@section}}
+
 \long\def\@footnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
+  \insert\footins{%
+    \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\unskip\strut\par}}}
+
 \long\def\@RTLfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLtrue\reset@font\footnotesize
+  \insert\footins{%
+    \@RTLtrue%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\persianfont #1\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\persianfont #1\unskip\strut\par}}}
+
 \long\def\@LTRfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLfalse\reset@font\footnotesize
+  \insert\footins{%
+    \@RTLfalse%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\latinfont #1\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\latinfont  #1\unskip\strut\par}}}
+
+\footdir@temp\footdir@ORG@xepersian@amsart@footnotetext\@footnotetext{\if@RTL@footnote R\else L\fi}%
+\footdir@temp\footdir@ORG@xepersian@amsart@RTLfootnotetext\@RTLfootnotetext{R}%
+\footdir@temp\footdir@ORG@xepersian@amsart@LTRfootnotetext\@LTRfootnotetext{L}%
+
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def
index baa0291edc9..941fbe0de6c 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def
@@ -19,50 +19,52 @@
   \c@chapter\z@ \c@section\z@
   \let\chaptername\appendixname
   \def\thechapter{\@harfi\c@chapter}}
+
 \long\def\@footnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
+  \insert\footins{%
+    \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\unskip\strut\par}}}
+
 \long\def\@RTLfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLtrue\reset@font\footnotesize
+  \insert\footins{%
+    \@RTLtrue%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\persianfont #1\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\persianfont #1\unskip\strut\par}}}
+
 \long\def\@LTRfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLfalse\reset@font\footnotesize
+  \insert\footins{%
+    \@RTLfalse%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\latinfont #1\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\latinfont  #1\unskip\strut\par}}}
+
+\footdir@temp\footdir@ORG@xepersian@amsbook@footnotetext\@footnotetext{\if@RTL@footnote R\else L\fi}%
+\footdir@temp\footdir@ORG@xepersian@amsbook@RTLfootnotetext\@RTLfootnotetext{R}%
+\footdir@temp\footdir@ORG@xepersian@amsbook@LTRfootnotetext\@LTRfootnotetext{L}%
+
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
index 1d4eae1984a..34b3de2e809 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
@@ -19,7 +19,7 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
index 21e0769e073..8f5d182c92f 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
@@ -19,7 +19,7 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
index de7f0378cae..15e6f33a3b5 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
@@ -19,7 +19,7 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
index c07b506fd67..48d705787b7 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
@@ -19,7 +19,7 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
index ecdfcbb4192..c918d9826af 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
@@ -33,7 +33,7 @@
   }%
 }%
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
index b2c847c287f..ebf74a66c5b 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
@@ -14,7 +14,7 @@
 %% 
 \ProvidesFile{bidicode-xepersian.def}[2010/07/25 v0.0 Persian captions for bidicode package]
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
index 364e64dccbd..be273b94edd 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
@@ -15,7 +15,7 @@
 \ProvidesFile{bidimoderncv-xepersian.def}[2010/07/25 v0.1 adaptations for bidimoderncv class]
 \def\refname{\if@RTL تألیفات\else Publications\fi}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def
index bc4472238c2..616c6fb6397 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def
@@ -82,7 +82,7 @@
   \let\cite\@bidituftesidenote@normal@cite%       go back to using normal in-text \cite command
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
index 8c4d6b8a510..67d154a89ce 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
@@ -24,7 +24,7 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
index 5b537f88b77..c44a9716390 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
@@ -24,7 +24,7 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
index 2c806cdd1dc..0c85bf4379c 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
@@ -25,7 +25,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
index 77c0e74cf92..52f9f21ae13 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
@@ -21,7 +21,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
index be7a342d84e..c979793e1e0 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
@@ -53,7 +53,7 @@
 \ignorespaces
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def b/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def
index db5db4040bb..88f9376171d 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def
@@ -22,7 +22,7 @@
 \تعریف‌رنگ{بنفش}{cmyk}{0,1,0,0}
 \تعریف‌رنگ{زرد}{cmyk}{0,0,1,0}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
index ea4fafb6c1c..9080382ddad 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
@@ -957,7 +957,7 @@
 \eqcommand{@فر}{z@}
 \eqcommand{@فرفاصله}{z@skip}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
index fbb2bdd9e97..41a5ff4f15d 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
@@ -73,7 +73,7 @@
 \eqcommand{تاریخ‌گونه‌زی‌پرشین}{xepersiandate}
 \eqcommand{زی‌تک}{XeTeX}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def
index c1582a304a3..d364299c2e9 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def
@@ -16,7 +16,7 @@
 \def\tagform@#1{\maketag@@@{\if@Latin\else\beginR\fi(\ignorespaces#1\unskip\@@italiccorr)\if@Latin\else\endR\fi}}
 \def\text#1{\@@text{\if@Latin\else\beginR\fi#1\if@Latin\else\endR\fi}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
index 8a33d58166e..07429b1780b 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
@@ -30,7 +30,7 @@
              \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \@tempa}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
index c90483dc6f4..584837456d4 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
@@ -56,7 +56,7 @@
 \eqenvironment{لیست‌بدوی}{trivlist}
 \eqenvironment{شعر}{verse}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
index f56e7beb99a..3f2a34e59b9 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
@@ -24,7 +24,7 @@
 \eqenvironment{شعرسنتی}{traditionalpoem}
 \eqenvironment{شعرسنتی*}{traditionalpoem*}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
index e995ba5b95d..d890fa74dc4 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
@@ -19,7 +19,7 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
index 1595b8c9ab5..4f0348b10dc 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
@@ -25,7 +25,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def
index 2577d022646..f7f9d0ba9fe 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def
@@ -17,7 +17,7 @@
 \renewcommand{\LTRfoottextfont}{\footnotesize\latinfont}
 \renewcommand{\RTLfoottextfont}{\footnotesize\persianfont}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
index 98b58cc9102..4cdc6842024 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
@@ -20,7 +20,7 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
index 9bf095cc41f..ce387c7c9bc 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
@@ -42,7 +42,7 @@
   \setcounter{displayedframe}{0}%
   \let\firstmark\botmark}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
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 890ddf58395..89f0655cfaf 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def
@@ -13,49 +13,58 @@
 %% 
 %% 
 \ProvidesFile{footnote-bidi-xepersian.def}[2010/07/25 v0.2 footnote macros for xepersian package]
-\long\def\@footnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
+
+\long\def\@footnotetext#1{\insert\footins{%
+    \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \reset@font\footnotesize
     \interlinepenalty\interfootnotelinepenalty
     \splittopskip\footnotesep
     \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
     \hsize\columnwidth \@parboxrestore
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\strut}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
-\long\def\@RTLfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLtrue\reset@font\footnotesize
+    \protected@edef\@currentlabel{%
+       \csname p@footnote\endcsname\@thefnmark
+    }%
+    \color@begingroup
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\@finalstrut\strutbox}%
+    \color@endgroup}}%
+
+\long\def\@RTLfootnotetext#1{\insert\footins{%
+    \@RTLtrue%
+    \reset@font\footnotesize
     \interlinepenalty\interfootnotelinepenalty
     \splittopskip\footnotesep
     \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
     \hsize\columnwidth \@parboxrestore
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\persianfont #1\strut}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
-\long\def\@LTRfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLfalse\reset@font\footnotesize
+    \protected@edef\@currentlabel{%
+       \csname p@footnote\endcsname\@thefnmark
+    }%
+    \color@begingroup
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces\persianfont #1\@finalstrut\strutbox}%
+    \color@endgroup}}%
+
+\long\def\@LTRfootnotetext#1{\insert\footins{%
+    \@RTLfalse%
+    \reset@font\footnotesize
     \interlinepenalty\interfootnotelinepenalty
     \splittopskip\footnotesep
     \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
     \hsize\columnwidth \@parboxrestore
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\latinfont #1\strut}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \protected@edef\@currentlabel{%
+       \csname p@footnote\endcsname\@thefnmark
+    }%
+    \color@begingroup
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces\latinfont #1\@finalstrut\strutbox}%
+    \color@endgroup}}%
+
+\footdir@temp\footdir@ORG@xepersian@footnotetext\@footnotetext{\if@RTL@footnote R\else L\fi}%
+\footdir@temp\footdir@ORG@xepersian@RTLfootnotetext\@RTLfootnotetext{R}%
+\footdir@temp\footdir@ORG@xepersian@LTRfootnotetext\@LTRfootnotetext{L}%
+
 \long\def\@mpfootnotetext#1{%
+ \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\if@RTL@footnote\rightfootnoterule\else\leftfootnoterule\fi\fi\fi%
   \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -64,12 +73,12 @@
     \protected@edef\@currentlabel
          {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
-     \bidi@footnotetext@dir{#1}
-    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\@finalstrut\strutbox}%
     \color@endgroup}}
+
 \long\def\@mpRTLfootnotetext#1{%
+  \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\rightfootnoterule\fi\fi%
   \global\setbox\@mpfootins\vbox{\@RTLtrue%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -78,12 +87,12 @@
     \protected@edef\@currentlabel
          {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
-     \bidi@footnotetext@dir{#1}
-    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
       \@makefntext{%
-        \rule\z@\footnotesep\ignorespaces\persianfont#1\@finalstrut\strutbox}%
+        \rule\z@\footnotesep\ignorespaces\persianfont #1\@finalstrut\strutbox}%
     \color@endgroup}}
+
 \long\def\@mpLTRfootnotetext#1{%
+ \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\leftfootnoterule\fi\fi%
   \global\setbox\@mpfootins\vbox{\@RTLfalse%
     \unvbox\@mpfootins
     \reset@font\footnotesize
@@ -92,13 +101,11 @@
     \protected@edef\@currentlabel
          {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
-     \bidi@footnotetext@dir{#1}
-    \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi
       \@makefntext{%
-        \rule\z@\footnotesep\ignorespaces\latinfont#1\@finalstrut\strutbox}%
+        \rule\z@\footnotesep\ignorespaces\latinfont #1\@finalstrut\strutbox}%
     \color@endgroup}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/framed-bidi-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/framed-bidi-xepersian.def
index 725cd3765d1..a04c5739108 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/framed-bidi-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/framed-bidi-xepersian.def
@@ -25,7 +25,7 @@
   \MakeFramed{\advance\hsize-20pt \FrameRestore}}%
  {\endMakeFramed}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
index 5350f9d273a..d7607054c22 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
@@ -40,7 +40,7 @@
 }
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def
index ab978b9b94e..0f6d6ed1afd 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def
@@ -12,7 +12,7 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{imsproc-xepersian.def}[2012/05/03 v0.1 implementation of imsproc class for xepersian package]
+\ProvidesFile{imsproc-xepersian.def}[2012/12/12 v0.1 implementation of imsproc class for xepersian package]
 \newenvironment{thebibliography}[1]{%
   \@bibtitlestyle
   \normalfont\bibliofont\labelsep .5em\relax
@@ -36,62 +36,67 @@
   \if@RTL\raggedleft\else\raggedright\fi
   \hyphenpenalty\@M
   \footnotesize}
+\def\@idxitem{\par\hangindent \if@RTL-\fi2em}
+\def\subitem{\par\hangindent \if@RTL-\fi2em\hspace*{1em}}
+\def\subsubitem{\par\hangindent \if@RTL-\fi3em\hspace*{2em}}
 \renewcommand \thepart {\@tartibi\c@part}
 \def\appendix{\par\c@section\z@ \c@subsection\z@
    \let\sectionname\appendixname
    \def\thesection{\@harfi\c@section}}
-\def\right@footnote{%
+\def\right@footnoterule{%
   \hbox to \columnwidth
   {\beginR \vbox{\kern-.4\p@
         \hrule\@width 5pc\kern11\p@\kern-\footnotesep}\hfil\endR}}
-\def\left@footnote{\kern-.4\p@
+\def\left@footnoterule{\kern-.4\p@
         \hrule\@width 5pc\kern11\p@\kern-\footnotesep}
 \def\@makefnmark{%
   \leavevmode
   \raise.9ex\hbox{\fontsize\sf@size\z@\normalfont\@thefnmark}%
 }
+
 \long\def\@footnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize
+  \insert\footins{%
+    \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\latinfont#1\fi\unskip\strut\par}}}
+
 \long\def\@RTLfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLtrue\reset@font\footnotesize
+  \insert\footins{%
+    \@RTLtrue%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\persianfont #1\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\persianfont #1\unskip\strut\par}}}
+
 \long\def\@LTRfootnotetext#1{%
-    \begingroup
-    \setbox\footins
-    \vbox{\@RTLfalse\reset@font\footnotesize
+  \insert\footins{%
+    \@RTLfalse%
+    \normalfont\footnotesize
     \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy
-    \bidi@footnotetext@dir{#1}%
-    \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext
-    {\rule{\z@}{\footnotesep}\ignorespaces\latinfont #1\unskip\strut\par}}%
-     \bidi@footnotetext@after
-    \insert\footins{\unvbox\footins}%
-    \endgroup}
+    \splittopskip\footnotesep \splitmaxdepth \dp\strutbox
+    \floatingpenalty\@MM \hsize\columnwidth
+    \@parboxrestore \parindent\normalparindent \sloppy
+    \protected@edef\@currentlabel{%
+      \csname p@footnote\endcsname\@thefnmark}%
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces\latinfont  #1\unskip\strut\par}}}
+
+\footdir@temp\footdir@ORG@xepersian@imsproc@footnotetext\@footnotetext{\if@RTL@footnote R\else L\fi}%
+\footdir@temp\footdir@ORG@xepersian@imsproc@RTLfootnotetext\@RTLfootnotetext{R}%
+\footdir@temp\footdir@ORG@xepersian@imsproc@LTRfootnotetext\@LTRfootnotetext{L}%
+
 \def\part{\@startsection{part}{0}%
   \z@{\linespacing\@plus\linespacing}{.5\linespacing}%
   {\normalfont\bfseries\if@RTL\raggedleft\else\raggedright\fi}}
@@ -138,7 +143,7 @@
   \@cleartopmattertags
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
index 0d54352ad5e..6dd59aa5679 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
@@ -57,7 +57,7 @@
 \newcommand{\KashidaOff}{\XeTeXinterchartokenstate=0}
 \KashidaOn
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
index 094513704ea..3dab8f9280f 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
@@ -16,7 +16,7 @@
 \def\lstlistingname{\if@RT برنامهٔ\else Listing\fi}
 \def\lstlistlistingname{\if@RTL فهرست برنامه‌ها\else Listings\fi}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
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 f4aa525b3be..8b3877f30d8 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def
@@ -40,7 +40,7 @@
   \fi%
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
index 0c1b7400e87..73c4f5158ef 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
@@ -93,7 +93,7 @@
 \aliasfontfeatureoption{Script}{Parsi}{پارسی}
 \aliasfontfeatureoption{Script}{Latin}{لاتین}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
index 11b02e05ce3..1c9a9c3f667 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
@@ -25,7 +25,7 @@
   \gdef\thechapter{\@harfi\c@chapter}%
   \anappendixtrue}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def b/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def
index 19710006526..322957dbab9 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def
@@ -14,7 +14,7 @@
 %% 
 \آماده‌سازی‌پرونده{messages-localise.def}[2011/03/01 v0.1 localising LaTeX2e messages]
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
index b7b7147c62c..c0d6eca117e 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
@@ -23,7 +23,7 @@
 \def\slftitle{\if@RTL اشکال\else Figures\fi}%
 \def\slttitle{\if@RTL جداول\else Tables\fi}%
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def
index 48790f285b9..011d372a3f9 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def
@@ -381,7 +381,7 @@
 \ExplSyntaxOff
 \expandafter\let\csname endهمانطورکه‌هست*\endcsname =\endهمانطورکه‌هست
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def
index 42226b2879c..e4520e21c99 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def
@@ -228,7 +228,7 @@
 \newcommand\NAT@@Latin@@citetp{}
 \def\NAT@@Latin@@citetp[#1]{\@ifnextchar[{\@Latincitex[#1]}{\@Latincitex[][#1]}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def
index 599ff65883a..43ecbd37007 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def
@@ -161,7 +161,7 @@
 \معادل@کلید{Grot}{واحد}{units}
 }{}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
index 7ca86a4b1f7..89cf25ee8a1 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
@@ -20,7 +20,7 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
index d82f3f855a5..ce4e236c304 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
@@ -20,7 +20,7 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
index 4c35d20cc0f..9e1ebdab9e9 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
@@ -21,7 +21,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
index 0d0df23410d..dd6b431ac0d 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
@@ -21,7 +21,7 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
index f6b2e071c37..5170f5ba2fa 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
@@ -42,7 +42,7 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
index b976dbcc4cd..c80365a6ba9 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
@@ -47,7 +47,7 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
index b161378d1c5..25798e488a5 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
@@ -43,7 +43,7 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def
index 78ceebacf1f..e7a7a2bae24 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def
@@ -33,7 +33,7 @@
   \setcounter{C@CurrentNode}{0}
 }%
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
index 209302d0f61..a9c29625bd7 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
@@ -24,7 +24,7 @@
 \renewcommand*{\cfttabname}{\if@RTL جدول\else table\fi}
 \renewcommand*{\cftsubtabname}{\if@RTL زیرجدول\else subtable\fi}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
index 1230028ed76..bae815c2036 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
@@ -882,7 +882,7 @@ indexblock environment may only appear inside frontpage environment.
 {\noindent #2}\\
 }
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
index d6664cb0ef7..eca7da9bb04 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
@@ -219,7 +219,7 @@
 \everymath\expandafter{\the\everymath\SetMathsDigits}
 \g@addto@macro\document{\everydisplay\expandafter{\the\everydisplay\SetMathsDigits}}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
index 0946e7827b8..3d4a70d2d84 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
@@ -150,7 +150,7 @@
  \questiontitle{سؤال \thequestion:}
 \ProcessOptions
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
index e9891246101..0d25cee5c9c 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
@@ -184,7 +184,7 @@
 دی\or بهمن\or
 اسفند\fi}
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
index 24f1aca80d3..02718c10f02 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
@@ -13,8 +13,8 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v11.143}
-\def\xepersiandate{2012/07/25}
+\def\xepersianversion{v12 (Final Version)}
+\def\xepersiandate{2012/12/12}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space
 Persian typesetting in XeLaTeX]
 \RequirePackage{fontspec}
@@ -595,7 +595,7 @@ number is 999,999,999.}%
 \@ifclassloaded{memoir}{\PackageError{xepersian}{This  feature does not yet work with the memoir class}{}}{%
 \renewcommand\printindex{\newpage%
 \immediate\closeout\@indexfile
-\immediate\write18{xindy -L persian -C utf8 -M texindy \jobname.idx}
+\immediate\write18{xindy -L persian -C utf8 -M texindy -M page-ranges \jobname.idx}
 \@input@{\jobname.ind}}}%
 \else
 \PackageError{xepersian}{“shell escape” (or “write18”) is not enabled. You need to run “xelatex --shell-escape” on your TeX document for this feature to work}{}
@@ -603,7 +603,7 @@ number is 999,999,999.}%
 \ExecuteOptions{localise}
 \ProcessOptions
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafakhlg@gmail.com>
+%% Copyright © 2008–2012  Vafa Khalighi <vafak12@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