summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/akshar/akshar.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/akshar/akshar.sty')
-rw-r--r--Master/texmf-dist/tex/latex/akshar/akshar.sty36
1 files changed, 22 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/akshar/akshar.sty b/Master/texmf-dist/tex/latex/akshar/akshar.sty
index f3bf2b5d9cb..504c78abb62 100644
--- a/Master/texmf-dist/tex/latex/akshar/akshar.sty
+++ b/Master/texmf-dist/tex/latex/akshar/akshar.sty
@@ -32,8 +32,8 @@
%% ---------------------------------------------------------------------------
%%
\def\aksharPackageName{akshar}
-\def\aksharPackageVersion{0.1}
-\def\aksharPackageDate{2020/05/23}
+\def\aksharPackageVersion{0.2}
+\def\aksharPackageDate{2020/09/06}
\def\aksharPackageDescription{Support for syllables in the Devanagari script (JV)}
\RequirePackage{fontspec}
\ProvidesExplPackage {\aksharPackageName}
@@ -41,12 +41,16 @@
\tl_const:Nn \c__akshar_joining_tl { ्}
\tl_const:Nn \c__akshar_diacritics_tl
{
- ा, ि, ी, ु, ू, े, ै, ो, ौ, ं, ः, ॢ, ृ, ॅ, ँ, ़, ॆ, ॊ,
- ॉ, ॎ, ॏ, ॑, ॒, ॓, ॔, ॕ, ॖ, ॗ, ॄ, ऺ, ऻ, ꣠, ꣡, ꣢, ꣣, ꣤, ꣥,
- ꣦, ꣧, ꣨, ꣩, ꣪, ꣫, ꣬, ꣭, ꣮, ꣯, ꣰, ꣱, ꣿ
+ ा, ि, ी, ु, ू, े, ै, ो, ौ, ं, ः, ॢ, ृ,
+ ॅ, ँ, ़, ॆ, ॊ, ॉ, ॎ, ॏ, ॑, ॒, ॓, ॔, ॕ, ॖ, ॗ,
+ ॄ, ऺ, ऻ, ꣠, ꣡, ꣢, ꣣, ꣤, ꣥, ꣦, ꣧, ꣨, ꣩, ꣪,
+ ꣫, ꣬, ꣭, ꣮, ꣯, ꣰, ꣱, ꣿ
}
\bool_new:N \l__akshar_prev_joining_bool
\seq_new:N \l__akshar_char_seq
+\tl_const:Nx \c__akshar_str_g_tl { \tl_to_str:n {g} }
+\tl_const:Nx \c__akshar_str_seq_tl { \tl_to_str:n {seq} }
+\tl_const:Nx \c__akshar_str_comma_tl { \tl_to_str:n {,} }
\tl_new:N \l__akshar_tmpa_tl
\tl_new:N \l__akshar_tmpb_tl
\seq_new:N \l__akshar_tmpa_seq
@@ -88,8 +92,11 @@
\cs_generate_variant:Nn \seq_set_split:Nnn { Nxx }
\cs_generate_variant:Nn \msg_error:nnn { nnx }
\cs_generate_variant:Nn \msg_error:nnnnn { nnnxx }
-\tl_const:Nx \c__akshar_str_g_tl { \tl_to_str:n {g} }
-\tl_const:Nx \c__akshar_str_seq_tl { \tl_to_str:n {seq} }
+\prg_new_conditional:Npnn \__akshar_tl_if_in_ncomma:NN #1 #2 { T, F, TF }
+ {
+ \tl_if_eq:NNTF \c__akshar_str_comma_tl #2 { \prg_return_false: }
+ { \tl_if_in:NoTF #1 {#2} { \prg_return_true: } { \prg_return_false: } }
+ }
\prg_new_conditional:Npnn \__akshar_var_if_global:N #1 { T, F, TF }
{
\bool_if:nTF
@@ -154,7 +161,8 @@
\bool_set_false:N \l__akshar_prev_joining_bool
\tl_map_variable:NNn {#2} \l__akshar_map_tl
{
- \tl_if_in:NoTF \c__akshar_diacritics_tl {\l__akshar_map_tl}
+ \__akshar_tl_if_in_ncomma:NNTF
+ \c__akshar_diacritics_tl \l__akshar_map_tl
{
\seq_pop_right:NN \l__akshar_char_seq \l__akshar_tmpa_tl
\seq_put_right:Nx \l__akshar_char_seq
@@ -260,12 +268,12 @@
{ \seq_gset_eq:NN #1 \l__akshar_tmpa_seq }
{ \seq_set_eq:NN #1 \l__akshar_tmpa_seq }
}
-\NewExpandableDocumentCommand \aksharStrLen {m}
+\NewDocumentCommand \aksharStrLen {m}
{
\akshar_convert:Nn \l__akshar_tmpa_seq {#1}
\seq_count:N \l__akshar_tmpa_seq
}
-\NewExpandableDocumentCommand \aksharStrChar {mm}
+\NewDocumentCommand \aksharStrChar {mm}
{
\akshar_convert:Nn \l__akshar_tmpa_seq {#1}
\bool_if:nTF
@@ -281,7 +289,7 @@
\scan_stop:
}
}
-\NewExpandableDocumentCommand \aksharStrHead {m}
+\NewDocumentCommand \aksharStrHead {m}
{
\akshar_convert:Nn \l__akshar_tmpa_seq {#1}
\int_compare:nNnTF { \seq_count:N \l__akshar_tmpa_seq } = {0}
@@ -292,7 +300,7 @@
}
{ \seq_item:Nn \l__akshar_tmpa_seq { 1 } }
}
-\NewExpandableDocumentCommand \aksharStrTail {m}
+\NewDocumentCommand \aksharStrTail {m}
{
\akshar_convert:Nn \l__akshar_tmpa_seq {#1}
\int_compare:nNnTF { \seq_count:N \l__akshar_tmpa_seq } = {0}
@@ -303,7 +311,7 @@
}
{ \seq_item:Nn \l__akshar_tmpa_seq {\seq_count:N \l__akshar_tmpa_seq} }
}
-\NewExpandableDocumentCommand \aksharStrReplace {smmm}
+\NewDocumentCommand \aksharStrReplace {smmm}
{
\IfBooleanTF {#1}
{
@@ -316,7 +324,7 @@
}
\seq_use:Nn \l__akshar_tmpa_seq {}
}
-\NewExpandableDocumentCommand \aksharStrRemove {smm}
+\NewDocumentCommand \aksharStrRemove {smm}
{
\IfBooleanTF {#1}
{