xepersian (30apr15)

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

2 files changed, 78 insertions, 87 deletions

diff --git a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
index 03cbaceb73a..4d613ab7556 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
-v16
+v16.1
 
 XePersian is a package written for XeLaTeX that allows users to typeset
 Persian easily. 
@@ -28,7 +28,7 @@ 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: 2015/02/02
+Current version release date: 2015/04/30
 ______________
 Vafa Khalighi
 persian-tex@tug.org
@@ -87,7 +87,6 @@ by Vafa Khalighi.
 \generate{\file{color-localise-xepersian.def}{\from{\jobname.dtx}{table,color-localise-xepersian.def}}}
 \generate{\file{xepersian-localise-commands-xepersian.def}{\from{\jobname.dtx}{table,xepersian-localise-commands-xepersian.def}}}
 \generate{\file{enumerate-xepersian.def}{\from{\jobname.dtx}{table,enumerate-xepersian.def}}}
-\generate{\file{fontspec-xetex-xepersian.def}{\from{\jobname.dtx}{table,fontspec-xetex-xepersian.def}}}
 \generate{\file{latex-localise-environments-xepersian.def}{\from{\jobname.dtx}{table,latex-localise-environments-xepersian.def}}}
 \generate{\file{xepersian-localise-environments-xepersian.def}{\from{\jobname.dtx}{table,xepersian-localise-environments-xepersian.def}}}
 \generate{\file{extarticle-xepersian.def}{\from{\jobname.dtx}{table,extarticle-xepersian.def}}}
@@ -272,7 +271,7 @@ by Vafa Khalighi.
 %\changes{v13.1}{2013/09/23}{Added implementation of the package.}
 % \title{\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}\\
 %\LARGE Persian for \LaTeXe, using {\XeTeX} engine\\[5pt]
-%\large Documentation for \textcolor{blue!65!black}{version 16}}
+%\large Documentation for \textcolor{blue!65!black}{version 16.1}}
 % \author{Vafa Khalighi\\
 %  \url{persian-tex@tug.org}}
 %\setcounter{page}{0}
@@ -283,7 +282,7 @@ by Vafa Khalighi.
 %\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}
 %
 %\Large
-%Documentation for \textcolor{blue!65!black}{version 16}}
+%Documentation for \textcolor{blue!65!black}{version 16.1}}
 %
 %\vskip 0pt plus 3fill
 %\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -338,7 +337,7 @@ by Vafa Khalighi.
 %* 
 %* Copyright (c) 2008--2015 Vafa Khalighi
 %* 
-%* v16, 2015/02/02
+%* v16.1, 2015/04/30
 %* 
 %* License: LaTeX Project Public License, version
 %* 1.3c or higher (your choice)
@@ -2359,7 +2358,7 @@ by Vafa Khalighi.
 %\iffalse
 %<*table>
 %\fi
-%% \CheckSum{10038}
+%% \CheckSum{10069}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -3899,51 +3898,6 @@ by Vafa Khalighi.
 %    \end{macrocode}
 % \iffalse
 %</enumerate-xepersian.def>
