xepersian (20sep11)

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

1 files changed, 13 insertions, 9 deletions

diff --git a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
index 80344b7f6f9..9a27dacf7cb 100644
--- a/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
+++ b/Master/texmf-dist/source/xelatex/xepersian/xepersian.dtx
@@ -5,10 +5,10 @@
 %<*readme>
 _________________
 The XePersian package
-v1.2.1
+v1.2.2
 
 XePersian is a package written for XeLaTeX that allows users to typeset
-Persian easily. The current version is 1.2.1 and it will be developed to
+Persian easily. The current version is 1.2.2 and it will be developed to
 meet the needs of Persian typesetting properly.
 
 The XePersian package is independent of any operating system, meaning it
@@ -207,7 +207,7 @@ by VAFA KHALIGHI.
 % Persian for \LaTeXe{} over \XeTeX}
 % \author{VAFA KHALIGHI\\
 %   \url{vafaklg@gmail.com}}
-% \date{\today\qquad Version 1.2.1}
+% \date{\today\qquad Version 1.2.2}
 %\maketitle
 %\tableofcontents
 %\section{Introduction}
@@ -227,7 +227,7 @@ by VAFA KHALIGHI.
 %Description: The package supports Persian
 %typesetting, using fonts provided in the distribution.
 %Copyright © 2008-2011 VAFA KHALIGHI
-%v1.2.1, 2011/10/01
+%v1.2.2, 2011/10/01
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/xetex/latex/xepersian
 %\end{lstlisting}
@@ -1598,7 +1598,9 @@ by VAFA KHALIGHI.
 %\end{BDef}
 %\begin{itemize}
 %\item The range of \texttt{harfi} counter is integers between 1 and 32 (number of the Persian alphabets) and \texttt{adadi} and \texttt{harfi} counters, are integers between 0 and 999,999,999.
-%\item \Lcs{harfinumeral} returns the \textbf{harfi} form of \Larga{integer}, where $1\leq integer\leq32$ and \Lcs{adadinumeral}, and \Lcs{tartibinumeral} return \textbf{adadi}, and \textbf{tartibi} form of \Larga{integer} respectively, where $0\leq integer\leq 999,999,999$.
+%\item For \texttt{harfi} counter, if you give an integer bigger than 32 or a negative integer (if you give integer 0, it returns nothing), then you get error and for \texttt{adadi} and \texttt{tartibi} counters, if you give an integer bigger than 999,999,999, then you get an error message.
+%\item For \texttt{adadi} and \texttt{tartibi} counters, if you give an integer less than 0 (a negative integer), then \texttt{adadi} and \texttt{tartibi} counters return \textbf{adadi} and \textbf{tartibi} form of the integer 0, respectively. 
+%\item \Lcs{harfinumeral} returns the \textbf{harfi} form of \Larga{integer}, where $1\leq integer\leq32$ and  \Lcs{adadinumeral}, and \Lcs{tartibinumeral} return \textbf{adadi}, and \textbf{tartibi} form of \Larga{integer} respectively, where $0\leq integer\leq 999,999,999$.
 %\end{itemize}
 %\subsection{Things To Know About \Lcs{setdigitfont}, \Lcs{setmathsfdigitfont}, and \Lcs{setmathttdigitfont}}
 %\begin{BDef}
@@ -5572,7 +5574,7 @@ U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
 % \subsection{\textsf{xepersian.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\xepersianversion{v1.2.1}
+\def\xepersianversion{v1.2.2}
 \def\xepersiandate{2011/10/01}
 \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space 
 Persian typesetting in XeLaTeX]
@@ -5862,7 +5864,9 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 }
 \let\adadinumeral\@adadi%
 \def\xepersian@numberoutofrange#1#2{%
-\number#1#2%
+\PackageError{xepersian}{The number `#1' is too large %
+to be formatted using xepersian}{The largest possible %
+number is 999,999,999.}%
 }
 \def\xepersian@numberstring#1#2#3#4{%
 \ifnum\number#1<\@ne%
@@ -6031,7 +6035,7 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \ifnum#2#3>\z@\ و \fi%
 \fi%
 \ifnum#2#3<20%
-\ifnum#5#2#3>\@ne#6{#2#3}\fi%
+\ifnum#5#2#3>\@ne\ifnum#1#2#3#4#5=10001 اول\else#6{#2#3}\fi\fi%
 \else%
 \xepersian@dahgan#2%
 \ifnum#3>\z@\ و \xepersian@yekanv#3\fi%
@@ -6039,7 +6043,7 @@ Location on CTAN: /macros/xetex/latex/xepersian}
 \fi%
 }
 \def\xepersian@tartibi#1{%
-\ifcase#1م\or اول\or دوم\or سوم\or چهارم%
+\ifcase#1م\or یکم\or دوم\or سوم\or چهارم%
 \or پنجم\or ششم\or هفتم\or هشتم\or نهم%
 \or دهم\or یازدهم\or دوازدهم\or سیزدهم%
 \or چهاردهم\or پانزدهم\or شانزدهم%