2 files changed, 30 insertions, 29 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 b4e84fca193..10c8197d2b2 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
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% xepersian-hm.dtx  (with options: `kashida-xepersian-hm')
+%% xepersian-hm.dtx  (with options: `kashida-xepersian-hm-def')
 %% 
 %% Copyright (C) 2020 Hossein Movahhedian
 %% 
@@ -13,14 +13,7 @@
 %% this license is at: http://www.latex-project.org/lppl.txt
 %% 
 \ExplSyntaxOn
-\ProvidesExplFile {kashida-xepersian-hm.def} {2020-04-26} {0.5b} { Fixes~implementation~of~Kashida~in~xepersian~package }
-
-\int_const:Nn \c_xephm_zwj_int {"200D} % zero-width joiner
-\int_const:Nn \c_xephm_lrm_int {"200E} % left-right-mark
-\int_const:Nn \c_xephm_two_int {2} % 2
-\int_const:Nn \c_xephm_four_int {4} % 4
-
-\int_new:N \l_xephm_counter_int
+\ProvidesExplFile {kashida-xepersian-hm.def} {2020-05-01} {0.5c} { Fixes~implementation~of~Kashida~in~xepersian~package }
 
 \newXeTeXintercharclass \c_xephm_d_charclass % dual-joiner class
 \newXeTeXintercharclass \c_xephm_l_charclass % lam
@@ -28,8 +21,6 @@
 \newXeTeXintercharclass \c_xephm_a_charclass % alef
 \newXeTeXintercharclass \c_xephm_y_charclass % yeh
 
-\dim_new:N \l_xephm_diff_pos_dim
-
 %% Partly adapted from LaTeX2e source
 \cs_new:Nn \xephm_line_break: {
   \if_mode_vertical:
@@ -62,8 +53,6 @@
   \xephm_put_line_breaks:n { #3 }
  }
 
-\tl_new:N \l_xephm_line_break_tl
-
 \cs_new_protected:Nn \xephm_put_line_breaks:n
  {
   \tl_set:Nn \l_xephm_line_break_tl { #1 }
@@ -173,11 +162,6 @@
     \XeTeXcharclass "#1 \c_xephm_y_charclass
   }
 
-\msg_new:nnx { xepersian-hm } { value-not-available-for-kashida-option }
-  {
-    Sorry,~ value~ `\l_xephm_gap_filler_tl'~ is~ not~ available~ for~ kashida~ option~ yet!
-  }
-
 \str_case:VnTF \l_xephm_gap_filler_tl
   {
     \l_xephm_stretch_glyph_tl
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 6c4c5d654c0..29f0b93fabb 100644
--- a/Master/texmf-dist/tex/xelatex/xepersian-hm/xepersian-hm.sty
+++ b/Master/texmf-dist/tex/xelatex/xepersian-hm/xepersian-hm.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% xepersian-hm.dtx  (with options: `xepersian-hm')
+%% xepersian-hm.dtx  (with options: `xepersian-hm-sty')
 %% 
 %% Copyright (C) 2020 Hossein Movahhedian
 %% 
@@ -31,32 +31,44 @@
 \RequirePackage{zref-savepos}[2020-03-03]
 \RequirePackage{xepersian}
 \ExplSyntaxOn
-\ProvidesExplPackage {xepersian-hm} {2020-04-26} {0.5b} { Fixes~issues~in~xepersian~package }
+\ProvidesExplPackage {xepersian-hm} {2020-05-01} {0.5c} { Fixes~issues~in~xepersian~package }
 
-\tl_new:N \l_xephm_main_font_full_tl
-\tl_new:N \l_xephm_main_font_name_tl
 \int_const:Nn \c_xephm_ksh_int {"0640} % kashida
-\int_new:N \l_xephm_kashida_slot_int
+\int_const:Nn \c_xephm_lrm_int {"200E} % left-right-mark
+\int_const:Nn \c_xephm_zwj_int {"200D} % zero-width joiner
 
-\tl_new:N \l_xephm_skip_default_tl
+\int_const:Nn \c_xephm_two_int {2} % 2
+\int_const:Nn \c_xephm_four_int {4} % 4
 
 \tl_const:Nn \c_xephm_skip_a_tl { 0 em plus 0.5 em }
-
 \tl_const:Nn \c_xephm_skip_b_tl { 0.14 em plus 5.5 em }
 
-\bool_set_false:N \l_xephm_kashida_hm_fix_bool
+\int_new:N \l_xephm_counter_int
 
-\tl_new:N \l_xephm_gap_filler_tl
-
-\bool_set_false:N \l_xephm_linebreakpenalty_bool
+\int_new:N \l_xephm_kashida_slot_int
 
 \int_new:N \l_xephm_line_break_penalty_int
+
 \int_new:N \l_xephm_min_penalty_int
 \int_new:N \l_xephm_low_penalty_int
 \int_new:N \l_xephm_med_penalty_int
 \int_new:N \l_xephm_high_penalty_int
 \int_new:N \l_xephm_max_penalty_int
 
+\tl_new:N \l_xephm_line_break_tl
+
+\tl_new:N \l_xephm_main_font_full_tl
+\tl_new:N \l_xephm_main_font_name_tl
+
+\tl_new:N \l_xephm_skip_default_tl
+
+\tl_new:N \l_xephm_gap_filler_tl
+
+\dim_new:N \l_xephm_diff_pos_dim
+
+\bool_set_false:N \l_xephm_kashida_hm_fix_bool
+\bool_set_false:N \l_xephm_linebreakpenalty_bool
+
 \int_set:Nn \l_xephm_min_penalty_int { 0 }
 \int_set:Nn \l_xephm_low_penalty_int { 8 }
 \int_set:Nn \l_xephm_med_penalty_int { 15 }
@@ -103,6 +115,11 @@
     Sorry,~ kashida~ character~ is~ not~ available~ in~ the~ main~ font~!
   }
 
+\msg_new:nnx { xepersian-hm } { value-not-available-for-kashida-option }
+  {
+    Sorry,~ value~ `\l_xephm_gap_filler_tl'~ is~ not~ available~ for~ kashida~ option~ yet~!
+  }
+
 \keys_define:nn { xepersian-hm }
   {
     Kashida .code:n =