xepersian (31mar13)

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

2 files changed, 69 insertions, 79 deletions

diff --git a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
index 2a697f57147..b63a01e8332 100644
--- a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
+++ b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
@@ -5,39 +5,35 @@
 %<*readme>
 ____________________
 The XePersian package
-v12 (Final Version)
+v12.1
 
 XePersian is a package written for XeLaTeX that allows users to typeset
-Persian easily. This is the final version of xepersian package and no more 
-updates of xepersian package will appear. I am working on a commercial 
-package (namely Simurgh, for typesetting high quality Persian/English 
-documents with LuaTeX, which does not have bugs and limitations of 
-xepersian package) and therefore do not wish to continue the
-development of xepersian package. Hence you may like to consider 
-xepersian as obsolete and may wish to purchase a copy of Simurgh 
-package. If you are interested to purchase a copy of Simurgh package,
-then send me an email. Please do not email me with questions/queries 
-about bugs/limitations/usage of xepersian package; I am not interested
-in those emails and your email will be deleted immediately without replying
-back.
+Persian easily. 
 
 The XePersian package is independent of any operating system, meaning it
 will work on all operating systems.
 
 
 
-This version fixes all known bugs and adds new features explained in the
-documentation. Support for xepersian-thesis class is removed as explained
-in the documentation.
+This version fixes bugs and adds new features; for more details please see
+the ChangeLog. 
 
-To get help, please explore http://forum.parsilatex.com
+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:
+  <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). 
 
+Current version release date: 2013/04/01
 
 ______________
 Vafa Khalighi
-vafak12@gmail.com
+vafa[dot]kgh[at]gmail[dot]com
 
-Copyright © 2008–2012
+Copyright © 2008–2013
 Distributed under the LaTeX Project Public License
 It may be distributed and/or modified under the LaTeX Project Public License,
 version 1.3c or higher (your choice). The latest version of
@@ -46,6 +42,23 @@ this license is at: http://www.latex-project.org/lppl.txt
 This work is “author-maintained” (as per LPPL maintenance status) 
 by Vafa Khalighi.
 %</readme>
+%<*changelog>
+2013/04/01    version 12.1    Vafa Khalighi
+         *  Version 12.1 released.
+         *  `\prg_stepwise_inline:nnnn' in `xepersian-mathsdigitspec.sty' is changed to
+            `\int_step_inline:nnnn'
+         *  `\XeTeXmathcode' and `\XeTeXmathchardef' in `xepersian-mathsdigitspec.sty'
+            are changed to `\Umathcode' and `\Umathchardef', respectively.
+         *  On page 44, line 5 of the documentation, the extra repetition of `syntax' is removed.
+         *  On the last line of page 39 of the documentation,`\Junicode' is changed to `\junicode'.
+         *  On page 39, section 2.7.2 of the documentation, `In this example, we define \Nastaliq
+            to stand for Nastaliq font' is changed to `In this example, we define \Nastaliq to stand 
+            for IranNastaliq font'.
+         *  Fixed `\AutoMathsDigits' in `\lr'.
+         *  Lines 30-36 of `parsidigits.map' removed.
+         *  Fixed the issue of `latin' environment not changing the font of `\caption' to latin.
+%</changelog>
+
 %<*internal>
 \fi
 \begingroup
@@ -57,7 +70,7 @@ by Vafa Khalighi.
 \preamble
 
   ______________________________________
-  Copyright © 2008–2012  Vafa Khalighi
+  Copyright © 2008–2013  Vafa Khalighi
 
   License information appended.
 
@@ -65,7 +78,7 @@ by Vafa Khalighi.
 \endpreamble
 \postamble
 
-Copyright © 2008–2012  Vafa Khalighi <vafak12@gmail.com>
+Copyright © 2008–2013  Vafa Khalighi <vafa[dot]kgh[at]gmail[dot]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
@@ -145,6 +158,7 @@ by Vafa Khalighi.
 \generate{\file{\jobname.ins}{\from{\jobname.dtx}{batchfile}}}
 \nopreamble\nopostamble
 \generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
+\generate{\file{ChangeLog.txt}{\from{\jobname.dtx}{changelog}}}
 \generate{\file{magazine-sample.tex}{\from{\jobname.dtx}{magazine-sample.tex}}}
 \generate{\file{test-correction.tex}{\from{\jobname.dtx}{test-correction.tex}}}
 \generate{\file{test-empty-form.tex}{\from{\jobname.dtx}{test-empty-form.tex}}}
