5 files changed, 37 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xepersian/README b/Master/texmf-dist/doc/xelatex/xepersian/README
index 07fde2ac024..5ce93e72377 100644
--- a/Master/texmf-dist/doc/xelatex/xepersian/README
+++ b/Master/texmf-dist/doc/xelatex/xepersian/README
@@ -1,6 +1,6 @@
 ____________________
 The XePersian package
-v13.5
+v13.6
 
 XePersian is a package written for XeLaTeX that allows users to typeset
 Persian easily.
@@ -13,14 +13,14 @@ the Change History section at the end of the documentation.
 
 If you want to report any bugs or typos and corrections in the documentation,
 or ask for any new features, or suggest any improvements, or ask any questions
-about the package, then please do not send any direct emails to me; I will not
-answer any direct emails. Instead please use the issue tracker:
+about the package, then please do not send any direct email to me; I will not
+answer any direct email. Instead please use the issue tracker:
   <https://github.com/vafa/xepersian/issues>
 In doing so, please always explain your issue well enough, always include
-a minimal working examples showing the issue, and always choose the appropriate
-label for your query (i.e. if you are reporting any bugs, choose `Bug' label).
+a minimal working example showing the issue, and always choose the appropriate
+label for your query (i.e. if you are reporting any bugs, choose `bug' label).
 
-Current version release date: 2013/10/21
+Current version release date: 2013/11/15
 ______________
 Vafa Khalighi
 persian-tex@tug.org
diff --git a/Master/texmf-dist/doc/xelatex/xepersian/xepersian.pdf b/Master/texmf-dist/doc/xelatex/xepersian/xepersian.pdf
index bd63f000873..b92a0795f7f 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/source/xelatex/xepersian/xepersian.dtx b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
index 114f788dce3..83474d12c34 100644
--- a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
+++ b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
@@ -5,7 +5,7 @@
 %<*readme>
 ____________________
 The XePersian package
-v13.5
+v13.6
 
 XePersian is a package written for XeLaTeX that allows users to typeset
 Persian easily. 
@@ -20,14 +20,14 @@ the Change History section at the end of the documentation.
 
 If you want to report any bugs or typos and corrections in the documentation,
 or ask for any new features, or suggest any improvements, or ask any questions
-about the package, then please do not send any direct emails to me; I will not 
-answer any direct emails. Instead please use the issue tracker:
+about the package, then please do not send any direct email to me; I will not 
+answer any direct email. Instead please use the issue tracker:
   <https://github.com/vafa/xepersian/issues>
 In doing so, please always explain your issue well enough, always include
-a minimal working examples showing the issue, and always choose the appropriate
-label for your query (i.e. if you are reporting any bugs, choose `Bug' label). 
+a minimal working example showing the issue, and always choose the appropriate
+label for your query (i.e. if you are reporting any bugs, choose `bug' label). 
 
-Current version release date: 2013/10/21
+Current version release date: 2013/11/15
 ______________
 Vafa Khalighi
 persian-tex@tug.org
@@ -152,7 +152,6 @@ by Vafa Khalighi.
 \documentclass{ltxdoc}
 \usepackage{supertabular}
 \usepackage{fontspec}
-\setmainfont[Mapping=tex-text,Numbers=OldStyle]{Iwona}
 \usepackage{calc}
 \usepackage{pifont}
 \usepackage{bbding}
@@ -160,7 +159,7 @@ by Vafa Khalighi.
 \definecolor{xepersianblue}{rgb}{0.1,0.2,0.8}
 \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 <persian-tex@tug.org>},linkcolor=xepersianblue,urlcolor=xepersianblue,citecolor=xepersianblue}
+\hypersetup{pdftitle={The XePersian Package (Persian for \LaTeX, using XeTeX engine)},pdfauthor={Vafa Khalighi <persian-tex@tug.org>},linkcolor=xepersianblue,urlcolor=xepersianblue,citecolor=xepersianblue}
 \usepackage{bidi}
 \setlength\columnseprule{.4pt}
 \newfontfamily\ParsiFont[Script=Arabic]{Iranian Sans}
