xepersian-hm (4jun20)

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

2 files changed, 21 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xepersian-hm/kashida-xepersian-hm.def b/Master/texmf-dist/tex/xelatex/xepersian-hm/kashida-xepersian-hm.def
index e936a9d2a8d..3395c11efda 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian-hm/kashida-xepersian-hm.def
+++ b/Master/texmf-dist/tex/xelatex/xepersian-hm/kashida-xepersian-hm.def
@@ -13,7 +13,7 @@
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 \ExplSyntaxOn
-\ProvidesExplFile {kashida-xepersian-hm.def} {2020-05-31} {1.0a} { Fixes~implementation~of~Kashida~in~xepersian~package }
+\ProvidesExplFile {kashida-xepersian-hm.def} {2020-06-04} {1.0b} { Fixes~implementation~of~Kashida~in~xepersian~package }
 
 \newXeTeXintercharclass \c_xephm_d_charclass % dual-joiner class
 \newXeTeXintercharclass \c_xephm_l_charclass % lam
@@ -277,7 +277,10 @@
 
 \makeatletter
 \newif\if@Kashida@on
-\newif\if@Kashida@XB@fix
+%% Becuase Vafa Khalighi has copied the above code (injecting the character uni+200E) in xepersian-23.0
+%% (https://tug.org/svn/texlive/trunk/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def?revision=55165&view=co),
+%% the following line of code is not needed in xepersian anymore.
+%% % \newif\if@Kashida@XB@fix
 \makeatother
 
  \endinput
diff --git a/Master/texmf-dist/tex/xelatex/xepersian-hm/xepersian-hm.sty b/Master/texmf-dist/tex/xelatex/xepersian-hm/xepersian-hm.sty
index cc493c22a31..5a2ef343be2 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian-hm/xepersian-hm.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian-hm/xepersian-hm.sty
@@ -31,7 +31,7 @@
 \RequirePackage{zref-savepos}[2020-03-03]
 \RequirePackage{xepersian}
 \ExplSyntaxOn
-\ProvidesExplPackage {xepersian-hm} {2020-05-31} {1.0a} { Fixes~issues~in~xepersian~package }
+\ProvidesExplPackage {xepersian-hm} {2020-06-04} {1.0b} { Fixes~issues~in~xepersian~package }
 
 \box_new:N \l_xephm_ksh_box
 
@@ -86,6 +86,8 @@
 \tl_set:Nn \l_xephm_stretch_glyph_tl { glyph }
 \tl_set:Nn \l_xephm_stretch_leaders_glyph_tl { leaders+glyph }
 \tl_set:Nn \l_xephm_stretch_leaders_hrule_tl { leaders+hrule }
+\tl_set:Nn \l_xephm_stretch_off_tl { Off }
+\tl_set:Nn \l_xephm_stretch_on_tl { On }
 
 \tl_set:Nn \l_xephm_fnt_kayhan_tl       { kayhan }
 \tl_set:Nn \l_xephm_fnt_kayhannavaar_tl { kayhannavaar }
@@ -203,18 +205,30 @@
                         \msg_error:nnx { xepersian-hm } { error-kashida-character-is-not-available-in-the-main-font } { \l_xephm_main_font_name_tl }
                       }
                   }
+                \bool_set_true:N \l_xephm_kashida_hm_fix_bool
               }
             \l_xephm_stretch_leaders_glyph_tl
               {
                 \tl_set:Nx \l_xephm_gap_filler_tl { \l_xephm_stretch_leaders_glyph_tl }
+                \bool_set_true:N \l_xephm_kashida_hm_fix_bool
               }
             \l_xephm_stretch_leaders_hrule_tl
               {
                 \tl_set:Nx \l_xephm_gap_filler_tl { \l_xephm_stretch_leaders_hrule_tl }
+                \bool_set_true:N \l_xephm_kashida_hm_fix_bool
+              }
+            \l_xephm_stretch_off_tl
+              {
+                \tl_set:Nx \l_xephm_gap_filler_tl { \l_xephm_stretch_off_tl }
+                \bool_set_false:N \l_xephm_kashida_hm_fix_bool
+              }
+            \l_xephm_stretch_on_tl
+              {
+                \tl_set:Nx \l_xephm_gap_filler_tl { \l_xephm_stretch_leaders_glyph_tl }
+                \bool_set_true:N \l_xephm_kashida_hm_fix_bool
               }
           } { } { \tl_set:Nx \l_xephm_gap_filler_tl { #1 } }
         \tl_if_empty:NT \l_xephm_gap_filler_tl { \msg_error:nn { xepersian-hm } { error-specify-value-for-kashida-option } }
-        \bool_set_true:N \l_xephm_kashida_hm_fix_bool
       } ,
 
     linebreakpenalty .code:n =
@@ -288,7 +302,6 @@
         \bool_set_true:N \l_xephm_ligature_bool
       } ,
     ligatures .default:n = \tl_set:Nn \l_xephm_active_ligs_tl { \l_xephm_lig_default_tl } ,
-
   }
 
 \ProcessKeysOptions { xepersian-hm }