@@ -153,14 +167,13 @@ by Vafa Khalighi.
 \generate{\file{xepersian-logo.tex}{\from{\jobname.dtx}{xepersian-logo.tex}}}
 \endgroup
 \immediate\write18{mv README.txt README}
+\immediate\write18{mv ChangeLog.txt ChangeLog}
 \immediate\write18{makeindex -s gind.ist -o \jobname.ind  \jobname.idx}
 \immediate\write18{makeindex -s gglo.ist -o \jobname.gls  \jobname.glo}
 %</internal>
 %
 %<*driver>
 \documentclass{ltxdoc}
-\usepackage{graphicx,wrapfig,framed}
-\usepackage{url}
 \usepackage{supertabular}
 \usepackage{fontspec}
 \usepackage{calc}
@@ -170,9 +183,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}
-\definecolor{TFFrameColor}{rgb}{0.1,0.2,0.8}
-\definecolor{TFTitleColor}{rgb}{1,1,1}
-\hypersetup{pdftitle={The XePersian Package (Persian for \LaTeXe{} over XeTeX)},pdfauthor={Vafa Khalighi <vafak12@gmail.com>},linkcolor=xepersianblue,urlcolor=xepersianblue,citecolor=xepersianblue}
+\hypersetup{pdftitle={The XePersian Package (Persian for \LaTeXe{} over XeTeX)},pdfauthor={Vafa Khalighi <vafa[dot]kgh[at]gmail[dot]com>},linkcolor=xepersianblue,urlcolor=xepersianblue,citecolor=xepersianblue}
 \usepackage{bidi}
 \setlength\columnseprule{.4pt}
 \newfontfamily\ParsiFont[Script=Arabic]{Iranian Sans}
@@ -226,24 +237,9 @@ by Vafa Khalighi.
 % \includegraphics[width=0.5\textwidth]{xepersian-logo}\\[10pt]
 % Persian for \LaTeXe{} over \XeTeX}
 % \author{Vafa Khalighi\\
-%   \url{vafak12@gmail.com}}
-% \date{\today\qquad Version 12 (Final Version)}
+%   \url{vafa[dot]kgh[at]gmail[dot]com}}
+% \date{\today\qquad Version 12.1}
 %\maketitle
-%\begin{titled-frame}{Important Note}
-%This is the final version of \textsf{xepersian} package and no more 
-%updates of \textsf{xepersian} package will appear. I am working on a commercial 
-%package (namely \textsf{Simurgh}, for typesetting high quality Persian/English 
-%documents with LuaTeX, which does not have bugs and limitations of 
-%\textsf{xepersian} package) and therefore do not wish to continue the
-%development of \textsf{xepersian} package. Hence you may like to consider 
-%\textsf{xepersian} as obsolete and may wish to purchase a copy of \textsf{Simurgh} 
-%package. If you are interested to purchase a copy of \textsf{Simurgh} package,
-%then send me an email. Please do not email me with questions/queries 
-%about bugs/limitations/usage of \textsf{xepersian} package; I am not interested
-%in those emails and your email will be deleted immediately without replying
-%back.
-%\end{titled-frame}
-%\newpage
 %\tableofcontents
 %\section{Introduction}
 %\XePersian\ is a package for typesetting Persian/English documents with \XeLaTeX. The package includes adaptations for use with many other commonly-used packages.
@@ -252,7 +248,6 @@ by Vafa Khalighi.
 %\item The \textsf{\XePersian} package  only works with \XeTeX\ engine.
 %\item Before reading this documentation, you should have read the documentation of the \textsf{bidi} package. The \textsf{\XePersian} package automatically loads \textsf{bidi} package with \texttt{RTLdocument} option enabled and hence any commands that \textsf{bidi} package offers, is also available in \textsf{\XePersian} package. Here, in this documentation, we will not repeat any of \textsf{bidi} package's commands.
 %\item In previous versions (\(\leq1.0.3\)) of \XePersian, a thesis class provided for typesetting thesis. As of version 1.0.4, I no longer provide this class because I am not familiar with specification of a thesis in Iran and even if I was, the specifications are different from University to University. \XePersian\ is a general package like \LaTeX\ and should not provide any class for typesetting thesis. So if you really want to have a class file for typesetting thesis, then you should ask your University/department to write one for you. 