@@ -211,25 +210,26 @@ by Vafa Khalighi.
 %\changes{v13.1}{2013/09/23}{Added implementation of the package.}
 % \title{The \textsf{\XePersian} Package\\[10pt]
 % \includegraphics[width=0.5\textwidth]{xepersian-logo}\\[10pt]
-% Persian for \LaTeXe{} over \XeTeX}
+% Persian for \LaTeX, using {\XeTeX} engine}
 % \author{Vafa Khalighi\\
 %   \url{persian-tex@tug.org}}
-% \date{\today\qquad Version 13.5}
+% \date{\today\qquad Version 13.6}
 %\maketitle
 %\vskip 0pt plus 3fill
 %\fbox{%
 %\begin{minipage}{\dimexpr(\textwidth-2\fboxsep-2\fboxrule)}
 %If you want to report any bugs or typos and corrections in the documentation,
 %or ask for any new features, or suggest any improvements, or ask any questions
-%about the package, then please do not send any direct emails to me; I will not 
-%answer any direct emails. Instead please use the issue tracker:
+%about the package, then please do not send any direct email to me; I will not 
+%answer any direct email. Instead please use the issue tracker:
 %
 %\medskip
 %  \centerline{\url{https://github.com/vafa/xepersian/issues}}
 %  
+%\medskip
 %In doing so, please always explain your issue well enough, always include
-%a minimal working examples showing the issue, and always choose the appropriate
-%label for your query (i.e. if you are reporting any bugs, choose `Bug' label). 
+%a minimal working example showing the issue, and always choose the appropriate
+%label for your query (i.e. if you are reporting any bugs, choose `bug' label). 
 %\end{minipage}
 %}
 %\clearpage
@@ -249,7 +249,7 @@ by Vafa Khalighi.
 %\begin{verbatim}
 %****************************************************
 %* 
-%* xepersian package (Persian for LaTeX over XeTeX)
+%* xepersian package (Persian for LaTeX, using XeTeX engine)
 %* 
 %* Description: The package supports Persian
 %* typesetting, using fonts provided in the
@@ -257,7 +257,7 @@ by Vafa Khalighi.
 %* 
 %* Copyright © 2008–2013 Vafa Khalighi
 %* 
-%* v13.5, 2013/10/21
+%* v13.6, 2013/11/15
 %* 
 %* License: LaTeX Project Public License, version
 %* 1.3c or higher (your choice)
@@ -335,7 +335,6 @@ by Vafa Khalighi.
 %This is just the \texttt{extrafootnotefeatures} Option of \textsf{bidi} package. If you enable this option, you can typeset footnotes in paragraph form or in multi-columns (from two-columns to ten-columns). For more details, please read the manual of \textsf{bidi} package.
 %\subsubsection{\texttt{Kashida} Option}
 %If you pass \texttt{Kashida} option to the package, you will use Kashida for stretching words for better output quality and getting rid of underfull or overfull \Lcs{hbox} messages.
-%\marginpar{This is the font issue not \XePersian's bug}Please note that unfortunately X series fonts of IRMUG (Iranian Mac Users Group) do not have Kashida support and if you use any of these fonts with \texttt{Kashida} option enabled, the result on the PDF viewed on the monitor is not pleasant, however the print may look fine. Hence if you are going to enable \texttt{Kashida} option , then you are advised to use either ``Adobe Arabic'' or ``Scheherazade'' fonts or any other fonts that has fine Kashida support, like \textsf{Persian Modern} font (the default font of \XePersian{} package).
 % 
 %Note that you can not use \texttt{Kashida} option when you are using Nastaliq-like font (well, you still can use \texttt{Kashida} option when you use any Nastaliq-like font, but I can not guarantee high quality output!).
 %
@@ -4366,18 +4365,19 @@ by Vafa Khalighi.
 %\fi
 % \subsection{\textsf{kashida-xepersian.def}}
 %    \begin{macrocode}
-\ProvidesFile{kashida-xepersian.def}[2010/07/25 v0.2 implementation of Kashida for xepersian package]
+\ProvidesFile{kashida-xepersian.def}[2013/11/15 v0.3 implementation of Kashida for xepersian package]
 \chardef\xepersian@zwj="200D % zero-width joiner
-\chardef\xepersian@ksh="0640 % kashida
 
 \chardef\xepersian@D=10 % dual-joiner class
 \chardef\xepersian@L=11 % lam
 \chardef\xepersian@R=12 % right-joiner
 \chardef\xepersian@A=13 % alef
 \chardef\xepersian@V=256 % vowel or other combining mark (to be ignored)
-
-\def\xepersian@kashida{\xepersian@zwj\nobreak \setbox0=\hbox{\xepersian@ksh}%
-    \leaders\hrule height\ht0 \hskip0pt plus 0.5em \xepersian@zwj}
+%    \end{macrocode}
+%\changes{v13.6}{2013/11/15}{Used \cs{XeTeXglyphbounds} to find the true height and depth of the Kashida character.}
+%    \begin{macrocode}
+\def\xepersian@kashida{\xepersian@zwj\nobreak%
+    \leaders\hrule height \XeTeXglyphbounds2 \the\XeTeXcharglyph"0640  depth \XeTeXglyphbounds4 \the\XeTeXcharglyph"0640 \hskip0pt plus 0.5em \xepersian@zwj}
 
 \def\setclass#1#2{\def\theclass{#1}\def\charlist{#2}%
   \expandafter\dosetclass\charlist,\end}
@@ -5609,8 +5609,8 @@ U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
 % \subsection{\textsf{xepersian.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v13.5}
-\def\xepersiandate{2013/10/21}
+\def\xepersianversion{v13.6}
+\def\xepersiandate{2013/11/15}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space 
 Persian typesetting in XeLaTeX]
 \RequirePackage{fontspec}
@@ -5619,7 +5619,7 @@ Persian typesetting in XeLaTeX]
 \RequirePackage[RTLdocument]{bidi}
 \edef\@xepersian@info{****************************************************^^J%
 * ^^J%
-* xepersian package (Persian for LaTeX over XeTeX)^^J%
+* xepersian package (Persian for LaTeX, using XeTeX engine)^^J%
 * ^^J%
 * Description: The package supports Persian^^J%
 * typesetting, using fonts provided in the^^J%
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
index 04e20851770..764d6444e1d 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def
@@ -34,18 +34,16 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
-\ProvidesFile{kashida-xepersian.def}[2010/07/25 v0.2 implementation of Kashida for xepersian package]
+\ProvidesFile{kashida-xepersian.def}[2013/11/15 v0.3 implementation of Kashida for xepersian package]
 \chardef\xepersian@zwj="200D % zero-width joiner
-\chardef\xepersian@ksh="0640 % kashida
 
 \chardef\xepersian@D=10 % dual-joiner class
 \chardef\xepersian@L=11 % lam
 \chardef\xepersian@R=12 % right-joiner
 \chardef\xepersian@A=13 % alef
 \chardef\xepersian@V=256 % vowel or other combining mark (to be ignored)
-
-\def\xepersian@kashida{\xepersian@zwj\nobreak \setbox0=\hbox{\xepersian@ksh}%
-    \leaders\hrule height\ht0 \hskip0pt plus 0.5em \xepersian@zwj}
+\def\xepersian@kashida{\xepersian@zwj\nobreak%
+    \leaders\hrule height \XeTeXglyphbounds2 \the\XeTeXcharglyph"0640  depth \XeTeXglyphbounds4 \the\XeTeXcharglyph"0640 \hskip0pt plus 0.5em \xepersian@zwj}
 
 \def\setclass#1#2{\def\theclass{#1}\def\charlist{#2}%
   \expandafter\dosetclass\charlist,\end}
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
index ee5188c480a..762700651f0 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
@@ -35,8 +35,8 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v13.5}
-\def\xepersiandate{2013/10/21}
+\def\xepersianversion{v13.6}
+\def\xepersiandate{2013/11/15}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space
 Persian typesetting in XeLaTeX]
 \RequirePackage{fontspec}
@@ -45,7 +45,7 @@ Persian typesetting in XeLaTeX]
 \RequirePackage[RTLdocument]{bidi}
 \edef\@xepersian@info{****************************************************^^J%
 * ^^J%
-* xepersian package (Persian for LaTeX over XeTeX)^^J%
+* xepersian package (Persian for LaTeX, using XeTeX engine)^^J%
 * ^^J%
 * Description: The package supports Persian^^J%
 * typesetting, using fonts provided in the^^J%