diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2011-08-03 13:12:51 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2011-08-03 13:12:51 +0000 |
commit | 5bbe15e9a12a7f0e669dbca67001fcd0e0f2aa48 (patch) | |
tree | 8ac5dda3f30da6b7088d9fabc6c1e0bd2d4827ac /Master/texmf-dist/tex | |
parent | b4bf58caca096bc3377bc47cf94db66069316dcf (diff) |
xepersian v1.1.6
git-svn-id: svn://tug.org/texlive/trunk@23383 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
55 files changed, 1467 insertions, 104 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def index 888cf89aade..e519cdc9ce1 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def @@ -17,7 +17,7 @@ \def\ALGS@name{الگوریتمها} \def\listalgorithmname{\if@RTL لیست \ALGS@name\else List of \ALG@name s\fi} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def index 7722b2ecb92..bb4a0940d4d 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def @@ -16,7 +16,7 @@ \def\algorithmicrequire{\if@RTL\textbf{ورودی:}\else\textbf{Require:}\fi} \def\algorithmicensure{\if@RTL\textbf{خروجی:}\else\textbf{Ensure:}\fi} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def index 2b7f7fefb43..a00dcc33555 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def @@ -60,7 +60,7 @@ \insert\footins{\unvbox\footins}% \endgroup} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def index e74f142f336..326c92081fe 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def @@ -62,7 +62,7 @@ \insert\footins{\unvbox\footins}% \endgroup} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def index 51dafdd2dea..58cc3f5e743 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def @@ -19,7 +19,7 @@ \setcounter{subsection}{0}% \gdef\thesection{\@harfi\c@section}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def index 8abac49067d..ef04422dfb3 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def @@ -19,7 +19,7 @@ \setcounter{subsection}{0}% \gdef\thesection{\@harfi\c@section}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def index d8baba34552..488ce5908ce 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def @@ -19,7 +19,7 @@ \setcounter{subsection}{0}% \gdef\thesection{\@harfi\c@section}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def index 5194380befa..633e6c7dda8 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def @@ -19,7 +19,7 @@ \setcounter{subsection}{0}% \gdef\thesection{\@harfi\c@section}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def index 2f3c6b940da..9c182ba8e24 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def @@ -33,7 +33,7 @@ }% }% %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def index 16f48077690..879090d45e5 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/bidicode-xepersian.def @@ -14,7 +14,7 @@ %% \ProvidesFile{bidicode-xepersian.def}[2010/07/25 v0.0 Persian captions for bidicode package] %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def index 318209825dd..ef0dc932287 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def @@ -15,7 +15,7 @@ \ProvidesFile{bidimoderncv-xepersian.def}[2010/07/25 v0.1 adaptations for bidimoderncv class] \def\refname{\if@RTL تألیفات\else Publications\fi} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def new file mode 100644 index 00000000000..a0dafa3271a --- /dev/null +++ b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def @@ -0,0 +1,97 @@ +%% +%% This is file `bidituftesidenote-xepersian.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% xepersian.dtx (with options: `bidituftesidenote-xepersian.def') +%% +%% ______________________________________ +%% Copyright © 2008–2011 Vafa Khalighi +%% +%% License information appended. +%% +%% +\ProvidesFile{bidituftesidenote-xepersian.def}[2011/06/18 v0.1 xepersian changes to bidituftesidenote package] +\long\def\@LTRbidituftesidenote@sidenote[#1][#2]#3{% + \let\cite\@bidituftesidenote@infootnote@cite% use the in-sidenote \cite command + \gdef\@bidituftesidenote@citations{}% clear out any old citations + \ifthenelse{\NOT\isempty{#2}}{% + \gsetlength{\@bidituftesidenote@sidenote@vertical@offset}{#2}% + }{% + \gsetlength{\@bidituftesidenote@sidenote@vertical@offset}{0pt}% + }% + \ifthenelse{\isempty{#1}}{% + % no specific footnote number provided + \stepcounter\@mpfn% + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark\@LTRfootnotetext[\@bidituftesidenote@sidenote@vertical@offset]{\latinfont#3}% + }{% + % specific footnote number provided + \begingroup% + \csname c@\@mpfn\endcsname #1\relax% + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup% + \@footnotemark\@LTRfootnotetext[\@bidituftesidenote@sidenote@vertical@offset]{\latinfont#3}% + }% + \@bidituftesidenote@print@citations% print any citations + \let\cite\@bidituftesidenote@normal@cite% go back to using normal in-text \cite command + \unskip\ignorespaces% remove extra white space + \kern-\multiplefootnotemarker% remove \kern left behind by sidenote + \kern\multiplefootnotemarker\relax% add new \kern here to replace the one we yanked +} +\long\def\@RTLbidituftesidenote@sidenote[#1][#2]#3{% + \let\cite\@bidituftesidenote@infootnote@cite% use the in-sidenote \cite command + \gdef\@bidituftesidenote@citations{}% clear out any old citations + \ifthenelse{\NOT\isempty{#2}}{% + \gsetlength{\@bidituftesidenote@sidenote@vertical@offset}{#2}% + }{% + \gsetlength{\@bidituftesidenote@sidenote@vertical@offset}{0pt}% + }% + \ifthenelse{\isempty{#1}}{% + % no specific footnote number provided + \stepcounter\@mpfn% + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark\@RTLfootnotetext[\@bidituftesidenote@sidenote@vertical@offset]{\persianfont#3}% + }{% + % specific footnote number provided + \begingroup% + \csname c@\@mpfn\endcsname #1\relax% + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup% + \@footnotemark\@RTLfootnotetext[\@bidituftesidenote@sidenote@vertical@offset]{\persianfont#3}% + }% + \@bidituftesidenote@print@citations% print any citations + \let\cite\@bidituftesidenote@normal@cite% go back to using normal in-text \cite command + \unskip\ignorespaces% remove extra white space + \kern-\multiplefootnotemarker% remove \kern left behind by sidenote + \kern\multiplefootnotemarker\relax% add new \kern here to replace the one we yanked +} +\renewcommand\LTRmarginnote[2][0pt]{% + \let\cite\@bidituftesidenote@infootnote@cite% use the in-sidenote \cite command + \gdef\@bidituftesidenote@citations{}% clear out any old citations + \LTRbidituftesidenotemarginpar{\hbox{}\vspace*{#1}\@bidituftesidenote@marginnote@font\latinfont\@bidituftesidenote@marginnote@justification\@bidituftesidenote@margin@par\vspace*{-1\baselineskip}\noindent #2}% + \@bidituftesidenote@print@citations% print any citations + \let\cite\@bidituftesidenote@normal@cite% go back to using normal in-text \cite command +} +\renewcommand\RTLmarginnote[2][0pt]{% + \let\cite\@bidituftesidenote@infootnote@cite% use the in-sidenote \cite command + \gdef\@bidituftesidenote@citations{}% clear out any old citations + \RTLbidituftesidenotemarginpar{\hbox{}\vspace*{#1}\@bidituftesidenote@marginnote@font\persianfont\@bidituftesidenote@marginnote@justification\@bidituftesidenote@margin@par\vspace*{-1\baselineskip}\noindent #2}% + \@bidituftesidenote@print@citations% print any citations + \let\cite\@bidituftesidenote@normal@cite% go back to using normal in-text \cite command +} +%% +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> +%% +%% It may be distributed and/or modified under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is “author-maintained” (as per LPPL maintenance status) +%% by Vafa Khalighi. +%% +%% +%% +%% +%% End of file `bidituftesidenote-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def index b2f27a957c5..1a21f0d3f52 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def @@ -24,7 +24,7 @@ \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@harfi\c@chapter}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def index b181a9f871a..bc9ff089071 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def @@ -24,7 +24,7 @@ \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@harfi\c@chapter}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def index 7b9cc65bfa1..3ae3a8faa29 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def @@ -25,7 +25,7 @@ \gdef\thechapter{\@harfi\c@chapter} }%end appendix %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def index 2ab095158dc..25b227f0f5c 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def @@ -21,7 +21,7 @@ \gdef\thechapter{\@harfi\c@chapter} }%end appendix %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def index 66033863c1a..80ec8c9829f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def @@ -53,7 +53,7 @@ \ignorespaces } %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def b/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def index 45293b1eaf9..732cd4b5d71 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/color-localise.def @@ -22,7 +22,7 @@ \تعریفرنگ{بنفش}{cmyk}{0,1,0,0} \تعریفرنگ{زرد}{cmyk}{0,0,1,0} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def index bd3a68aec71..9dd25ed1356 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-ltx.def @@ -957,7 +957,7 @@ \eqcommand{@فر}{z@} \eqcommand{@فرفاصله}{z@skip} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def index 426b73bdb1f..0dedfd5b775 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/commands-xepersian.def @@ -67,10 +67,9 @@ \eqcommand{زیپرشین}{XePersian} \eqcommand{گونهزیپرشین}{xepersianversion} \eqcommand{تاریخگونهزیپرشین}{xepersiandate} -\eqcommand{ممیزیگونهزیپرشین}{xepersiancommit} \eqcommand{زیتک}{XeTeX} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def index 759b7631be9..6661c68b45a 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/empheq-xepersian.def @@ -16,7 +16,7 @@ \def\tagform@#1{\maketag@@@{\if@Latin\else\beginR\fi(\ignorespaces#1\unskip\@@italiccorr)\if@Latin\else\endR\fi}} \def\text#1{\@@text{\if@Latin\else\beginR\fi#1\if@Latin\else\endR\fi}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def index e16d0c3f08d..9ae1f2058a7 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def @@ -30,7 +30,7 @@ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \@tempa} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def index fab231ac26b..72aae55ad80 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def @@ -59,7 +59,7 @@ \eqenvironment{همانطورکههست*}{verbatim*} \eqenvironment{شعر}{verse} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def index d39a5406908..ab2b6824c3b 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-xepersian.def @@ -24,7 +24,7 @@ \eqenvironment{شعرسنتی}{traditionalpoem} \eqenvironment{شعرسنتی*}{traditionalpoem*} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def index 2f44b97e65f..3929cc27b1c 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def @@ -19,7 +19,7 @@ \setcounter{subsection}{0}% \gdef\thesection{\@harfi\c@section}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def index 4ab36f165e2..d3b3ea77edd 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def @@ -25,7 +25,7 @@ \gdef\thechapter{\@harfi\c@chapter} }%end appendix %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def new file mode 100644 index 00000000000..ba8f30a65a3 --- /dev/null +++ b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def @@ -0,0 +1,704 @@ +%% +%% This is file `extrafootnotefeatures-xepersian.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% xepersian.dtx (with options: `extrafootnotefeatures-xepersian.def') +%% +%% ______________________________________ +%% Copyright © 2008–2011 Vafa Khalighi +%% +%% License information appended. +%% +%% +\ProvidesFile{extrafootnotefeatures-xepersian.def}[2011/08/01 v0.1 footnote macros for extrafootnotefeatures option of xepersian package] +\renewcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@twocolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@twocolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@twocolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@twocolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mptwocolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@twocolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mptwocolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@twocolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mptwocolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@twocolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@threecolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@threecolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@threecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@threecolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpthreecolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@threecolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpthreecolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@threecolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpthreecolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@threecolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@fourcolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@fourcolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@fourcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@fourcolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpfourcolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@fourcolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpfourcolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@fourcolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpfourcolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@fourcolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@fivecolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@fivecolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@fivecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@fivecolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpfivecolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@fivecolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpfivecolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@fivecolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpfivecolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@fivecolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@sixcolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@sixcolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@sixcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@sixcolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpsixcolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@sixcolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpsixcolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@sixcolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpsixcolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@sixcolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@sevencolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@sevencolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@sevencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@sevencolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpsevencolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@sevencolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpsevencolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@sevencolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpsevencolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@sevencolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@eightcolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@eightcolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@eightcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@eightcolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpeightcolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@eightcolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpeightcolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@eightcolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpeightcolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@eightcolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@ninecolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@ninecolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@ninecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@ninecolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpninecolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@ninecolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpninecolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@ninecolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mpninecolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@ninecolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@tencolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@tencolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@tencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@tencolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mptencolfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@tencolfootfmt{\if@RTL@footnote\else\latinfont\fi#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mptencolLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \if@RTLcolumnfootnotes\beginL\fi + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@tencolfootfmt{\latinfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@mptencolRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@tencolfootfmt{\persianfont#1}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@parafootnotetext}[1]{\insert\footinsv@r{\@RTLfalse + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \setbox0=\vbox{\hsize=\maxdimen + \color@begingroup + \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\latinfont\fi#1\if@RTL@footnote\endR\else\endL\fi}% + \color@endgroup}% + \m@mungebox}\m@mmf@prepare} +\renewcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \setbox0=\vbox{\hsize=\maxdimen + \color@begingroup + \noindent \@parafootfmt{\beginL\latinfont#1\endL}% + \color@endgroup}% + \m@mungebox}\m@mmf@prepare} +\renewcommand{\@paraRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \@preamfntext + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \setbox0=\vbox{\hsize=\maxdimen + \color@begingroup + \noindent \@parafootfmt{\beginR\persianfont#1\endR}% + \color@endgroup}% + \m@mungebox}\m@mmf@prepare} +\renewcommand{\@mpparafootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \setbox0=\vbox{\hsize=\maxdimen + \color@begingroup + \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\latinfont\fi#1\if@RTL@footnote\endR\else\endL\fi}% + \color@endgroup}% + \m@mungebox}\m@mmf@prepare} +\renewcommand{\@mpparaLTRfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \setbox0=\vbox{\hsize=\maxdimen + \color@begingroup + \noindent \@parafootfmt{\beginL\latinfont#1\endL}% + \color@endgroup}% + \m@mungebox}\m@mmf@prepare} +\renewcommand{\@mpparaRTLfootnotetext}[1]{% + \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@r + \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font\foottextfont + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@mpfootnote\endcsname\@thefnmark}% + \setbox0=\vbox{\hsize=\maxdimen + \color@begingroup + \noindent \@parafootfmt{\beginR\persianfont#1\endR}% + \color@endgroup}% + \m@mungebox}\m@mmf@prepare} +%% +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> +%% +%% It may be distributed and/or modified under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is “author-maintained” (as per LPPL maintenance status) +%% by Vafa Khalighi. +%% +%% +%% +%% +%% End of file `extrafootnotefeatures-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def index cd6f20dc09d..bf005daa8fa 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def @@ -20,7 +20,7 @@ \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@harfi\c@chapter}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def index eb1b5c9e5cb..44ca4a32af6 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def @@ -42,7 +42,7 @@ \setcounter{displayedframe}{0}% \let\firstmark\botmark} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def index 1a2a64542b8..9d3ae5c60c9 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/footnote-bidi-xepersian.def @@ -98,7 +98,7 @@ \rule\z@\footnotesep\ignorespaces\latinfont#1\@finalstrut\strutbox}% \color@endgroup}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def index 8748f025645..8d8580813c7 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def @@ -40,7 +40,7 @@ } } %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def index c419fa26e19..97fe99bf0fd 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def @@ -12,18 +12,18 @@ %% License information appended. %% %% -\ProvidesFile{kashida-xepersian.def}[2010/07/25 v0.1 implementation of Kashida for xepersian package] -\chardef\zwj="200D % zero-width joiner -\chardef\ksh="0640 % kashida +\ProvidesFile{kashida-xepersian.def}[2010/07/25 v0.2 implementation of Kashida for xepersian package] +\chardef\xepersian@zwj="200D % zero-width joiner +\chardef\xepersian@ksh="0640 % kashida -\chardef\D=10 % dual-joiner class -\chardef\L=11 % lam -\chardef\R=12 % right-joiner -\chardef\A=13 % alef -\chardef\V=256 % vowel or other combining mark (to be ignored) +\chardef\xepersian@D=10 % dual-joiner class +\chardef\xepersian@L=11 % lam +\chardef\xepersian@R=12 % right-joiner +\chardef\xepersian@A=13 % alef +\chardef\xepersian@V=256 % vowel or other combining mark (to be ignored) -\def\kashida{\zwj\nobreak \setbox0=\hbox{\ksh}% - \leaders\hrule height\ht0 \hskip0pt plus 0.5em \zwj} +\def\xepersian@kashida{\xepersian@zwj\nobreak \setbox0=\hbox{\xepersian@ksh}% + \leaders\hrule height\ht0 \hskip0pt plus 0.5em \xepersian@zwj} \def\setclass#1#2{\def\theclass{#1}\def\charlist{#2}% \expandafter\dosetclass\charlist,\end} @@ -35,29 +35,29 @@ \expandafter\next\charlist,,\end} \def\finishsetclass#1,,\end{} -\setclass \A {0622,0623,0625,0627} -\setclass \R {0624,0629,062F,0630,0631,0632,0648,0698} -\setclass \D {0626,0628,062A,062B,062C,062D,062E} -\setclass \D {0633,0634,0635,0636,0637,0638,0639,063A} -\setclass \D {0640,0641,0642,0643,0645,0646,0647,0649,064A} -\setclass \D {067E,0686,06A9,06AF,06CC} -\setclass \L {0644} -\setclass \V {064B,064C,064D,064E,064F,0650,0651,0652} +\setclass \xepersian@A {0622,0623,0625,0627} +\setclass \xepersian@R {0624,0629,062F,0630,0631,0632,0648,0698} +\setclass \xepersian@D {0626,0628,062A,062B,062C,062D,062E} +\setclass \xepersian@D {0633,0634,0635,0636,0637,0638,0639,063A} +\setclass \xepersian@D {0640,0641,0642,0643,0645,0646,0647,0649,064A} +\setclass \xepersian@D {067E,0686,06A9,06AF,06CC} +\setclass \xepersian@L {0644} +\setclass \xepersian@V {064B,064C,064D,064E,064F,0650,0651,0652} -\XeTeXinterchartoks \D \D = {\kashida} -\XeTeXinterchartoks \L \D = {\kashida} -\XeTeXinterchartoks \D \L = {\kashida} -\XeTeXinterchartoks \L \L = {\kashida} -\XeTeXinterchartoks \D \R = {\kashida} -\XeTeXinterchartoks \D \A = {\kashida} -\XeTeXinterchartoks \L \R = {\kashida} -\XeTeXinterchartoks \L \A = {} +\XeTeXinterchartoks \xepersian@D \xepersian@D = {\xepersian@kashida} +\XeTeXinterchartoks \xepersian@L \xepersian@D = {\xepersian@kashida} +\XeTeXinterchartoks \xepersian@D \xepersian@L = {\xepersian@kashida} +\XeTeXinterchartoks \xepersian@L \xepersian@L = {\xepersian@kashida} +\XeTeXinterchartoks \xepersian@D \xepersian@R = {\xepersian@kashida} +\XeTeXinterchartoks \xepersian@D \xepersian@A = {\xepersian@kashida} +\XeTeXinterchartoks \xepersian@L \xepersian@R = {\xepersian@kashida} +\XeTeXinterchartoks \xepersian@L \xepersian@A = {} \newcommand{\KashidaOn}{\XeTeXinterchartokenstate=1} \newcommand{\KashidaOff}{\XeTeXinterchartokenstate=0} \KashidaOn %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def index 23f238f5db3..07aa6111781 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def @@ -16,7 +16,7 @@ \def\lstlistingname{\if@RT برنامهٔ\else Listing\fi} \def\lstlistlistingname{\if@RTL فهرست برنامهها\else Listings\fi} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def index cb392118d7b..d0d0e086e08 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-bidi-xepersian.def @@ -36,7 +36,7 @@ \fi% } %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def index 860ffc7c487..25fd001ce3a 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def @@ -27,7 +27,7 @@ \input{misc-localise-xepersian.def} \input{packages-localise-xepersian.def} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def index f35e6141c5a..9fdf31bd7b9 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def @@ -25,7 +25,7 @@ \gdef\thechapter{\@harfi\c@chapter}% \anappendixtrue} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def b/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def index 4677c792928..63d2a7188e6 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/messages-localise.def @@ -14,7 +14,7 @@ %% \آمادهسازیپرونده{messages-localise.def}[2011/03/01 v0.1 localising LaTeX2e messages] %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def index 08d22a4d663..67a99b9aec9 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def @@ -23,7 +23,7 @@ \def\slftitle{\if@RTL اشکال\else Figures\fi}% \def\slttitle{\if@RTL جداول\else Tables\fi}% %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def index 8a3cb25e416..8ae3732729d 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def @@ -24,8 +24,318 @@ \بگسترپساز\@خورحریصانهدو\رشته#2\پایاننامفرمان {\بگذار#1#2}} \بگذار\تعریفنشده\undefined +\@ifdefinitionfileloaded{xetex-bidi}{% +\def\@xfloat #1[#2]{% + \@nodocument + \def \@captype {#1}% + \def \@fps {#2}% + \@onelevel@sanitize \@fps + \def \reserved@b {!}% + \ifx \reserved@b \@fps + \@fpsadddefault + \else + \ifx \@fps \@empty + \@fpsadddefault + \fi + \fi + \ifhmode + \@bsphack + \@floatpenalty -\@Mii + \else + \@floatpenalty-\@Miii + \fi + \ifinner + \@parmoderr\@floatpenalty\z@ + \else + \@next\@currbox\@freelist + {% + \@tempcnta \sixt@@n + \expandafter \@tfor \expandafter \reserved@a + \expandafter :\expandafter =\@fps + \do + {% + \if \reserved@a h% + \ifodd \@tempcnta + \else + \advance \@tempcnta \@ne + \fi + \fi + \if \reserved@a ا% + \ifodd \@tempcnta + \else + \advance \@tempcnta \@ne + \fi + \fi + \if \reserved@a t% + \@setfpsbit \tw@ + \fi + \if \reserved@a ب% + \@setfpsbit \tw@ + \fi + \if \reserved@a b% + \@setfpsbit 4% + \fi + \if \reserved@a ز% + \@setfpsbit 4% + \fi + \if \reserved@a p% + \@setfpsbit 8% + \fi + \if \reserved@a ص% + \@setfpsbit 8% + \fi + \if \reserved@a !% + \ifnum \@tempcnta>15 + \advance\@tempcnta -\sixt@@n\relax + \fi + \fi + }% + \@tempcntb \csname ftype@\@captype \endcsname + \multiply \@tempcntb \@xxxii + \advance \@tempcnta \@tempcntb + \global \count\@currbox \@tempcnta + }% + \@fltovf + \fi + \global \setbox\@currbox + \color@vbox + \normalcolor + \vbox \bgroup + \hsize\columnwidth + \@parboxrestore + \@floatboxreset +} +\let\bm@و\bm@c +\let\bm@چ\bm@l +\let\bm@ر\bm@r +\let\bm@ز\bm@b +\let\bm@ب\bm@t +\let\bm@ک\bm@s +\long\def\@iiiparbox#1#2[#3]#4#5{% + \leavevmode + \@pboxswfalse + \setlength\@tempdima{#4}% + \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}% + \ifx\relax#2\else + \setlength\@tempdimb{#2}% + \edef\@parboxto{to\the\@tempdimb}% + \fi + \if#1b\vbox + \else\if#1ز\vbox + \else\if #1t\vtop + \else\if #1ب\vtop + \else\ifmmode\vcenter + \else\@pboxswtrue $\vcenter + \fi\fi\fi\fi\fi + \@parboxto{\let\hss\vss\let\unhbox\unvbox + \csname bm@#3\endcsname}% + \if@pboxsw \m@th$\fi + \@end@tempboxa} +\def\@testpach#1{\@chclass \ifnum \@lastchclass=\tw@ 4 \else + \ifnum \@lastchclass=3 5 \else + \z@ \if #1c\@chnum \z@ \else + \if #1و\@chnum \z@ \else + \if \if@RTLtab#1r\else#1l\fi\@chnum \@ne \else + \if \if@RTLtab#1ر\else#1چ\fi\@chnum \@ne \else + \if \if@RTLtab#1l\else#1r\fi\@chnum \tw@ \else + \if \if@RTLtab#1چ\else#1ر\fi\@chnum \tw@ \else + \@chclass \if #1|\@ne \else + \if #1@\tw@ \else + \if #1p3 \else + \if #1پ3 \else \z@ \@preamerr 0\fi + \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi +\fi}% +}{} +\@ifdefinitionfileloaded{array-xetex-bidi}{% +\def\@testpach{\@chclass + \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else + \ifnum \@lastchclass=7 5 \else + \ifnum \@lastchclass=8 \tw@ \else + \ifnum \@lastchclass=9 \thr@@ + \else \z@ + \ifnum \@lastchclass = 10 \else + \edef\@nextchar{\expandafter\string\@nextchar}% + \@chnum + \if \@nextchar c\z@ \else + \if \@nextchar و\z@ \else + \if \@nextchar \if@RTLtab r\else l\fi\@ne \else + \if \@nextchar \if@RTLtab ر\else چ\fi\@ne \else + \if \@nextchar \if@RTLtab l\else r\fi\tw@ \else + \if \@nextchar \if@RTLtab چ\else ر\fi\tw@ \else + \z@ \@chclass + \if\@nextchar |\@ne \else + \if \@nextchar !6 \else + \if \@nextchar @7 \else + \if \@nextchar <8 \else + \if \@nextchar >9 \else + 10 + \@chnum + \if \@nextchar m\thr@@\else + \if \@nextchar م\thr@@\else + \if \@nextchar p4 \else + \if \@nextchar پ4 \else + \if \@nextchar b5 \else + \if \@nextchar ز5 \else + \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi \fi \fi \fi + \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi}% +}{} +\@ifdefinitionfileloaded{arydshln-xetex-bidi}{ +\ifadl@usingarypkg +\def\@testpach{\@chclass + \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else + \ifnum \@lastchclass=7 5 \else + \ifnum \@lastchclass=8 \tw@ \else + \ifnum \@lastchclass=9 \thr@@ + \else \z@ + \ifnum \@lastchclass = 10 \else + \edef\@nextchar{\expandafter\string\@nextchar}% + \@chnum + \if \@nextchar c\z@ \else + \if \@nextchar و\z@ \else + \if \@nextchar \if@RTLtab r\else l\fi\@ne \else + \if \@nextchar \if@RTLtab ر\else چ\fi\@ne \else + \if \@nextchar \if@RTLtab l\else r\fi\tw@ \else + \if \@nextchar \if@RTLtab چ\else ر\fi\tw@ \else + \z@ \@chclass + \if\@nextchar |\@ne \let\@arrayrule\adl@arrayrule \else + \if\@nextchar :\@ne \let\@arrayrule\adl@arraydashrule \else + \if\@nextchar ;\@ne \let\@arrayrule\adl@argarraydashrule \else + \if \@nextchar !6 \else + \if \@nextchar @7 \else + \if \@nextchar <8 \else + \if \@nextchar >9 \else + 10 + \@chnum + \if \@nextchar m\thr@@\else + \if \@nextchar م\thr@@\else + \if \@nextchar p4 \else + \if \@nextchar پ4 \else + \if \@nextchar b5 \else + \if \@nextchar ز5 \else + \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi \fi \fi \fi \fi \fi + \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi} + +\def\@classz{\@classx + \@tempcnta \count@ + \prepnext@tok + \@addtopreamble{\ifcase \@chnum + \hfil + \adl@putlrc{\d@llarbegin \insert@column \d@llarend}\hfil \or + \hskip1sp\adl@putlrc{\d@llarbegin \insert@column \d@llarend}\hfil \or + \hfil\hskip1sp\adl@putlrc{\d@llarbegin \insert@column \d@llarend}\or + \setbox\adl@box\hbox \adl@startmbox{\@nextchar}\insert@column + \adl@endmbox\or + \setbox\adl@box\vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or + \setbox\adl@box\vbox \@startpbox{\@nextchar}\insert@column \@endpbox + \fi}\prepnext@tok} +\def\adl@class@start{4} +\def\adl@class@iiiorvii{7} + +\else +\def\@testpach#1{\@chclass \ifnum \@lastchclass=\tw@ 4\relax \else + \ifnum \@lastchclass=\thr@@ 5\relax \else + \z@ \if #1c\@chnum \z@ \else + \if #1و\@chnum\z@ \else + \if \if@RTLtab#1r\else#1l\fi\@chnum \@ne \else + \if \if@RTLtab#1ر\else#1چ\fi\@chnum \@ne \else + \if \if@RTLtab#1l\else#1r\fi\@chnum \tw@ \else + \if \if@RTLtab#1چ\else#1ر\fi\@chnum \tw@ \else + \@chclass + \if #1|\@ne \let\@arrayrule\adl@arrayrule \else + \if #1:\@ne \let\@arrayrule\adl@arraydashrule \else + \if #1;\@ne \let\@arrayrule\adl@argarraydashrule \else + \if #1@\tw@ \else + \if #1p\thr@@ \else + \if #1پ\thr@@ \else\z@ \@preamerr 0\fi + \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi} + +\def\@arrayclassz{\ifcase \@lastchclass \@acolampacol \or \@ampacol \or + \or \or \@addamp \or + \@acolampacol \or \@firstampfalse \@acol \fi + \edef\@preamble{\@preamble + \ifcase \@chnum + \hfil\adl@putlrc{$\relax\@sharp$}\hfil + \or \adl@putlrc{$\relax\@sharp$}\hfil + \or \hfil\adl@putlrc{$\relax\@sharp$}\fi}} +\def\@tabclassz{\ifcase \@lastchclass \@acolampacol \or \@ampacol \or + \or \or \@addamp \or + \@acolampacol \or \@firstampfalse \@acol \fi + \edef\@preamble{\@preamble + \ifcase \@chnum + \hfil\adl@putlrc{\@sharp\unskip}\hfil + \or \adl@putlrc{\@sharp\unskip}\hfil + \or \hfil\hskip\z@ \adl@putlrc{\@sharp\unskip}\fi}} +\def\adl@class@start{6} +\def\adl@class@iiiorvii{3} +\fi +}{} +\@ifdefinitionfileloaded{tabulary-xetex-bidi}{% +\def\@testpach{\@chclass + \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else + \ifnum \@lastchclass=7 5 \else + \ifnum \@lastchclass=8 \tw@ \else + \ifnum \@lastchclass=9 \thr@@ + \else \z@ + \ifnum \@lastchclass = 10 \else + \edef\@nextchar{\expandafter\string\@nextchar}% + \@chnum + \if \@nextchar c\z@ \else + \if \@nextchar و\z@ \else + \if \@nextchar \if@RTLtab r\else l\fi\@ne \else + \if \@nextchar \if@RTLtab ر\else چ\fi\@ne \else + \if \@nextchar \if@RTLtab l\else r\fi\tw@ \else + \if \@nextchar \if@RTLtab چ\else ر\fi\tw@ \else + \if \@nextchar C7 \else + \if \@nextchar س7 \else + \if \@nextchar L8 \else + \if \@nextchar ف8 \else + \if \@nextchar R9 \else + \if \@nextchar ا9 \else + \if \@nextchar J10 \else + \if \@nextchar ت10 \else + \z@ \@chclass + \if\@nextchar |\@ne \else + \if \@nextchar !6 \else + \if \@nextchar @7 \else + \if \@nextchar <8 \else + \if \@nextchar >9 \else + 10 + \@chnum + \if \@nextchar m\thr@@\else + \if \@nextchar م\thr@@\else + \if \@nextchar p4 \else + \if \@nextcharپ4 \else + \if \@nextchar b5 \else + \if \@nextchar ز5 \else + \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi \fi \fi \fi \fi \fi \fi \fi + \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi}% +}{} +\@ifdefinitionfileloaded{float-xetex-bidi}{% +\let\@float@Hx\@xfloat +\def\@xfloat#1[{\@ifnextchar{H}{\@float@HH{#1}[}{\@ifnextchar{آ}{\@float@آآ{#1}[}{\@float@Hx{#1}[}}} +\def\@float@HH#1[H]{% + \expandafter\let\csname end#1\endcsname\float@endH + \let\@currbox\float@box + \def\@captype{#1}\setbox\@floatcapt=\vbox{}% + \expandafter\ifx\csname fst@#1\endcsname\relax + \@flstylefalse\else\@flstyletrue\fi + \setbox\@currbox\color@vbox\normalcolor + \vbox\bgroup \hsize\columnwidth \@parboxrestore + \@floatboxreset \@setnobreak + \ignorespaces} +\def\@float@آآ#1[آ]{% + \expandafter\let\csname end#1\endcsname\float@endH + \let\@currbox\float@box + \def\@captype{#1}\setbox\@floatcapt=\vbox{}% + \expandafter\ifx\csname fst@#1\endcsname\relax + \@flstylefalse\else\@flstyletrue\fi + \setbox\@currbox\color@vbox\normalcolor + \vbox\bgroup \hsize\columnwidth \@parboxrestore + \@floatboxreset \@setnobreak + \ignorespaces} +}{} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def index dea3ff0cac9..616a346e089 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/multicol-xepersian.def @@ -98,7 +98,7 @@ \rule\z@\footnotesep\ignorespaces\latinfont#1\@finalstrut\strutbox}% \color@endgroup}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def new file mode 100644 index 00000000000..725139762ae --- /dev/null +++ b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def @@ -0,0 +1,243 @@ +%% +%% This is file `natbib-xepersian.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% xepersian.dtx (with options: `natbib-xepersian.def') +%% +%% ______________________________________ +%% Copyright © 2008–2011 Vafa Khalighi +%% +%% License information appended. +%% +%% +\ProvidesFile{natbib-xepersian.def}[2011/08/01 v0.1 adaptations for natbib package] +\renewcommand\NAT@set@cites{% + \ifNAT@numbers + \ifNAT@super \let\@cite\NAT@citesuper + \def\NAT@mbox##1{\unskip\nobreak\textsuperscript{##1}}% + \let\citeyearpar=\citeyear + \let\NAT@space\relax + \def\NAT@super@kern{\kern\p@}% + \else + \let\NAT@mbox=\mbox + \let\@cite\NAT@citenum + \let\NAT@space\NAT@spacechar + \let\NAT@super@kern\relax + \fi + \let\@citex\NAT@citexnum + \let\@Latincitex\NAT@Latin@citexnum + \let\@biblabel\NAT@biblabelnum + \let\@bibsetup\NAT@bibsetnum + \renewcommand\NAT@idxtxt{\NAT@name\NAT@spacechar\NAT@open\NAT@num\NAT@close}% + \def\natexlab##1{}% + \def\NAT@penalty{\penalty\@m}% + \else + \let\@cite\NAT@cite + \let\@citex\NAT@citex + \let\@Latincitex\NAT@Latin@citex + \let\@biblabel\NAT@biblabel + \let\@bibsetup\NAT@bibsetup + \let\NAT@space\NAT@spacechar + \let\NAT@penalty\@empty + \renewcommand\NAT@idxtxt{\NAT@name\NAT@spacechar\NAT@open\NAT@date\NAT@close}% + \def\natexlab##1{##1}% + \fi} +\newcommand\NAT@Latin@citex{} +\def\NAT@Latin@citex% + [#1][#2]#3{% + \NAT@reset@parser + \NAT@sort@cites{#3}% + \NAT@reset@citea + \@cite{\lr{\let\NAT@nm\@empty\let\NAT@year\@empty + \@for\@citeb:=\NAT@cite@list\do + {\@safe@activestrue + \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% + \@safe@activesfalse + \@ifundefined{b@\@citeb\@extra@b@citeb}{\@citea% + {\reset@font\bfseries ?}\NAT@citeundefined + \PackageWarning{natbib}% + {Citation `\@citeb' on page \thepage \space undefined}\def\NAT@date{}}% + {\let\NAT@last@nm=\NAT@nm\let\NAT@last@yr=\NAT@year + \NAT@parse{\@citeb}% + \ifNAT@longnames\@ifundefined{bv@\@citeb\@extra@b@citeb}{% + \let\NAT@name=\NAT@all@names + \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}% + \fi + \ifNAT@full\let\NAT@nm\NAT@all@names\else + \let\NAT@nm\NAT@name\fi + \ifNAT@swa\ifcase\NAT@ctype + \if\relax\NAT@date\relax + \@citea\NAT@hyper@{\NAT@nmfmt{\NAT@nm}\NAT@date}% + \else + \ifx\NAT@last@nm\NAT@nm\NAT@yrsep + \ifx\NAT@last@yr\NAT@year + \def\NAT@temp{{?}}% + \ifx\NAT@temp\NAT@exlab\PackageWarningNoLine{natbib}% + {Multiple citation on page \thepage: same authors and + year\MessageBreak without distinguishing extra + letter,\MessageBreak appears as question mark}\fi + \NAT@hyper@{\NAT@exlab}% + \else\unskip\NAT@spacechar + \NAT@hyper@{\NAT@date}% + \fi + \else + \@citea\NAT@hyper@{% + \NAT@nmfmt{\NAT@nm}% + \hyper@natlinkbreak{% + \NAT@aysep\NAT@spacechar}{\@citeb\@extra@b@citeb + }% + \NAT@date + }% + \fi + \fi + \or\@citea\NAT@hyper@{\NAT@nmfmt{\NAT@nm}}% + \or\@citea\NAT@hyper@{\NAT@date}% + \or\@citea\NAT@hyper@{\NAT@alias}% + \fi \NAT@def@citea + \else + \ifcase\NAT@ctype + \if\relax\NAT@date\relax + \@citea\NAT@hyper@{\NAT@nmfmt{\NAT@nm}}% + \else + \ifx\NAT@last@nm\NAT@nm\NAT@yrsep + \ifx\NAT@last@yr\NAT@year + \def\NAT@temp{{?}}% + \ifx\NAT@temp\NAT@exlab\PackageWarningNoLine{natbib}% + {Multiple citation on page \thepage: same authors and + year\MessageBreak without distinguishing extra + letter,\MessageBreak appears as question mark}\fi + \NAT@hyper@{\NAT@exlab}% + \else + \unskip\NAT@spacechar + \NAT@hyper@{\NAT@date}% + \fi + \else + \@citea\NAT@hyper@{% + \NAT@nmfmt{\NAT@nm}% + \hyper@natlinkbreak{\NAT@spacechar\NAT@@open\if*#1*\else#1\NAT@spacechar\fi}% + {\@citeb\@extra@b@citeb}% + \NAT@date + }% + \fi + \fi + \or\@citea\NAT@hyper@{\NAT@nmfmt{\NAT@nm}}% + \or\@citea\NAT@hyper@{\NAT@date}% + \or\@citea\NAT@hyper@{\NAT@alias}% + \fi + \if\relax\NAT@date\relax + \NAT@def@citea + \else + \NAT@def@citea@close + \fi + \fi + }}\ifNAT@swa\else\if*#2*\else\NAT@cmt#2\fi + \if\relax\NAT@date\relax\else\NAT@@close\fi\fi}}{#1}{#2}} +\newcommand\NAT@Latin@citexnum{} +\def\NAT@Latin@citexnum[#1][#2]#3{% + \NAT@reset@parser + \NAT@sort@cites{#3}% + \NAT@reset@citea + \@cite{\lr{\def\NAT@num{-1}\let\NAT@last@yr\relax\let\NAT@nm\@empty + \@for\@citeb:=\NAT@cite@list\do + {\@safe@activestrue + \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% + \@safe@activesfalse + \@ifundefined{b@\@citeb\@extra@b@citeb}{% + {\reset@font\bfseries?} + \NAT@citeundefined\PackageWarning{natbib}% + {Citation `\@citeb' on page \thepage \space undefined}}% + {\let\NAT@last@num\NAT@num\let\NAT@last@nm\NAT@nm + \NAT@parse{\@citeb}% + \ifNAT@longnames\@ifundefined{bv@\@citeb\@extra@b@citeb}{% + \let\NAT@name=\NAT@all@names + \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}% + \fi + \ifNAT@full\let\NAT@nm\NAT@all@names\else + \let\NAT@nm\NAT@name\fi + \ifNAT@swa + \@ifnum{\NAT@ctype>\@ne}{% + \@citea + \NAT@hyper@{\@ifnum{\NAT@ctype=\tw@}{\NAT@test{\NAT@ctype}}{\NAT@alias}}% + }{% + \@ifnum{\NAT@cmprs>\z@}{% + \NAT@ifcat@num\NAT@num + {\let\NAT@nm=\NAT@num}% + {\def\NAT@nm{-2}}% + \NAT@ifcat@num\NAT@last@num + {\@tempcnta=\NAT@last@num\relax}% + {\@tempcnta\m@ne}% + \@ifnum{\NAT@nm=\@tempcnta}{% + \@ifnum{\NAT@merge>\@ne}{}{\NAT@last@yr@mbox}% + }{% + \advance\@tempcnta by\@ne + \@ifnum{\NAT@nm=\@tempcnta}{% + \ifx\NAT@last@yr\relax + \def@NAT@last@yr{\@citea}% + \else + \def@NAT@last@yr{--\NAT@penalty}% + \fi + }{% + \NAT@last@yr@mbox + }% + }% + }{% + \@tempswatrue + \@ifnum{\NAT@merge>\@ne}{\@ifnum{\NAT@last@num=\NAT@num\relax}{\@tempswafalse}{}}{}% + \if@tempswa\NAT@citea@mbox\fi + }% + }% + \NAT@def@citea + \else + \ifcase\NAT@ctype + \ifx\NAT@last@nm\NAT@nm \NAT@yrsep\NAT@penalty\NAT@space\else + \@citea \NAT@test{\@ne}\NAT@spacechar\NAT@mbox{\NAT@super@kern\NAT@@open}% + \fi + \if*#1*\else#1\NAT@spacechar\fi + \NAT@mbox{\NAT@hyper@{{\citenumfont{\NAT@num}}}}% + \NAT@def@citea@box + \or + \NAT@hyper@citea@space{\NAT@test{\NAT@ctype}}% + \or + \NAT@hyper@citea@space{\NAT@test{\NAT@ctype}}% + \or + \NAT@hyper@citea@space\NAT@alias + \fi + \fi + }% + }% + \@ifnum{\NAT@cmprs>\z@}{\NAT@last@yr}{}% + \ifNAT@swa\else + \@ifnum{\NAT@ctype=\z@}{% + \if*#2*\else\NAT@cmt#2\fi + }{}% + \NAT@mbox{\NAT@@close}% + \fi + }}{#1}{#2}% +}% +\AtBeginDocument{\NAT@set@cites} +\DeclareRobustCommand\Latincite + {\begingroup\let\NAT@ctype\z@\NAT@partrue\NAT@swatrue + \@ifstar{\NAT@fulltrue\NAT@Latin@cites}{\NAT@fullfalse\NAT@Latin@cites}} +\newcommand\NAT@Latin@cites{\@ifnextchar [{\NAT@@Latin@@citetp}{% + \ifNAT@numbers\else + \NAT@swafalse + \fi + \NAT@@Latin@@citetp[]}} +\newcommand\NAT@@Latin@@citetp{} +\def\NAT@@Latin@@citetp[#1]{\@ifnextchar[{\@Latincitex[#1]}{\@Latincitex[][#1]}} +%% +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> +%% +%% It may be distributed and/or modified under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is “author-maintained” (as per LPPL maintenance status) +%% by Vafa Khalighi. +%% +%% +%% +%% +%% End of file `natbib-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def index cc5d95c7844..e95afb3cadc 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def @@ -15,7 +15,7 @@ \آمادهسازیپرونده{packages-localise-xepersian.def}[2011/03/01 v0.1 localising LaTeX2e Packages] \@گرسبکفراخوانیشده{color}{\ورودی{color-localise.def}}{} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def index 09c8d6b720f..99cf9390d7e 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def @@ -20,7 +20,7 @@ \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@harfi\c@chapter}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def index ae7183dd055..bcdeb15f34f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def @@ -20,7 +20,7 @@ \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@harfi\c@chapter}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def index 60fd0b9faf2..c1ed2716d3f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def @@ -21,7 +21,7 @@ \gdef\thechapter{\@harfi\c@chapter} }%end appendix %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def index 86ecd236771..2b55bc51a2d 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def @@ -21,7 +21,7 @@ \gdef\thechapter{\@harfi\c@chapter} }%end appendix %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def index 829df506d7a..09d1e6037dd 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def @@ -42,7 +42,7 @@ \@@maybeautodot } %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def index 9e993de0a76..0fb5451a659 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def @@ -47,7 +47,7 @@ \@@maybeautodot } %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def index 4e00c4eb621..14f65bd27ae 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def @@ -43,7 +43,7 @@ \@@maybeautodot } %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def index 965c58a6584..14c28c43ebd 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def @@ -24,7 +24,7 @@ \renewcommand*{\cfttabname}{\if@RTL جدول\else table\fi} \renewcommand*{\cftsubtabname}{\if@RTL زیرجدول\else subtable\fi} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls index 6cf6a3636f7..96709fa6eab 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls @@ -882,7 +882,7 @@ indexblock environment may only appear inside frontpage environment. {\noindent #2}\\ } %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty index 9206e637651..34148543569 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty @@ -165,7 +165,7 @@ \everymath\expandafter{\the\everymath\SetMathsDigits} \g@addto@macro\document{\everydisplay\expandafter{\the\everydisplay\SetMathsDigits}} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty index 37d138f3526..6b624cb6b9c 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty @@ -20,22 +20,26 @@ \RequirePackage{ifthen} \RequirePackage{calc} \RequirePackage{verbatim} -\RequirePackage{multicol} +\RequirePackage{tabularx} \def\@headerfont{\bfseries} \newcommand\headerfont[1]{\gdef\@headerfont{#1}} \def\@X{X} \newcommand\X[1]{\gdef\@X{#1}} \def\pbs#1{\let\tmp=\\#1\let\\=\tmp} +\newcolumntype{D}{>{\pbs\centering}X} +\newcolumntype{Q}{>{\@headerfont}X} + +\renewcommand\tabularxcolumn[1]{m{#1}} \newcommand\makeform@nocorrection{% - \addtocontents{frm}{\protect\end{tabular}} + \addtocontents{frm}{\protect\end{tabularx}} \@starttoc{frm}} \newcommand\makeform@correction{% - \addtocontents{frm}{\protect\end{tabular}}} + \addtocontents{frm}{\protect\end{tabularx}}} \newcommand\makemask@nocorrection{% - \addtocontents{msk}{\protect\end{tabular}} + \addtocontents{msk}{\protect\end{tabularx}} \@starttoc{msk}} \newcommand\makemask@correction{% - \addtocontents{msk}{\protect\end{tabular}}} + \addtocontents{msk}{\protect\end{tabularx}}} \newlength\questionspace \setlength\questionspace{0pt} \newcommand\answerstitle[1]{\gdef\@answerstitle{#1}} @@ -48,21 +52,21 @@ \def\@initorcheck{% \xdef\@choices{\the@choice}% \setcounter{@choice}{1}% - \gdef\@arraydesc{|l||}% + \gdef\@arraydesc{|Q||}% \gdef\@headerline{}% \whiledo{\not{\value{@choice}>\@choices}}{ - \xdef\@arraydesc{\@arraydesc c|} + \xdef\@arraydesc{\@arraydesc D|} \def\@appendheader{\g@addto@macro\@headerline} \@appendheader{&\protect\@headerfont} \edef\@the@choice{{\alph{@choice}}} \expandafter\@appendheader\@the@choice \stepcounter{@choice}}% \addtocontents{frm}{% - \protect\begin{tabular}{\@arraydesc} + \protect\begin{tabularx}{\protect\linewidth}{\@arraydesc} \protect\hline \@headerline\protect\\\protect\hline\protect\hline}% \addtocontents{msk}{% - \protect\begin{tabular}{\@arraydesc} + \protect\begin{tabularx}{\protect\linewidth}{\@arraydesc} \protect\hline \@headerline\protect\\\protect\hline\protect\hline}% \gdef\@initorcheck{% @@ -80,11 +84,9 @@ \fbox{\parbox[c]{\linewidth}{#1}} \vspace\questionspace\par {\@answerstitlefont\@answerstitle} -\begin{multicols}{4} \begin{list}{\@answernumberfont\alph{@choice})~}{\usecounter{@choice}}}{% %% \end{question} \end{list} -\end{multicols} \@initorcheck% \addtocontents{frm}{\@formanswerline\protect\\\protect\hline}% \addtocontents{msk}{\@maskanswerline\protect\\\protect\hline}% @@ -148,7 +150,7 @@ \questiontitle{سؤال \thequestion:} \ProcessOptions %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty index 9678b8e7184..f54bf475392 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty @@ -181,7 +181,7 @@ دی\or بهمن\or اسفند\fi} %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty index b7a05ee4947..fbf147da50d 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty @@ -13,10 +13,9 @@ %% %% \NeedsTeXFormat{LaTeX2e} -\def\xepersianversion{v1.1.0} -\def\xepersiancommit{commit 100} -\def\xepersiandate{2011/03/21} -\ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space <\xepersiancommit> +\def\xepersianversion{v1.1.6} +\def\xepersiandate{2011/08/01} +\ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space Persian typesetting in XeLaTeX] \RequirePackage{fontspec} \RequirePackage{xepersian-persiancal} @@ -28,16 +27,13 @@ xepersian package (Persian for LaTeX over XeTeX)^^J Description: The package supports Persian^^J typesetting, using fonts provided in the distribution.^^J Copyright © 2008–2011 Vafa Khalighi^^J -\xepersianversion, <\xepersiancommit>, \xepersiandate^^J +\xepersianversion, \xepersiandate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J Home: http://bitbucket.org/vafa/xepersian^^J Location on CTAN: /macros/xetex/latex/xepersian} \typeout{\xepersianinfo} \edef\xepersian@everyjob{\the\everyjob} \everyjob{\xepersian@everyjob\typeout{\xepersianinfo}} -\if@developmentversion - \PackageWarningNoLine{xepersian}{Thanks for testing the development version of xepersian package. The development version may not work correctly or may not work at all. The development version is not recommended to be used for production purposes and should only be used for testing purposes. You are encouraged to use the stable version of xepersian package available on CTAN for production purposes} -\fi \def\prq{«} \def\plq{»} \def\xepersian@cmds@temp#1{% @@ -164,19 +160,26 @@ Location on CTAN: /macros/xetex/latex/xepersian} \def\today{\lr{\originaltoday}} \let\latintoday\today \def\today{\rl{\persiantoday}} +\def \@LTRmarginparreset {% + \reset@font + \latinfont + \normalsize + \@minipagetrue + \everypar{\@minipagefalse\everypar{}\beginL}% +} \DeclareRobustCommand\Latincite{% \@ifnextchar [{\@tempswatrue\@Latincitex}{\@tempswafalse\@Latincitex[]}} \def\@Latincitex[#1]#2{\leavevmode \let\@citea\@empty - \@cite{\@for\@citeb:=#2\do - {\@citea\def\@citea{\lr{,}\penalty\@m\ }% + \@cite{\lr{\@for\@citeb:=#2\do + {\@citea\def\@citea{,\penalty\@m\ }% \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi - \@ifundefined{b@\@citeb}{\hbox{\reset@font\bfseries\lr{?}}% + \@ifundefined{b@\@citeb}{\hbox{\reset@font\bfseries ?}% \G@refundefinedtrue \@latex@warning {Citation `\@citeb' on page \thepage \space undefined}}% - {\@cite@ofmt{\lr{\csname b@\@citeb\endcsname}}}}}{#1}} + {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}}{#1}} \def\@outputpage{% \begingroup % the \endgroup is put in by \aftergroup \let \protect \noexpand @@ -268,7 +271,7 @@ Location on CTAN: /macros/xetex/latex/xepersian} \def\headtoname{\if@RTL به\else To\fi} \def\proofname{\if@RTL اثبات\else Proof\fi} \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 ض\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} \def\@adadi#1{\ifcase#1 \or یک\or دو\or سه\or چهار\or پنج\or شش\or هفت\or هشت\or نه\or ده\or یازده\or دوازده\or سیزده\or چهارده\or پانزده\or شانزده\or هفده\or هجده\or نوزده\or بیست\else\@ctrerr\fi} @@ -333,6 +336,7 @@ Location on CTAN: /macros/xetex/latex/xepersian} \@ifpackageloaded{backref}{\input{backref-xepersian.def}}{} \@ifpackageloaded{flowfram}{\input{flowfram-xepersian.def}}{} \@ifpackageloaded{bidi}{\input{footnote-bidi-xepersian.def}}{} +\@ifpackageloaded{bidituftesidenote}{\input{bidituftesidenote-xepersian.def}}{} \@ifpackageloaded{bidicode}{\input{bidicode-xepersian.def}}{} \@ifpackageloaded{breqn}{\input{breqn-xepersian.def}}{} \@ifpackageloaded{enumerate}{\input{enumerate-xepersian.def}}{} @@ -340,6 +344,7 @@ Location on CTAN: /macros/xetex/latex/xepersian} \@ifpackageloaded{hyperref}{\input{hyperref-xepersian.def}}{} \@ifpackageloaded{minitoc}{\input{minitoc-xepersian.def}}{} \@ifpackageloaded{multicol}{\input{multicol-xepersian.def}}{} +\@ifpackageloaded{natbib}{\input{natbib-xepersian.def}}{} \@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xepersian.def}}}{} \@ifclassloaded{article}{\input{article-xepersian.def}}{} \@ifclassloaded{extarticle}{\input{extarticle-xepersian.def}}{} @@ -365,7 +370,10 @@ Location on CTAN: /macros/xetex/latex/xepersian} \@ifclassloaded{memoir}{\input{memoir-xepersian.def}}{} \DeclareOption{Kashida}{\input{kashida-xepersian.def}} \DeclareOption{localise}{\input{localise-xepersian.def}} -\DeclareOption{extrafootnotefeatures}{\input{extrafootnotefeatures.def}} +\DeclareOption{extrafootnotefeatures}{% +\input{extrafootnotefeatures.def}% +\input{extrafootnotefeatures-xepersian.def}% +} \DeclareOption{quickindex}{% \ifwritexviii% \@ifclassloaded{memoir}{\PackageError{xepersian}{This feature does not yet work with the memoir class}{}}{% @@ -379,7 +387,7 @@ Location on CTAN: /macros/xetex/latex/xepersian} \ExecuteOptions{localise} \ProcessOptions %% -%% Copyright © 2008–2011 Vafa Khalighi <vafakhlgh@gmail.com> +%% Copyright © 2008–2011 Vafa Khalighi <vafa018@gmail.com> %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of |