xepersian (30apr19)

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

1 files changed, 20 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
index e29b5e3147c..fd081989d1a 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
@@ -17,7 +17,7 @@
 %%   by Vafa Khalighi.
 %% 
 %% 
-%% \CheckSum{11025}
+%% \CheckSum{11018}
 %% \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
@@ -35,8 +35,8 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersian@version{22.6}
-\def\xepersiandate{2019/03/03}
+\def\xepersian@version{22.7}
+\def\xepersiandate{2019/05/01}
 \ProvidesPackage{xepersian}[\xepersiandate\space v\xepersian@version\space
 Persian typesetting in XeLaTeX]
 \RequirePackage{fontspec}
@@ -120,7 +120,9 @@ Persian typesetting in XeLaTeX]
 \keys_define:nn {fontspec-opentype}
   {
     Ligatures / PersianTeX .code:n = { \tl_set:Nn \l__fontspec_mapping_tl {persian-tex-text} },
+    Ligatures / PersianTeX .groups:n = {opentype},
     Ligatures / PersianTeXReset .code:n = { \tl_clear:N \l__fontspec_mapping_tl },
+    Ligatures / PersianTeXReset .groups:n = {opentype},
   }
 
 \keys_define:nn {fontspec-aat}
@@ -147,7 +149,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+  \str_if_eq:eeT {\familydefault} {\rmdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_settextfont_hook:nn {#1} {#2}
   \normalfont
@@ -220,7 +222,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+  \str_if_eq:eeT {\familydefault} {\rmdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_setlatintextfont_hook:nn {#1} {#2}
   \normalfont
@@ -233,15 +235,15 @@ Persian typesetting in XeLaTeX]
 
 \DeclareDocumentCommand \defpersianfont { m O{} m O{} }
   {
-    \__xepersian_main_defpersianfont:nnnN {#1} {#2,#4} {#3}
+    \__xepersian_main_defpersianfont:NnnN #1 {#2,#4} {#3}
     \NewDocumentCommand
   }
 \DeclareDocumentCommand \redefpersianfont { m O{} m O{} }
   {
-    \__xepersian_main_defpersianfont:nnnN {#1} {#2,#4} {#3}
+    \__xepersian_main_defpersianfont:NnnN #1 {#2,#4} {#3}
     \RenewDocumentCommand
   }
-\cs_new:Nn \__xepersian_main_defpersianfont:nnnN
+\cs_new:Nn \__xepersian_main_defpersianfont:NnnN
  {
   \fontspec_set_family:cnn { l__xepersian_ \cs_to_str:N #1 _family_tl } {Script=Persian,Ligatures=PersianTeX,#2} {#3}
   \use:x
@@ -257,15 +259,15 @@ Persian typesetting in XeLaTeX]
 
 \DeclareDocumentCommand \deflatinfont { m O{} m O{} }
   {
-    \__xepersian_main_deflatinfont:nnnN {#1} {#2,#4} {#3}
+    \__xepersian_main_deflatinfont:NnnN #1 {#2,#4} {#3}
     \NewDocumentCommand
   }
 \DeclareDocumentCommand \redeflatinfont { m O{} m O{} }
   {
-    \__xepersian_main_deflatinfont:nnnN {#1} {#2,#4} {#3}
+    \__xepersian_main_deflatinfont:NnnN #1 {#2,#4} {#3}
     \RenewDocumentCommand
   }
-\cs_new:Nn \__xepersian_main_deflatinfont:nnnN
+\cs_new:Nn \__xepersian_main_deflatinfont:NnnN
  {
   \fontspec_set_family:cnn { l__xepersian_ \cs_to_str:N #1 _family_tl } {Ligatures=TeX,#2} {#3}
   \use:x
@@ -326,7 +328,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\persiansfdefault}
+  \str_if_eq:eeT {\familydefault} {\persiansfdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_setpersiansansfont_hook:nn {#1} {#2}
   \normalfont
@@ -350,7 +352,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\persianttdefault}
+  \str_if_eq:eeT {\familydefault} {\persianttdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_setpersianmonofont_hook:nn {#1} {#2}
   \normalfont
@@ -374,7 +376,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\navardefault}
+  \str_if_eq:eeT {\familydefault} {\navardefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_setnavarfont_hook:nn {#1} {#2}
   \normalfont
@@ -398,7 +400,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\pookdefault}
+  \str_if_eq:eeT {\familydefault} {\pookdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_setpookfont_hook:nn {#1} {#2}
   \normalfont
@@ -422,7 +424,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\sayehdefault}
+  \str_if_eq:eeT {\familydefault} {\sayehdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_setsayehfont_hook:nn {#1} {#2}
   \normalfont
@@ -446,7 +448,7 @@ Persian typesetting in XeLaTeX]
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\iranicdefault}
+  \str_if_eq:eeT {\familydefault} {\iranicdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \__xepersian_setiranicfont_hook:nn {#1} {#2}
   \normalfont
@@ -859,7 +861,7 @@ Persian typesetting in XeLaTeX]
 
 \newcommand*{\@xepersian@pdfcustomproperties}{%
   This is the xepersian package, Version \xepersian@version,
-  Released March 3, 2019.
+  Released May 1, 2019.
 }
 
 \newcommand\twocolumnstableofcontents{%