xepersian (14sep11)

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

60 files changed, 368 insertions, 342 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xepersian/README b/Master/texmf-dist/doc/xelatex/xepersian/README
index 6071397e646..16acf46c837 100644
--- a/Master/texmf-dist/doc/xelatex/xepersian/README
+++ b/Master/texmf-dist/doc/xelatex/xepersian/README
@@ -1,9 +1,9 @@
 _________________
 The XePersian package
-v1.1.8
+v1.2.0
 
 XePersian is a package written for XeLaTeX that allows users to typeset
-Persian easily. The current version is 1.1.8 and it will be developed to
+Persian easily. The current version is 1.2.0 and it will be developed to
 meet the needs of Persian typesetting properly.
 
 The XePersian package is independent of any operating system, meaning it
@@ -16,7 +16,7 @@ in the documentation.
 To get help, please explore http://forum.parsilatex.com
 
 ______________
-Vafa Khalighi
+VAFA KHALIGHI
 vafaklg@gmail.com
 
 Copyright © 2008–2011
@@ -26,4 +26,4 @@ version 1.3c or higher (your choice). The latest version of
 this license is at: http://www.latex-project.org/lppl.txt
 
 This work is “author-maintained” (as per LPPL maintenance status)
-by Vafa Khalighi.
+by VAFA KHALIGHI.
diff --git a/Master/texmf-dist/doc/xelatex/xepersian/xepersian.pdf b/Master/texmf-dist/doc/xelatex/xepersian/xepersian.pdf
index fa550ebc059..48a6ad6b6d6 100644
--- a/Master/texmf-dist/doc/xelatex/xepersian/xepersian.pdf
+++ b/Master/texmf-dist/doc/xelatex/xepersian/xepersian.pdf
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xepersian/parsidigits.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xepersian/parsidigits.map
index f6b5e1ffb06..a63dd5b78f5 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xepersian/parsidigits.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xepersian/parsidigits.map
@@ -7,12 +7,11 @@
 ;; xepersian.dtx  (with options: `parsidigits.map')
 ;; 
 ;;   ______________________________________
-;;   Copyright © 2008–2011  Vafa Khalighi
+;;   Copyright © 2008–2011  VAFA KHALIGHI
 ;; 
 ;;   License information appended.
 ;; 
 ;; 
-; Vafa Khalighi ...
 LHSName "Digits"
 RHSName "ParsiDigits"
 
@@ -59,14 +58,14 @@ U+002C U+002C <> U+201E ; ,, -> DOUBLE LOW-9 QUOTATION MARK
 U+003C U+003C <> U+00AB ; << -> LEFT POINTING GUILLEMET
 U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
 ;; 
-;; Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+;; Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 ;; 
 ;; It may be distributed and/or modified under the LaTeX Project Public License,
 ;; version 1.3c or higher (your choice). The latest version of
 ;; this license is at: http://www.latex-project.org/lppl.txt
 ;; 
 ;; This work is “author-maintained” (as per LPPL maintenance status)
-;; by Vafa Khalighi.
+;; by VAFA KHALIGHI.
 ;; 
 ;; 
 ;; 
diff --git a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
index f3c8f8b7f98..56059aa6b88 100644
--- a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
+++ b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
@@ -5,10 +5,10 @@
 %<*readme>
 _________________
 The XePersian package
-v1.1.8
+v1.2.0
 
 XePersian is a package written for XeLaTeX that allows users to typeset
-Persian easily. The current version is 1.1.8 and it will be developed to
+Persian easily. The current version is 1.2.0 and it will be developed to
 meet the needs of Persian typesetting properly.
 
 The XePersian package is independent of any operating system, meaning it
@@ -23,7 +23,7 @@ in the documentation.
 To get help, please explore http://forum.parsilatex.com
 
 ______________
-Vafa Khalighi
+VAFA KHALIGHI
 vafaklg@gmail.com
 
 Copyright © 2008–2011
@@ -33,7 +33,7 @@ version 1.3c or higher (your choice). The latest version of
 this license is at: http://www.latex-project.org/lppl.txt
 
 This work is “author-maintained” (as per LPPL maintenance status) 
-by Vafa Khalighi.
+by VAFA KHALIGHI.
 %</readme>
 %<*internal>
 \fi
@@ -46,7 +46,7 @@ by Vafa Khalighi.
 \preamble
 
   ______________________________________
-  Copyright © 2008–2011  Vafa Khalighi
+  Copyright © 2008–2011  VAFA KHALIGHI
 
   License information appended.
 
@@ -54,14 +54,14 @@ by Vafa Khalighi.
 \endpreamble
 \postamble
 
-Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 
 It may be distributed and/or modified under the LaTeX Project Public License,
 version 1.3c or higher (your choice). The latest version of
 this license is at: http://www.latex-project.org/lppl.txt
 
 This work is “author-maintained” (as per LPPL maintenance status) 
-by Vafa Khalighi.
+by VAFA KHALIGHI.
 
 
 
@@ -155,7 +155,7 @@ by Vafa Khalighi.
 \usepackage{bidicode}
 \usepackage[numbered]{hypdoc}
 \definecolor{myred}{rgb}{0.65,0.04,0.07}
-\hypersetup{pdftitle={The XePersian Package (Persian for \LaTeXe{} over XeTeX)},pdfauthor={Vafa Khalighi <vafaklg@gmail.com>}}
+\hypersetup{pdftitle={The XePersian Package (Persian for \LaTeXe{} over XeTeX)},pdfauthor={VAFA KHALIGHI <vafaklg@gmail.com>}}
 \usepackage{bidi}
 \setlength\columnseprule{.4pt}
 \newfontfamily\ParsiFont[Script=Arabic]{Iranian Sans}
@@ -205,9 +205,9 @@ by Vafa Khalighi.
 % \makeatletter
 % \title{The \textsf{\XePersian} Package\\[5pt]
 % Persian for \LaTeXe{} over \XeTeX}
-% \author{Vafa Khalighi\\
+% \author{VAFA KHALIGHI\\
 %   \url{vafaklg@gmail.com}}
-% \date{\today\qquad Version 1.1.8}
+% \date{\today\qquad Version 1.2.0}
 %\maketitle
 %\tableofcontents
 %\section{Introduction}
@@ -226,8 +226,8 @@ by Vafa Khalighi.
 %xepersian package (Persian for LaTeX over XeTeX)
 %Description: The package supports Persian
 %typesetting, using fonts provided in the distribution.
-%Copyright © 2008-2011 Vafa Khalighi
-%v1.1.8, 2011/09/16
+%Copyright © 2008-2011 VAFA KHALIGHI
+%v1.2.0, 2011/09/16
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/xetex/latex/xepersian
 %\end{lstlisting}
@@ -5322,7 +5322,6 @@ by Vafa Khalighi.
 %\fi
 % \subsection{\textsf{parsidigits.map}}
 %    \begin{macrocode}
-; Vafa Khalighi ...
 LHSName "Digits"
 RHSName "ParsiDigits"
 
@@ -5566,7 +5565,7 @@ U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
 % \subsection{\textsf{xepersian.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v1.1.8}
+\def\xepersianversion{v1.2.0}
 \def\xepersiandate{2011/09/16}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space 
 Persian typesetting in XeLaTeX]
@@ -5579,7 +5578,7 @@ Persian typesetting in XeLaTeX]
 xepersian package (Persian for LaTeX over XeTeX)^^J
 Description: The package supports Persian^^J
 typesetting, using fonts provided in the distribution.^^J
-Copyright © 2008–2011 Vafa Khalighi^^J
+Copyright © 2008–2011 VAFA KHALIGHI^^J
 \xepersianversion, \xepersiandate^^J
 License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J
 Location on CTAN: /macros/xetex/latex/xepersian}
@@ -5615,35 +5614,50 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \fi
 \newfontscript{Parsi}{arab}
 \newfontlanguage{Parsi}{FAR}
-\newcommand*\settextfont[2][]{%
-\newfontfamily\persianfont[Script=Parsi,Language=Parsi,Mapping=parsidigits,#1]{#2}
-\let\rmdefault\zf@family
+\ExplSyntaxOn
+\DeclareDocumentCommand \settextfont { O{} m } {
+  \fontspec_select:nn{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N \persianfont {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
+  \cs_set_eq:NN \rmdefault \l_fontspec_family_tl
   \normalfont
 }
-\settextfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique},Language=Default]{persian-modern-regular}
-\setdigitfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique},Language=Default]{persian-modern-regular}
-\newcommand*\setlatintextfont[2][]{%
-\newfontfamily\latinfont[Mapping=tex-text,#1]{#2}
+\settextfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique}]{persian-modern-regular}
+\setdigitfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique}]{persian-modern-regular}
+\DeclareDocumentCommand \setlatintextfont { O{} m } {
+  \fontspec_select:nn{Mapping=tex-text,#1}{#2}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N \latinfont {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
 }
 \setlatintextfont[ExternalLocation,BoldFont={lmroman10-bold},BoldItalicFont={lmroman10-bolditalic},ItalicFont={lmroman10-italic},SmallCapsFont={lmromancaps10-regular},SlantedFont={lmromanslant10-regular},BoldSlantedFont={lmromanslant10-bold}]{lmroman10-regular}
-\let\setlatinsansfont\setsansfont
-\let\setlatinmonofont\setmonofont
-\newcommand*\defpersianfont[1]{%
-  \@ifnextchar[{\defpersianfont@i#1}{\defpersianfont@i#1[]}}
-\def\defpersianfont@i#1[#2]#3{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#2}{#3}%
-  \edef\@tempa{%
-    \noexpand\DeclareRobustCommand\noexpand#1
-      {\noexpand\fontfamily{\zf@family}\noexpand\selectfont}}%
-  \@tempa}
-\newcommand*\deflatinfont[1]{%
-  \@ifnextchar[{\deflatinfont@i#1}{\deflatinfont@i#1[]}}
-\def\deflatinfont@i#1[#2]#3{%
-  \zf@fontspec{Mapping=tex-text,#2}{#3}%
-  \edef\@tempa{%
-    \noexpand\DeclareRobustCommand\noexpand#1
-      {\noexpand\fontfamily{\zf@family}\noexpand\selectfont}}%
-  \@tempa}
+\cs_set_eq:NN \setlatinsansfont \setsansfont
+\cs_set_eq:NN \setlatinmonofont \setmonofont
+\DeclareDocumentCommand \defpersianfont { m O{} m } {
+  \fontspec_select:nn{Script=Parsi,Language=Parsi,Mapping=parsidigits,#2}{#3}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
+}
+\DeclareDocumentCommand \deflatinfont { m O{} m } {
+  \fontspec_select:nn{Mapping=tex-text,#2}{#3}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
+}
 \newcommand\persiansfdefault{}
 \newcommand\persianttdefault{}
 \newcommand\iranicdefault{}
@@ -5674,33 +5688,34 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \DeclareTextFontCommand{\textnavar}{\navarfamily}
 \DeclareTextFontCommand{\textpook}{\pookfamily}
 \DeclareTextFontCommand{\textsayeh}{\sayehfamily}
-\newcommand*\setpersiansansfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\persiansfdefault\zf@family
-  \normalfont}
-\newcommand*\setpersianmonofont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\persianttdefault\zf@family
-  \normalfont}
-\newcommand*\setnavarfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\navardefault\zf@family
-  \normalfont}
-\newcommand*\setpookfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\pookdefault\zf@family
-  \normalfont}
-\setpookfont[ExternalLocation,ItalicFont={persian-modern-italicoutline},SlantedFont={persian-modern-obliqueoutline},BoldSlantedFont={persian-modern-obliqueoutline},Language=Default]{persian-modern-outline}
-\newcommand*\setsayehfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\sayehdefault\zf@family
-  \normalfont}
-\setsayehfont[ExternalLocation,ItalicFont={persian-modern-italicshadow},SlantedFont={persian-modern-obliqueshadow},BoldSlantedFont={persian-modern-obliqueshadow},Language=Default]{persian-modern-shadow}
-\newcommand*\setiranicfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\iranicdefault\zf@family
-  \normalfont}
-\setiranicfont[ExternalLocation,BoldFont={persian-modern-boldoblique},BoldItalicFont={persian-modern-bolditalic},Language=Default]{persian-modern-oblique}
+\DeclareDocumentCommand \setpersiansansfont { O{} m } {
+  \fontspec_set_family:Nnn \persiansfdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\DeclareDocumentCommand \setpersianmonofont { O{} m } {
+  \fontspec_set_family:Nnn \persianttdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\DeclareDocumentCommand \setnavarfont { O{} m } {
+  \fontspec_set_family:Nnn \navardefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\DeclareDocumentCommand \setpookfont { O{} m } {
+  \fontspec_set_family:Nnn \pookdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\setpookfont[ExternalLocation,ItalicFont={persian-modern-italicoutline},SlantedFont={persian-modern-obliqueoutline}]{persian-modern-outline}
+\DeclareDocumentCommand \setsayehfont { O{} m } {
+  \fontspec_set_family:Nnn \sayehdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\setsayehfont[ExternalLocation,ItalicFont={persian-modern-italicshadow},SlantedFont={persian-modern-obliqueshadow}]{persian-modern-shadow}
+\DeclareDocumentCommand \setiranicfont { O{} m } {
+  \fontspec_set_family:Nnn \iranicdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\ExplSyntaxOff
+\setiranicfont[ExternalLocation,BoldFont={persian-modern-boldoblique}]{persian-modern-oblique}
 \def\resetlatinfont{%
 \let\normalfont\latinfont%
 \latinfont}
@@ -6898,17 +6913,14 @@ indexblock environment may only appear inside frontpage environment.
    #1
  }
 }
-\ExplSyntaxOff
 \newcommand\setdigitfont[2][]{%
   \let\glb@currsize\relax
-  \setkeys*[xepersian-mathsdigitspec]{options}{#1}%
-  \edef\@tempa{\noexpand\zf@fontspec{Mapping=parsidigits,%
-    \XKV@rm}{#2}}\@tempa
+  \fontspec_set_family:Nnn \xepersian@digits@family {Mapping=parsidigits,#1}{#2}
   \xepersian@PackageInfo{Defining the default Persian maths digits font as '#2'}
-  \DeclareSymbolFont{OPERATORS}   {EU1}{\zf@family} {m}{n}
-  \DeclareSymbolFont{new@mathbf@font@digits}{EU1}{\zf@family}{bx}{n}
-  \DeclareSymbolFont{new@mathit@font@digits}{EU1}{\zf@family}{m}{it}
-  \DeclareSymbolFont{new@mathrm@font@digits}{EU1}{\zf@family}{m}{n}
+  \DeclareSymbolFont{OPERATORS}   {EU1}{\xepersian@digits@family} {m}{n}
+  \DeclareSymbolFont{new@mathbf@font@digits}{EU1}{\xepersian@digits@family}{bx}{n}
+  \DeclareSymbolFont{new@mathit@font@digits}{EU1}{\xepersian@digits@family}{m}{it}
+  \DeclareSymbolFont{new@mathrm@font@digits}{EU1}{\xepersian@digits@family}{m}{n}
   \def\persianmathsdigits{%
   \SetMathCode{`0}{\mathalpha}{OPERATORS}{`0}
   \SetMathCode{`1}{\mathalpha}{OPERATORS}{`1}
@@ -6922,20 +6934,21 @@ indexblock environment may only appear inside frontpage environment.
   \SetMathCode{`9}{\mathalpha}{OPERATORS}{`9}
   \SetMathCode{`\%}{\mathbin}{OPERATORS}{`٪}
   \SetMathCharDef{\decimalseparator}{\mathpunct}{OPERATORS}{"066B}
-  \let\mathbf\new@mathbf
-  \let\mathit\new@mathit
-  \let\mathrm\new@mathrm}
+  \cs_set_eq:NN \mathbf \new@mathbf
+  \cs_set_eq:NN \mathit \new@mathit
+  \cs_set_eq:NN \mathrm \new@mathrm}
+}
+\DeclareDocumentCommand \setmathsfdigitfont { O{} m } {
+  \fontspec_set_family:Nnn \g_fontspec_mathsf_tl {Mapping=parsidigits,#1}{#2}
+  \DeclareSymbolFont{new@mathsf@font@digits}{EU1}{\g_fontspec_mathsf_tl}{m}{n}
+  \def\persianmathsfdigits{\cs_set_eq:NN \mathsf \new@mathsf}
 }
-\newcommand*\setmathsfdigitfont[2][]{%
-\zf@fontspec{Mapping=parsidigits,#1}{#2}%
-\let\zf@sfmaths\zf@family
-\DeclareSymbolFont{new@mathsf@font@digits}{EU1}{\zf@family}{m}{n}
-\def\persianmathsfdigits{\let\mathsf\new@mathsf}}
-\newcommand*\setmathttdigitfont[2][]{%
-\zf@fontspec{Mapping=parsidigits,#1}{#2}%
-\let\zf@ttmaths\zf@family
-\DeclareSymbolFont{new@mathtt@font@digits}{EU1}{\zf@family}{m}{n}
-\def\persianmathttdigits{\let\mathtt\new@mathtt}}
+\DeclareDocumentCommand \setmathttdigitfont { O{} m } {
+  \fontspec_set_family:Nnn \g_fontspec_mathtt_tl {Mapping=parsidigits,#1}{#2}
+  \DeclareSymbolFont{new@mathtt@font@digits}{EU1}{\g_fontspec_mathtt_tl}{m}{n}
+  \def\persianmathttdigits{\cs_set_eq:NN \mathtt \new@mathtt}
+}
+\ExplSyntaxOff
 \ifx\newcommand\undefined\else
   \newcommand{\ZifferAn}{}
 \fi
diff --git a/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins b/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
index 33408685dd9..846c5b1a205 100644
--- a/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
+++ b/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `batchfile')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -18,21 +18,21 @@
 \preamble
 
   ______________________________________
-  Copyright © 2008–2011  Vafa Khalighi
+  Copyright © 2008–2011  VAFA KHALIGHI
 
   License information appended.
 
 \endpreamble
 \postamble
 
-Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 
 It may be distributed and/or modified under the LaTeX Project Public License,
 version 1.3c or higher (your choice). The latest version of
 this license is at: http://www.latex-project.org/lppl.txt
 
 This work is “author-maintained” (as per LPPL maintenance status)
-by Vafa Khalighi.
+by VAFA KHALIGHI.
 
 \endpostamble
 \askforoverwritefalse
@@ -97,14 +97,14 @@ by Vafa Khalighi.
 \generate{\file{xepersian-persiancal.sty}{\from{\jobname.dtx}{xepersian-persiancal.sty}}}
 \endbatchfile
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
index af43aad4d84..74e419b5280 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `algorithm-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -17,14 +17,14 @@
 \def\ALGS@name{الگوریتم‌ها}
 \def\listalgorithmname{\if@RTL لیست \ALGS@name\else List of \ALG@name s\fi}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
index 3f6657f162b..d19bce32046 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `algorithmic-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -16,14 +16,14 @@
 \def\algorithmicrequire{\if@RTL\textbf{ورودی:}\else\textbf{Require:}\fi}
 \def\algorithmicensure{\if@RTL\textbf{خروجی:}\else\textbf{Ensure:}\fi}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def
index 6412a702feb..97b2853792c 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 @@
 %% xepersian.dtx  (with options: `amsart-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -60,14 +60,14 @@
     \insert\footins{\unvbox\footins}%
     \endgroup}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def
index 72a2b017e55..0de8c5f3243 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 @@
 %% xepersian.dtx  (with options: `amsbook-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -62,14 +62,14 @@
     \insert\footins{\unvbox\footins}%
     \endgroup}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
index 0263c56ca6a..ebb425a23bd 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `article-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -19,14 +19,14 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
index 9df95e30475..29cc11e64dc 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `artikel1-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -19,14 +19,14 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
index faa5af73f5f..112cb1456ea 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `artikel2-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -19,14 +19,14 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
index c2ef99a0911..df0cd5267a0 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `artikel3-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -19,14 +19,14 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
index 43f16fd03aa..deb232beafd 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `backref-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -33,14 +33,14 @@
   }%
 }%
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
index c4b0feebc21..5f5063ecfb1 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def
@@ -7,21 +7,21 @@
 %% xepersian.dtx  (with options: `bidicode-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
 %% 
 \ProvidesFile{bidicode-xepersian.def}[2010/07/25 v0.0 Persian captions for bidicode package]
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
index 34884b67567..da764355345 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `bidimoderncv-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -15,14 +15,14 @@
 \ProvidesFile{bidimoderncv-xepersian.def}[2010/07/25 v0.1 adaptations for bidimoderncv class]
 \def\refname{\if@RTL تألیفات\else Publications\fi}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def
index c43ae671977..3be80de0ccf 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `bidituftesidenote-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -82,14 +82,14 @@
   \let\cite\@bidituftesidenote@normal@cite%       go back to using normal in-text \cite command
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
index cf41650d4d8..09f08a3e061 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `boek-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -24,14 +24,14 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
index 697203791c4..07f516a6b12 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `boek3-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -24,14 +24,14 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
index 8ab5f90d23d..bdc00f7c0f7 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `book-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -25,14 +25,14 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
index 1293b3a0027..3bce1e817af 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `bookest-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -21,14 +21,14 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
index 5237f8c445e..23fed6c40c2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `breqn-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -53,14 +53,14 @@
 \ignorespaces
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def b/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def
index cef334049ce..680c02d64ea 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `color-localise.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -22,14 +22,14 @@
 \تعریف‌رنگ{بنفش}{cmyk}{0,1,0,0}
 \تعریف‌رنگ{زرد}{cmyk}{0,0,1,0}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
index df6693d2abc..1c6bf481709 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `commands-ltx.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -957,14 +957,14 @@
 \eqcommand{@فر}{z@}
 \eqcommand{@فرفاصله}{z@skip}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
index d88dd703ffb..7e616332d91 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `commands-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -69,14 +69,14 @@
 \eqcommand{تاریخ‌گونه‌زی‌پرشین}{xepersiandate}
 \eqcommand{زی‌تک}{XeTeX}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def
index 21436eaf1ee..16af4fddfd8 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `empheq-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -16,14 +16,14 @@
 \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–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
index c073bbb311f..f1b463dc2f8 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `enumerate-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -30,14 +30,14 @@
              \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \@tempa}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