-%\item To get help, please explore \url{http://forum.parsilatex.com} and ask your question there.
 %
 %\end{itemize}
 %\subsection{\textsf{\XePersian} Info On The Terminal and In The Log File}
@@ -261,8 +256,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-2012 Vafa Khalighi
-%v12 (Final Version), 2012/12/12
+%Copyright © 2008-2013 Vafa Khalighi
+%v12.1, 2013/04/01
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/xetex/latex/xepersian
 %\end{lstlisting}
@@ -307,8 +302,6 @@ by Vafa Khalighi.
 %\end{enumerate}
 %\subsection{\textsf{\XePersian}'s Symbol}
 % As you may know lion symbolizes \TeX{} but lion does not symbolizes \textsf{\XePersian}. \textbf{Simorgh}\footnote{\textbf{Simorgh} is an Iranian benevolent, mythical flying creature which has been shown on the titlepage of this documentation. For more details see \url{http://en.wikipedia.org/wiki/Simurgh}} (shown on the first page of this documentation) symbolizes \textsf{\XePersian}.
-%\subsection{Version of \textsf{\XePersian} package}
-% Version of \textsf{\XePersian} package tends to \textbf{12} and finally, the version number of \textsf{\XePersian} package becomes \textbf{12}\footnote{This is because number \textbf{12} has been a sacred number between Iranians since ancient times. For instance, in the battles of Rostam against Keykavous,  Esfandyar against Arjasp, Goudarz for the revenge of Siavash, and Bahram Mehran (Chobineh) against Turks, the number of Iranian army were 12000 and in all these battles, Iranians defeated enemy.}.
 %\subsection{Commands for Version number, and Date of The Package}
 %\begin{BDef}
 %\Lcs{xepersianversion}\quad\Lcs{xepersiandate}
@@ -366,7 +359,6 @@ by Vafa Khalighi.
 %\Lcs{eqenvironment}\Largb{\Larga{environment-name in Persian}}\Largb{\Larga{original \LaTeX{} environment-name}}
 %\end{BDef}
 % 
-%\newpage
 %\begin{center}
 %\tablecaption{The Equivalent \LaTeX\ and \TeX\ Commands\label{lcs}}
 %\tablehead
@@ -1678,12 +1670,12 @@ by Vafa Khalighi.
 %\begin{lstlisting}[numbers=none,morekeywords={defpersianfont,Nastaliq}]
 %\defpersianfont\Nastaliq[Scale=1]{IranNastaliq}
 %\end{lstlisting}
-%In this example, we define \Lcs{Nastaliq} to stand for Nastaliq font.
+%In this example, we define \Lcs{Nastaliq} to stand for IranNastaliq font.
 %\item With \Lcs{deflatinfont}, you can define extra Latin fonts.
 %\begin{lstlisting}[numbers=none,morekeywords={deflatinfont,junicode}]
 %\deflatinfont\junicode[Scale=1]{Junicode}
 %\end{lstlisting}
-%In this example, we define \Lcs{Junicode} to stand for Junicode font.
+%In this example, we define \Lcs{junicode} to stand for Junicode font.
 %\end{itemize}
 %\subsubsection{Choosing Persian Sans Font}
 %\begin{BDef}
@@ -1840,7 +1832,7 @@ by Vafa Khalighi.
 %
 %This will convert your \texttt{file.ftx} (Farsi\TeX\ file) to \texttt{file.tex} (\XePersian\ file).
 %
-%The general syntax syntax of using the python script is as follow:
+%The general syntax  of using the python script is as follow:
 %\begin{BDef}\ttfamily
 %python ftxe-0.12.py [-r] [-s] [-x] [-u] input-filename1 input-filename2
 %\end{BDef}
@@ -5246,13 +5238,6 @@ U+0037 <> U+06F7 ;
 U+0038 <> U+06F8 ;
 U+0039 <> U+06F9 ;
 
-U+0644 U+0651 U+064E U+0627 <> U+0644 U+0627 U+0651 U+064E ; lam shadda fatha alif -> lam alif shadda fatha
-U+0644 U+0651 U+0627 <> U+0644 U+0627 U+0651  ; lam shadda alif -> lam alif shadda
-U+0644 U+0652 U+0622 <> U+0644 U+0622 U+0652  ; lam sukun alifmadda -> lam alifmadda sukun
-U+0644 U+0652 U+0623 <> U+0644 U+0623 U+0652  ; lam sukun alifhamzaabove -> lam alifhamzaabove sukun
-U+0644 U+0652 U+0625 <> U+0644 U+0625 U+0652  ; lam sukun alifhamzabelow -> lam alifhamzabelow sukun
-U+0644 U+0651 U+064B U+0627 <> U+0644 U+0627 U+0651 U+064b ; lam shadda fathatan alif -> lam alif shadda fathatan
-U+0644 U+064B U+0627 <> U+0644 U+0627 U+064B ; lam fathatan alif -> lam alif fathatan
 
 U+002C <> U+060C ; comma ­> arabic comma
 U+003F <> U+061F ; question mark -> arabic qm
@@ -5501,8 +5486,8 @@ U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
 % \subsection{\textsf{xepersian.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v12 (Final Version)}
-\def\xepersiandate{2012/12/12}
+\def\xepersianversion{v12.1}
+\def\xepersiandate{2013/04/01}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space 
 Persian typesetting in XeLaTeX]
 \RequirePackage{fontspec}
@@ -5513,7 +5498,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–2012 Vafa Khalighi^^J
+Copyright © 2008–2013 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}
@@ -5653,12 +5638,14 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \setiranicfont[ExternalLocation,BoldFont={persian-modern-boldoblique}]{persian-modern-oblique}
 \def\resetlatinfont{%
 \let\normalfont\latinfont%
+\let\reset@font\normalfont%
 \latinfont}
 \def\setpersianfont{%
 \let\normalfont\persianfont%
+\let\reset@font\normalfont%
 \persianfont}
-\bidi@newrobustcmd*{\lr}[1]{\LRE{\latinfont#1}}
-\bidi@newrobustcmd*{\rl}[1]{\RLE{\persianfont#1}}
+\bidi@newrobustcmd*{\lr}[1]{\LRE{\@Latintrue\latinfont#1}}
+\bidi@newrobustcmd*{\rl}[1]{\RLE{\@Latinfalse\persianfont#1}}
 \def\latin{\LTR\LatinAlphs\@Latintrue\@RTL@footnotefalse\resetlatinfont}
 \def\endlatin{\endLTR}
 \def\persian{\RTL\PersianAlphs\@RTL@footnotetrue\setpersianfont}
@@ -5729,7 +5716,7 @@ Location on CTAN: /macros/xetex/latex/xepersian}
         \vfil
         \color@hbox
           \normalcolor
-          \hb@xt@\textwidth{\if@RTLmain\beginR\fi\@thehead\if@RTLmain\endR\fi}%
+          \hb@xt@\textwidth{\if@RTLmain\@RTLtrue\beginR\else\@RTLfalse\beginL\fi\@thehead\if@RTLmain\endR\else\endL\fi}%
         \color@endbox
         }%                        %% 22 Feb 87
       \dp\@tempboxa \z@
@@ -5739,7 +5726,7 @@ Location on CTAN: /macros/xetex/latex/xepersian}
       \baselineskip \footskip
       \color@hbox
         \normalcolor
-        \hb@xt@\textwidth{\if@RTLmain\beginR\fi\@thefoot\if@RTLmain\endR\fi}%
+        \hb@xt@\textwidth{\if@RTLmain\@RTLtrue\beginR\else\@RTLfalse\beginL\fi\@thefoot\if@RTLmain\endR\else\endL\fi}%
       \color@endbox
       }%
     }%
@@ -6975,7 +6962,9 @@ indexblock environment may only appear inside frontpage environment.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{xepersian-mathsdigitspec}
-  [2012/01/01 v1.0.2 Unicode Persian maths digits in XeLaTeX]
+  [2013/04/01 v1.0.3 Unicode Persian maths digits in XeLaTeX]
+\@ifundefined{Umathcode}{\let\Umathcode\XeTeXmathcode}{}
+\@ifundefined{Umathchardef}{\let\Umathchardef\XeTeXmathchardef}{}
 \def\new@mathgroup{\alloc@8\mathgroup\chardef\@cclvi}
 \let\newfam\new@mathgroup
 \def\select@group#1#2#3#4{%
@@ -7051,9 +7040,9 @@ indexblock environment may only appear inside frontpage environment.
   \@bsphack{\setbox0=\hbox{\cite{#1}}}\@esphack}
 \newcommand\xepersian@PackageInfo[1]{\PackageInfo{xepersian-mathsdigitspec}{#1}}
 \newcommand\SetMathCode[4]{%
-  \XeTeXmathcode#1="\mathchar@type#2 \csname sym#3\endcsname #4\relax}
+  \Umathcode#1="\mathchar@type#2 \csname sym#3\endcsname #4\relax}
 \newcommand\SetMathCharDef[4]{%
-  \XeTeXmathchardef#1="\mathchar@type#2 \csname sym#3\endcsname #4\relax}
+  \Umathchardef#1="\mathchar@type#2 \csname sym#3\endcsname #4\relax}
 \ExplSyntaxOn
 \cs_new_eq:NN \orig_mathbf:n \mathbf
 \cs_new_eq:NN \orig_mathit:n \mathit
@@ -7062,7 +7051,7 @@ indexblock environment may only appear inside frontpage environment.
 \cs_new_eq:NN \orig_mathtt:n \mathtt
 \NewDocumentCommand \new@mathbf { m } {
  \orig_mathbf:n {
-   \prg_stepwise_inline:nnnn { `0 } { \c_one } { `9 } {
+   \int_step_inline:nnnn { `0 } { \c_one } { `9 } {
      \mathcode ##1 = \numexpr "100 * \symnew@mathbf@font@digits + ##1 \relax
    }
    #1
@@ -7070,7 +7059,7 @@ indexblock environment may only appear inside frontpage environment.
 }
 \NewDocumentCommand \new@mathit { m } {
  \orig_mathit:n {
-   \prg_stepwise_inline:nnnn { `0 } { \c_one } { `9 } {
+   \int_step_inline:nnnn { `0 } { \c_one } { `9 } {
      \mathcode ##1 = \numexpr "100 * \symnew@mathit@font@digits + ##1 \relax
    }
    #1
@@ -7078,7 +7067,7 @@ indexblock environment may only appear inside frontpage environment.
 }
 \NewDocumentCommand \new@mathrm { m } {
  \orig_mathrm:n {
-   \prg_stepwise_inline:nnnn { `0 } { \c_one } { `9 } {
+   \int_step_inline:nnnn { `0 } { \c_one } { `9 } {
      \mathcode ##1 = \numexpr "100 * \symnew@mathrm@font@digits + ##1 \relax
    }
    #1
@@ -7086,7 +7075,7 @@ indexblock environment may only appear inside frontpage environment.
 }
 \NewDocumentCommand \new@mathsf{ m } {
  \orig_mathsf:n {
-   \prg_stepwise_inline:nnnn { `0 } { \c_one } { `9 } {
+   \int_step_inline:nnnn { `0 } { \c_one } { `9 } {
      \mathcode ##1 = \numexpr "100 * \symnew@mathsf@font@digits + ##1 \relax
    }
    #1
@@ -7094,7 +7083,7 @@ indexblock environment may only appear inside frontpage environment.
 }
 \NewDocumentCommand \new@mathtt{ m } {
  \orig_mathtt:n {
-   \prg_stepwise_inline:nnnn { `0 } { \c_one } { `9 } {
+   \int_step_inline:nnnn { `0 } { \c_one } { `9 } {
      \mathcode ##1 = \numexpr "100 * \symnew@mathtt@font@digits + ##1 \relax
    }
    #1
@@ -7568,7 +7557,7 @@ indexblock environment may only appear inside frontpage environment.
 
 وفا خلیقی، مهدی امیدعلی و مصطفی واحدی
 
-\texttt{vafak12@gmail.com\\[5pt]
+\texttt{vafa[dot]kgh[at]gmail[dot]com\\[5pt]
 http://google.com}\\
 \end{authorblock}
 \end{frontpage}
diff --git a/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins b/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
index 498575899d1..3f396691ac9 100644
--- a/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
+++ b/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
@@ -7,25 +7,26 @@
 %% xepersian.dtx  (with options: `batchfile')
 %% 
 %%   ______________________________________
-%%   Copyright © 2008–2012  Vafa Khalighi
+%%   Copyright © 2008–2013  Vafa Khalighi
 %% 
 %%   License information appended.
 %% 
 %% 
+
 \input docstrip.tex
 \let\MetaPrefix\relax
 \keepsilent
 \preamble
 
   ______________________________________
-  Copyright © 2008–2012  Vafa Khalighi
+  Copyright © 2008–2013  Vafa Khalighi
 
   License information appended.
 
 \endpreamble
 \postamble
 
-Copyright © 2008–2012  Vafa Khalighi <vafak12@gmail.com>
+Copyright © 2008–2013  Vafa Khalighi <vafa[dot]kgh[at]gmail[dot]com>
 
 It may be distributed and/or modified under the LaTeX Project Public License,
 version 1.3c or higher (your choice). The latest version of
@@ -99,7 +100,7 @@ by Vafa Khalighi.
 \generate{\file{xepersian-persiancal.sty}{\from{\jobname.dtx}{xepersian-persiancal.sty}}}
 \endbatchfile
 %% 
-%% Copyright © 2008–2012  Vafa Khalighi <vafak12@gmail.com>
+%% Copyright © 2008–2013  Vafa Khalighi <vafa[dot]kgh[at]gmail[dot]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