-%<*fontspec-xetex-xepersian.def>
-%\fi
-% \subsection{\textsf{fontspec-xetex-xepersian.def}}
-%    \begin{macrocode}
-\ProvidesFile{fontspec-xetex-xepersian.def}[2014/07/10 v0.1 fixes for fontspec-xetex package]
-\ExplSyntaxOn
-\DeclareDocumentCommand \aliasfontfeature {mm}
- {
-  \keys_if_exist:nnTF {fontspec} {#1}
-    {
-     \keys_define:nn {fontspec}
-      { #2 .code:n = { \keys_set:nn {fontspec} { #1 = {##1} } } }
-    }
-    {
-      \keys_if_exist:nnTF {fontspec-renderer} {#1}
-    {
-     \keys_define:nn {fontspec-renderer}
-      { #2 .code:n = { \keys_set:nn {fontspec-renderer} { #1 = {##1} } } }
-    }
-    {
-     \keys_if_exist:nnTF {fontspec-preparse} {#1}
-      {
-       \keys_define:nn {fontspec-preparse}
-        { #2 .code:n = { \keys_set:nn {fontspec-preparse} { #1 = {##1} } } }
-      }
-      {
-       \keys_if_exist:nnTF {fontspec-preparse-external} {#1}
-        {
-         \keys_define:nn {fontspec-preparse-external}
-          {
-           #2 .code:n =
-            { \keys_set:nn {fontspec-preparse-external} { #1 = {##1} } }
-          }
-        }
-        {
-         \__fontspec_warning:nx {rename-feature-not-exist} {#1}
-        }
-      }
-     }
-    }
- }
-\ExplSyntaxOff
-%    \end{macrocode}
-% \iffalse
-%</fontspec-xetex-xepersian.def>
 %<*latex-localise-environments-xepersian.def>
 %\fi
 % \subsection{\textsf{latex-localise-environments-xepersian.def}}
@@ -5702,8 +5656,8 @@ U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
 % \subsection{\textsf{xepersian.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v16}
-\def\xepersiandate{2015/02/02}
+\def\xepersianversion{v16.1}
+\def\xepersiandate{2015/04/30}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space 
 Persian typesetting in XeLaTeX]
 \RequirePackage{fontspec}
@@ -5764,12 +5718,15 @@ Persian typesetting in XeLaTeX]
 \newfontscript{Parsi}{arab}
 \newfontlanguage{Parsi}{FAR}
 \ExplSyntaxOn
-\DeclareDocumentCommand \settextfont { O{} m O{} }
+\DeclareDocumentCommand \settextfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_settextfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_settextfont:nn
  {
-  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N \persianfont  _family } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1,#3} {#2}
+  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N \persianfont _family } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2}
   \use:x
    {
-    \exp_not:N \DeclareRobustCommand \exp_not:N \persianfont 
+    \exp_not:N \DeclareRobustCommand \exp_not:N \persianfont
      {
       \exp_not:N \fontencoding {\g_fontspec_encoding_tl}
       \exp_not:N \fontfamily { \use:c {g__fontspec_ \cs_to_str:N \persianfont _family} } \exp_not:N \selectfont
@@ -5778,9 +5735,12 @@ Persian typesetting in XeLaTeX]
   \cs_set_eq:NN \rmdefault \l_fontspec_family_tl
   \normalfont
  }
-\DeclareDocumentCommand \setlatintextfont { O{} m O{} }
+\DeclareDocumentCommand \setlatintextfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setlatintextfont:nn  {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setlatintextfont:nn
  {
-  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N \latinfont _family } {Mapping=tex-text,#1,#3} {#2}
+  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N \latinfont _family } {Mapping=tex-text,#1} {#2}
   \use:x
    {
     \exp_not:N \DeclareRobustCommand \exp_not:N \latinfont
@@ -5792,9 +5752,12 @@ Persian typesetting in XeLaTeX]
  }
 \cs_set_eq:NN \setlatinsansfont \setsansfont
 \cs_set_eq:NN \setlatinmonofont \setmonofont
-\DeclareDocumentCommand \defpersianfont { m O{} m O{} }
+\DeclareDocumentCommand \defpersianfont { m o m }
+ { \__fontspec_pass_args:nnn { \__xepersian_defpersianfont:Nnn #1 } {#2} {#3} }
+
+\cs_new:Nn \__xepersian_defpersianfont:Nnn
  {
-  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#2,#4} {#3}
+  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#2} {#3}
   \use:x
    {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1
@@ -5804,9 +5767,12 @@ Persian typesetting in XeLaTeX]
      }
    }
  }
-\DeclareDocumentCommand \deflatinfont { m O{} m O{} }
+\DeclareDocumentCommand \deflatinfont { m o m }
+ { \__fontspec_pass_args:nnn { \__xepersian_deflatinfont:Nnn #1 } {#2} {#3} }
+
+\cs_new:Nn \__xepersian_deflatinfont:Nnn
  {
-  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {Mapping=tex-text,#2,#4} {#3}
+  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {Mapping=tex-text,#2} {#3}
   \use:x
    {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1
@@ -5846,39 +5812,57 @@ Persian typesetting in XeLaTeX]
 \DeclareTextFontCommand{\textnavar}{\navarfamily}
 \DeclareTextFontCommand{\textpook}{\pookfamily}
 \DeclareTextFontCommand{\textsayeh}{\sayehfamily}
-\DeclareDocumentCommand \setpersiansansfont { O{} m O{} }
+\DeclareDocumentCommand \setpersiansansfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setpersiansansfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setpersiansansfont:nn
  {
-  \fontspec_set_family:Nnn \persiansfdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1,#3}{#2}
+  \fontspec_set_family:Nnn \persiansfdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
   \normalfont
   \ignorespaces
  }
-\DeclareDocumentCommand \setpersianmonofont { O{} m O{} }
+\DeclareDocumentCommand \setpersianmonofont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setpersianmonofont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setpersianmonofont:nn
  {
-  \fontspec_set_family:Nnn \persianttdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1,#3}{#2}
+  \fontspec_set_family:Nnn \persianttdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
   \normalfont
   \ignorespaces
  }
-\DeclareDocumentCommand \setnavarfont { O{} m O{} }
+\DeclareDocumentCommand \setnavarfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setnavarfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setnavarfont:nn
  {
-  \fontspec_set_family:Nnn \navardefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1,#3}{#2}
+  \fontspec_set_family:Nnn \navardefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
   \normalfont
   \ignorespaces
  }
-\DeclareDocumentCommand \setpookfont { O{} m O{} }
+\DeclareDocumentCommand \setpookfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setpookfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setpookfont:nn
  {
-  \fontspec_set_family:Nnn \pookdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1,#3}{#2}
+  \fontspec_set_family:Nnn \pookdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
   \normalfont
   \ignorespaces
  }
-\DeclareDocumentCommand \setsayehfont  { O{} m O{} }
+\DeclareDocumentCommand \setsayehfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setsayehfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setsayehfont:nn
  {
-  \fontspec_set_family:Nnn \sayehdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1,#3}{#2}
+  \fontspec_set_family:Nnn \sayehdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
   \normalfont
   \ignorespaces
  }
-\DeclareDocumentCommand \setiranicfont { O{} m O{} }
+\DeclareDocumentCommand \setiranicfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setiranicfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setiranicfont:nn
  {
-  \fontspec_set_family:Nnn \iranicdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1,#3}{#2}
+  \fontspec_set_family:Nnn \iranicdefault {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1}{#2}
   \normalfont
   \ignorespaces
  }
@@ -6284,14 +6268,12 @@ number is 999,999,999.}%
 }{}}
 \@ifdefinitionfileloaded{loadingorder-xetex-bidi}{\input{loadingorder-xepersian.def}}{}
 \@ifpackageloaded{appendix}{\input{appendix-xepersian.def}}{}
-\@ifpackageloaded{fontspec-xetex}{\input{fontspec-xetex-xepersian.def}}{}
 \@ifpackageloaded{listings}{\input{listings-xepersian.def}}{}
 \@ifpackageloaded{algorithmic}{\input{algorithmic-xepersian.def}}{}
 \@ifpackageloaded{algorithm}{\input{algorithm-xepersian.def}}{}
 \@ifpackageloaded{backref}{\input{backref-xepersian.def}}{}
 \@ifpackageloaded{flowfram}{\input{flowfram-xepersian.def}}{}
-\@ifpackageloaded{bidi}{\input{footnote-xepersian.def}}{}
-\@ifpackageloaded{bidituftesidenote}{\input{bidituftesidenote-xepersian.def}}{}
+\@ifpackageloaded{bidituftesidenote}{\input{bidituftesidenote-xepersian.def}}{\input{footnote-xepersian.def}}
 \@ifpackageloaded{breqn}{\input{breqn-xepersian.def}}{}
 \@ifpackageloaded{enumerate}{\input{enumerate-xepersian.def}}{}
 \@ifpackageloaded{framed}{\input{framed-xepersian.def}}{}
@@ -7464,9 +7446,13 @@ indexblock environment may only appear inside frontpage environment.
    #1
  }
 }
-\DeclareDocumentCommand \setdigitfont { O{} m O{} }{%
+\DeclareDocumentCommand \setdigitfont { o m }{%
   \let\glb@currsize\relax
-  \fontspec_set_family:Nnn \xepersian@digits@family {Mapping=parsidigits,#1,#3}{#2}
+  \__fontspec_pass_args:nnn \__xepersian_setdigitfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setdigitfont:nn
+ {
+  \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}{\xepersian@digits@family} {m}{n}
   \DeclareSymbolFont{new@mathbf@font@digits}{EU1}{\xepersian@digits@family}{bx}{n}
@@ -7491,19 +7477,25 @@ indexblock environment may only appear inside frontpage environment.
   \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 O{} }
+ }
+\DeclareDocumentCommand \setmathsfdigitfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setmathsfdigitfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setmathsfdigitfont:nn
  {
-  \fontspec_set_family:Nnn \g_fontspec_mathsf_tl {Mapping=parsidigits,#1,#3}{#2}
+  \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}
  }
-\DeclareDocumentCommand \setmathttdigitfont { O{} m O{} }
+\DeclareDocumentCommand \setmathttdigitfont { o m }
+ { \__fontspec_pass_args:nnn \__xepersian_setmathttdigitfont:nn {#1} {#2} }
+
+\cs_new:Nn \__xepersian_setmathttdigitfont:nn
  {
-  \fontspec_set_family:Nnn \g_fontspec_mathtt_tl {Mapping=parsidigits,#1,#3}{#2}
+  \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}{}
diff --git a/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins b/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
index 99f6516db31..f7febdbb2d0 100644
--- a/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
+++ b/Master/texmf-dist/source/xelatex/xepersian/xepersian.ins
@@ -56,7 +56,6 @@
 \generate{\file{color-localise-xepersian.def}{\from{\jobname.dtx}{table,color-localise-xepersian.def}}}
 \generate{\file{xepersian-localise-commands-xepersian.def}{\from{\jobname.dtx}{table,xepersian-localise-commands-xepersian.def}}}
 \generate{\file{enumerate-xepersian.def}{\from{\jobname.dtx}{table,enumerate-xepersian.def}}}
-\generate{\file{fontspec-xetex-xepersian.def}{\from{\jobname.dtx}{table,fontspec-xetex-xepersian.def}}}
 \generate{\file{latex-localise-environments-xepersian.def}{\from{\jobname.dtx}{table,latex-localise-environments-xepersian.def}}}
 \generate{\file{xepersian-localise-environments-xepersian.def}{\from{\jobname.dtx}{table,xepersian-localise-environments-xepersian.def}}}
 \generate{\file{extarticle-xepersian.def}{\from{\jobname.dtx}{table,extarticle-xepersian.def}}}