index 1fb16ced081..596aaf53aab 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `environments-ltx.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -59,14 +59,14 @@
 \eqenvironment{همانطورکه‌هست*}{verbatim*}
 \eqenvironment{شعر}{verse}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
index 4cf2ff06225..bc7baf090ef 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `environments-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -24,14 +24,14 @@
 \eqenvironment{شعرسنتی}{traditionalpoem}
 \eqenvironment{شعرسنتی*}{traditionalpoem*}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
index e48c01eeccc..ba477b21d66 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `extarticle-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -19,14 +19,14 @@
   \setcounter{subsection}{0}%
   \gdef\thesection{\@harfi\c@section}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
index 4b0b3b5b258..f9cd7875f70 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `extbook-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -25,14 +25,14 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def
index fbb91c558a1..faf36f6c746 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `extrafootnotefeatures-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -689,14 +689,14 @@
       \color@endgroup}%
   \m@mungebox}\m@mmf@prepare}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
index 95123e4336c..88fd70cf20e 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `extreport-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -20,14 +20,14 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
index db24bdad8a0..344fdc9710b 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `flowfram-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -42,14 +42,14 @@
   \setcounter{displayedframe}{0}%
   \let\firstmark\botmark}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
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 b54e1486361..d43e3a27a85 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `footnote-bidi-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -98,14 +98,14 @@
         \rule\z@\footnotesep\ignorespaces\latinfont#1\@finalstrut\strutbox}%
     \color@endgroup}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
