summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-09 22:42:22 +0000
committerKarl Berry <karl@freefriends.org>2016-09-09 22:42:22 +0000
commit88326b0265503824247320367cec7787c6bfbdf5 (patch)
tree394c032bffe83188673d4bebedfa255fd4210d26 /Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
parentecb4ba2af7bc72e6d8b8adccc45796aa726bda97 (diff)
xepersian (9sep16)
git-svn-id: svn://tug.org/texlive/trunk@42028 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty')
-rw-r--r--Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty19
1 files changed, 12 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty
index df82acec371..8d79f133c78 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{10082}
+%% \CheckSum{10099}
%% \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\xepersianversion{v16.5}
-\def\xepersiandate{2016/05/03}
+\def\xepersianversion{v16.6}
+\def\xepersiandate{2016/09/09}
\ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space
Persian typesetting in XeLaTeX]
\RequirePackage{fontspec}
@@ -60,7 +60,7 @@ Persian typesetting in XeLaTeX]
* ^^J%
* Location on CTAN: /macros/xetex/latex/xepersian^^J%
* ^^J%
-* Issue tracker: https://github.com/persian-tex/xepersian/issues^^J%
+* Issue tracker: https://sourceforge.net/p/persian-tex/tickets^^J%
* ^^J%
* Support: persian-tex@tug.org^^J%
****************************************************}
@@ -358,7 +358,7 @@ Persian typesetting in XeLaTeX]
\@starttoc{toc}%
\end{multicols}}
{\PackageError{xepersian}{Oops! you should load multicol package before xepersian package for being able to use this command}{}}}
-\def\XePersian{\leavevmode$\smash{\hbox{X\lower.5ex
+\bidi@newrobustcmd*{\XePersian}{\leavevmode$\smash{\hbox{X\lower.5ex
\hbox{\kern-.125em\bidi@reflect@box{E}}Persian}}$}
\def\figurename{\if@RTL شکل\else Figure\fi}
\def\tablename{\if@RTL جدول\else Table\fi}
@@ -389,7 +389,7 @@ Persian typesetting in XeLaTeX]
\else\@ctrerr\fi}
\def\Abjad#1{\expandafter\@Abjad\csname c@#1\endcsname}
\let\Abjadnumeral\@Abjad
-\def\@harfi#1{\ifcase#1\or آ‍\or ب\or پ\or ت\or ث\or
+\def\@harfi#1{\ifcase#1\or آ\or ب\or پ\or ت\or ث\or
ج\or چ\or ح\or خ\or د\or ذ\or ر\or ز\or ژ\or س\or ش\or ص\or ض\or ط\or ظ\or ع\or غ\or
ف\or ق\or ک\or گ\or ل\or م\or ن\or و\or ه\or ی\else\@ctrerr\fi}
\def\harfi#1{\expandafter\@harfi\csname c@#1\endcsname}
@@ -575,11 +575,16 @@ number is 999,999,999.}%
\ifnum#2#3<20%
\ifnum#5#2#3>\@ne\ifnum#1#2#3#4#5=10001 اول\else#6{#2#3}\fi\fi%
\else%
-\xepersian@dahgan#2%
+\xepersian@dahgan@tartibi#2%
\ifnum#3>\z@\ و \xepersian@yekanv#3\fi%
#60%
\fi%
}
+\def\xepersian@dahgan@tartibi#1{%
+\ifcase#1\or\or بیست\or سی‌ا\or چهل%
+\or پنجاه\or شصت\or هفتاد\or هشتاد%
+\or نود\fi%
+}
\def\xepersian@tartibi#1{%
\ifcase#1م\or یکم\or دوم\or سوم\or چهارم%
\or پنجم\or ششم\or هفتم\or هشتم\or نهم%