index 0d3d7602c0a..706ba1bf6c1 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `hyperref-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -40,14 +40,14 @@
 }
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
index e07b392374c..9413edfd870 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `kashida-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -57,14 +57,14 @@
 \newcommand{\KashidaOff}{\XeTeXinterchartokenstate=0}
 \KashidaOn
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
index 317d025f053..ce8e03dc0f4 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `listings-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -16,14 +16,14 @@
 \def\lstlistingname{\if@RT برنامهٔ\else Listing\fi}
 \def\lstlistlistingname{\if@RTL فهرست برنامه‌ها\else Listings\fi}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
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 d066e2519df..89268a30106 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `loadingorder-bidi-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -36,14 +36,14 @@
   \fi%
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
index 9a564329169..c39c380e784 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `localise-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -27,14 +27,14 @@
 \input{misc-localise-xepersian.def}
 \input{packages-localise-xepersian.def}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
index b6727ae1cec..a3e38290444 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `memoir-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -25,14 +25,14 @@
   \gdef\thechapter{\@harfi\c@chapter}%
   \anappendixtrue}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def b/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def
index e9d591ee85d..5b7c2ae2dbf 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def
@@ -7,21 +7,21 @@
 %% xepersian.dtx  (with options: `messages-localise.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
 %% 
 \آماده‌سازی‌پرونده{messages-localise.def}[2011/03/01 v0.1 localising LaTeX2e messages]
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
index 776741283a6..d9d2b63da09 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `minitoc-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -23,14 +23,14 @@
 \def\slftitle{\if@RTL اشکال\else Figures\fi}%
 \def\slttitle{\if@RTL جداول\else Tables\fi}%
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
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 e44c6a7f7f2..91d50d93f94 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `misc-localise-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -335,14 +335,14 @@
   \ignorespaces}
 }{}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def
index ba11af9faf5..991b22dc5bf 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `multicol-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -98,14 +98,14 @@
         \rule\z@\footnotesep\ignorespaces\latinfont#1\@finalstrut\strutbox}%
     \color@endgroup}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def
index a15bdf77019..1897157e6a7 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `natbib-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -228,14 +228,14 @@
 \newcommand\NAT@@Latin@@citetp{}
 \def\NAT@@Latin@@citetp[#1]{\@ifnextchar[{\@Latincitex[#1]}{\@Latincitex[][#1]}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
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 067998303c7..e112d044e26 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `packages-localise-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -15,14 +15,14 @@
 \آماده‌سازی‌پرونده{packages-localise-xepersian.def}[2011/03/01 v0.1 localising LaTeX2e Packages]
 \@گرسبک‌فراخوانی‌شده{color}{\ورودی{color-localise.def}}{}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
index ac9e3214bcc..0a37fb0bec6 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `rapport1-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -20,14 +20,14 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
index 3b68ba8acb9..245b2732e76 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `rapport3-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -20,14 +20,14 @@
   \gdef\@chapapp{\appendixname}%
   \gdef\thechapter{\@harfi\c@chapter}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
index 461bd8df20a..27c6d309e8f 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `refrep-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -21,14 +21,14 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
index 2da38729b39..68434dd624c 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `report-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -21,14 +21,14 @@
   \gdef\thechapter{\@harfi\c@chapter}
 }%end appendix
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
index 0cf70660a60..39973cbb977 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `scrartcl-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -42,14 +42,14 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
index 42aaf279bcc..c259389f09e 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `scrbook-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -47,14 +47,14 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
index 99ba9f1363d..9bd0fd17cc7 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `scrreprt-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -43,14 +43,14 @@
   \@@maybeautodot
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
index d83ad65af6f..01d732d8ba2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `tocloft-xepersian.def')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -24,14 +24,14 @@
 \renewcommand*{\cfttabname}{\if@RTL جدول\else table\fi}
 \renewcommand*{\cftsubtabname}{\if@RTL زیرجدول\else subtable\fi}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
index e1ccd46e783..0f3469989f2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `xepersian-magazine.cls')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -882,14 +882,14 @@ indexblock environment may only appear inside frontpage environment.
 {\noindent #2}\\
 }
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
index 3dedc20a1be..fea20f474b0 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `xepersian-mathsdigitspec.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -83,17 +83,14 @@
    #1
  }
 }
-\ExplSyntaxOff
 \newcommand\setdigitfont[2][]{%
   \let\glb@currsize\relax
-  \setkeys*[xepersian-mathsdigitspec]{options}{#1}%
-  \edef\@tempa{\noexpand\zf@fontspec{Mapping=parsidigits,%
-    \XKV@rm}{#2}}\@tempa
+  \fontspec_set_family:Nnn \xepersian@digits@family {Mapping=parsidigits,#1}{#2}
   \xepersian@PackageInfo{Defining the default Persian maths digits font as '#2'}
-  \DeclareSymbolFont{OPERATORS}   {EU1}{\zf@family} {m}{n}
-  \DeclareSymbolFont{new@mathbf@font@digits}{EU1}{\zf@family}{bx}{n}
-  \DeclareSymbolFont{new@mathit@font@digits}{EU1}{\zf@family}{m}{it}
-  \DeclareSymbolFont{new@mathrm@font@digits}{EU1}{\zf@family}{m}{n}
+  \DeclareSymbolFont{OPERATORS}   {EU1}{\xepersian@digits@family} {m}{n}
+  \DeclareSymbolFont{new@mathbf@font@digits}{EU1}{\xepersian@digits@family}{bx}{n}
+  \DeclareSymbolFont{new@mathit@font@digits}{EU1}{\xepersian@digits@family}{m}{it}
+  \DeclareSymbolFont{new@mathrm@font@digits}{EU1}{\xepersian@digits@family}{m}{n}
   \def\persianmathsdigits{%
   \SetMathCode{`0}{\mathalpha}{OPERATORS}{`0}
   \SetMathCode{`1}{\mathalpha}{OPERATORS}{`1}
@@ -107,20 +104,21 @@
   \SetMathCode{`9}{\mathalpha}{OPERATORS}{`9}
   \SetMathCode{`\%}{\mathbin}{OPERATORS}{`٪}
   \SetMathCharDef{\decimalseparator}{\mathpunct}{OPERATORS}{"066B}
-  \let\mathbf\new@mathbf
-  \let\mathit\new@mathit
-  \let\mathrm\new@mathrm}
+  \cs_set_eq:NN \mathbf \new@mathbf
+  \cs_set_eq:NN \mathit \new@mathit
+  \cs_set_eq:NN \mathrm \new@mathrm}
+}
+\DeclareDocumentCommand \setmathsfdigitfont { O{} m } {
+  \fontspec_set_family:Nnn \g_fontspec_mathsf_tl {Mapping=parsidigits,#1}{#2}
+  \DeclareSymbolFont{new@mathsf@font@digits}{EU1}{\g_fontspec_mathsf_tl}{m}{n}
+  \def\persianmathsfdigits{\cs_set_eq:NN \mathsf \new@mathsf}
 }
-\newcommand*\setmathsfdigitfont[2][]{%
-\zf@fontspec{Mapping=parsidigits,#1}{#2}%
-\let\zf@sfmaths\zf@family
-\DeclareSymbolFont{new@mathsf@font@digits}{EU1}{\zf@family}{m}{n}
-\def\persianmathsfdigits{\let\mathsf\new@mathsf}}
-\newcommand*\setmathttdigitfont[2][]{%
-\zf@fontspec{Mapping=parsidigits,#1}{#2}%
-\let\zf@ttmaths\zf@family
-\DeclareSymbolFont{new@mathtt@font@digits}{EU1}{\zf@family}{m}{n}
-\def\persianmathttdigits{\let\mathtt\new@mathtt}}
+\DeclareDocumentCommand \setmathttdigitfont { O{} m } {
+  \fontspec_set_family:Nnn \g_fontspec_mathtt_tl {Mapping=parsidigits,#1}{#2}
+  \DeclareSymbolFont{new@mathtt@font@digits}{EU1}{\g_fontspec_mathtt_tl}{m}{n}
+  \def\persianmathttdigits{\cs_set_eq:NN \mathtt \new@mathtt}
+}
+\ExplSyntaxOff
 \ifx\newcommand\undefined\else
   \newcommand{\ZifferAn}{}
 \fi
@@ -165,14 +163,14 @@
 \everymath\expandafter{\the\everymath\SetMathsDigits}
 \g@addto@macro\document{\everydisplay\expandafter{\the\everydisplay\SetMathsDigits}}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
index f47155565af..061131a2905 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `xepersian-multiplechoice.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -150,14 +150,14 @@
  \questiontitle{سؤال \thequestion:}
 \ProcessOptions
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
index 53dddab51d0..8cf5cc087e2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty
@@ -7,7 +7,7 @@
 %% xepersian.dtx  (with options: `xepersian-persiancal.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
@@ -181,14 +181,14 @@
 دی\or بهمن\or
 اسفند\fi}
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
index 278294d36dc..bcff2e7d19f 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
@@ -7,13 +7,13 @@
 %% xepersian.dtx  (with options: `xepersian.sty')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2011  Vafa Khalighi
+%%   Copyright © 2008–2011  VAFA KHALIGHI
 %% 
 %%   License information appended.
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v1.1.8}
+\def\xepersianversion{v1.2.0}
 \def\xepersiandate{2011/09/16}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space
 Persian typesetting in XeLaTeX]
@@ -26,7 +26,7 @@ Persian typesetting in XeLaTeX]
 xepersian package (Persian for LaTeX over XeTeX)^^J
 Description: The package supports Persian^^J
 typesetting, using fonts provided in the distribution.^^J
-Copyright © 2008–2011 Vafa Khalighi^^J
+Copyright © 2008–2011 VAFA KHALIGHI^^J
 \xepersianversion, \xepersiandate^^J
 License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J
 Location on CTAN: /macros/xetex/latex/xepersian}
@@ -62,35 +62,50 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \fi
 \newfontscript{Parsi}{arab}
 \newfontlanguage{Parsi}{FAR}
-\newcommand*\settextfont[2][]{%
-\newfontfamily\persianfont[Script=Parsi,Language=Parsi,Mapping=parsidigits,#1]{#2}
-\let\rmdefault\zf@family
+\ExplSyntaxOn
+\DeclareDocumentCommand \settextfont { O{} m } {
+  \fontspec_select:nn{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N \persianfont {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
+  \cs_set_eq:NN \rmdefault \l_fontspec_family_tl
   \normalfont
 }
-\settextfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique},Language=Default]{persian-modern-regular}
-\setdigitfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique},Language=Default]{persian-modern-regular}
-\newcommand*\setlatintextfont[2][]{%
-\newfontfamily\latinfont[Mapping=tex-text,#1]{#2}
+\settextfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique}]{persian-modern-regular}
+\setdigitfont[ExternalLocation,BoldFont={persian-modern-bold},BoldItalicFont={persian-modern-bolditalic},ItalicFont={persian-modern-italic},SlantedFont={persian-modern-oblique},BoldSlantedFont={persian-modern-boldoblique}]{persian-modern-regular}
+\DeclareDocumentCommand \setlatintextfont { O{} m } {
+  \fontspec_select:nn{Mapping=tex-text,#1}{#2}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N \latinfont {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
 }
 \setlatintextfont[ExternalLocation,BoldFont={lmroman10-bold},BoldItalicFont={lmroman10-bolditalic},ItalicFont={lmroman10-italic},SmallCapsFont={lmromancaps10-regular},SlantedFont={lmromanslant10-regular},BoldSlantedFont={lmromanslant10-bold}]{lmroman10-regular}
-\let\setlatinsansfont\setsansfont
-\let\setlatinmonofont\setmonofont
-\newcommand*\defpersianfont[1]{%
-  \@ifnextchar[{\defpersianfont@i#1}{\defpersianfont@i#1[]}}
-\def\defpersianfont@i#1[#2]#3{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#2}{#3}%
-  \edef\@tempa{%
-    \noexpand\DeclareRobustCommand\noexpand#1
-      {\noexpand\fontfamily{\zf@family}\noexpand\selectfont}}%
-  \@tempa}
-\newcommand*\deflatinfont[1]{%
-  \@ifnextchar[{\deflatinfont@i#1}{\deflatinfont@i#1[]}}
-\def\deflatinfont@i#1[#2]#3{%
-  \zf@fontspec{Mapping=tex-text,#2}{#3}%
-  \edef\@tempa{%
-    \noexpand\DeclareRobustCommand\noexpand#1
-      {\noexpand\fontfamily{\zf@family}\noexpand\selectfont}}%
-  \@tempa}
+\cs_set_eq:NN \setlatinsansfont \setsansfont
+\cs_set_eq:NN \setlatinmonofont \setmonofont
+\DeclareDocumentCommand \defpersianfont { m O{} m } {
+  \fontspec_select:nn{Script=Parsi,Language=Parsi,Mapping=parsidigits,#2}{#3}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
+}
+\DeclareDocumentCommand \deflatinfont { m O{} m } {
+  \fontspec_select:nn{Mapping=tex-text,#2}{#3}
+  \use:x {
+    \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
+      \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
+      \exp_not:N \fontfamily {\l_fontspec_family_tl} \exp_not:N \selectfont
+    }
+  }
+}
 \newcommand\persiansfdefault{}
 \newcommand\persianttdefault{}
 \newcommand\iranicdefault{}
@@ -121,33 +136,34 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \DeclareTextFontCommand{\textnavar}{\navarfamily}
 \DeclareTextFontCommand{\textpook}{\pookfamily}
 \DeclareTextFontCommand{\textsayeh}{\sayehfamily}
-\newcommand*\setpersiansansfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\persiansfdefault\zf@family
-  \normalfont}
-\newcommand*\setpersianmonofont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\persianttdefault\zf@family
-  \normalfont}
-\newcommand*\setnavarfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\navardefault\zf@family
-  \normalfont}
-\newcommand*\setpookfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\pookdefault\zf@family
-  \normalfont}
-\setpookfont[ExternalLocation,ItalicFont={persian-modern-italicoutline},SlantedFont={persian-modern-obliqueoutline},BoldSlantedFont={persian-modern-obliqueoutline},Language=Default]{persian-modern-outline}
-\newcommand*\setsayehfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\sayehdefault\zf@family
-  \normalfont}
-\setsayehfont[ExternalLocation,ItalicFont={persian-modern-italicshadow},SlantedFont={persian-modern-obliqueshadow},BoldSlantedFont={persian-modern-obliqueshadow},Language=Default]{persian-modern-shadow}
-\newcommand*\setiranicfont[2][]{%
-  \zf@fontspec{Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}%
-  \let\iranicdefault\zf@family
-  \normalfont}
-\setiranicfont[ExternalLocation,BoldFont={persian-modern-boldoblique},BoldItalicFont={persian-modern-bolditalic},Language=Default]{persian-modern-oblique}
+\DeclareDocumentCommand \setpersiansansfont { O{} m } {
+  \fontspec_set_family:Nnn \persiansfdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\DeclareDocumentCommand \setpersianmonofont { O{} m } {
+  \fontspec_set_family:Nnn \persianttdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\DeclareDocumentCommand \setnavarfont { O{} m } {
+  \fontspec_set_family:Nnn \navardefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\DeclareDocumentCommand \setpookfont { O{} m } {
+  \fontspec_set_family:Nnn \pookdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\setpookfont[ExternalLocation,ItalicFont={persian-modern-italicoutline},SlantedFont={persian-modern-obliqueoutline}]{persian-modern-outline}
+\DeclareDocumentCommand \setsayehfont { O{} m } {
+  \fontspec_set_family:Nnn \sayehdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\setsayehfont[ExternalLocation,ItalicFont={persian-modern-italicshadow},SlantedFont={persian-modern-obliqueshadow}]{persian-modern-shadow}
+\DeclareDocumentCommand \setiranicfont { O{} m } {
+  \fontspec_set_family:Nnn \iranicdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
+  \normalfont
+}
+\ExplSyntaxOff
+\setiranicfont[ExternalLocation,BoldFont={persian-modern-boldoblique}]{persian-modern-oblique}
 \def\resetlatinfont{%
 \let\normalfont\latinfont%
 \latinfont}
@@ -391,14 +407,14 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \ExecuteOptions{localise}
 \ProcessOptions
 %% 
-%% Copyright © 2008–2011  Vafa Khalighi <vafaklg@gmail.com>
+%% Copyright © 2008–2011  VAFA KHALIGHI <vafaklg@gmail.com>
 %% 
 %% It may be distributed and/or modified under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Vafa Khalighi.
+%% by VAFA KHALIGHI.
 %% 
 %% 
 %%