diff options
author | Karl Berry <karl@freefriends.org> | 2012-10-31 21:48:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-10-31 21:48:03 +0000 |
commit | 94d42d7395b8167256c615f1045aef29418dd937 (patch) | |
tree | c40cb68a63c866d335f444feb10e14e03d824c36 /Master/texmf-dist/tex/latex | |
parent | c7b0de93190a3c0d8e3ee9d88e79da7d21a27e31 (diff) |
new pgf/tikz package bidi (31oct12)
git-svn-id: svn://tug.org/texlive/trunk@28144 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
104 files changed, 945 insertions, 510 deletions
diff --git a/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def index 0ceed57569d..57efb738f92 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def @@ -12,7 +12,7 @@ %% License information appended. %% %% -\ProvidesFile{amsart-xetex-bidi.def}[2011/08/26 v0.6 bidi adaptations for amsart class for XeTeX engine] +\ProvidesFile{amsart-xetex-bidi.def}[2012/12/12 v0.7 bidi adaptations for amsart class for XeTeX engine] \def\@tocline#1#2#3#4#5#6#7{\relax \ifnum #1>\c@tocdepth % then omit \else @@ -37,54 +37,56 @@ \def\part{\@startsection{part}{0}% \z@{\linespacing\@plus\linespacing}{.5\linespacing}% {\normalfont\bfseries\if@RTL\raggedleft\else\raggedright\fi}} -\def\right@footnote{% +\def\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{\kern-.4\p@ \hrule\@width 5pc\kern11\p@\kern-\footnotesep}\hfil\endR}} -\def\left@footnote{\kern-.4\p@ +\def\left@footnoterule{\kern-.4\p@ \hrule\@width 5pc\kern11\p@\kern-\footnotesep} + \long\def\@footnotetext#1{% - \begingroup - \setbox\footins - \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize + \insert\footins{% + \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \normalfont\footnotesize \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces#1\unskip\strut\par}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} + \splittopskip\footnotesep \splitmaxdepth \dp\strutbox + \floatingpenalty\@MM \hsize\columnwidth + \@parboxrestore \parindent\normalparindent \sloppy + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}} + \long\def\@RTLfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLtrue\reset@font\footnotesize + \insert\footins{% + \@RTLtrue% + \normalfont\footnotesize \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} + \splittopskip\footnotesep \splitmaxdepth \dp\strutbox + \floatingpenalty\@MM \hsize\columnwidth + \@parboxrestore \parindent\normalparindent \sloppy + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}} + \long\def\@LTRfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLfalse\reset@font\footnotesize + \insert\footins{% + \@RTLfalse% + \normalfont\footnotesize \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} + \splittopskip\footnotesep \splitmaxdepth \dp\strutbox + \floatingpenalty\@MM \hsize\columnwidth + \@parboxrestore \parindent\normalparindent \sloppy + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}} + +\footdir@temp\footdir@ORG@bidi@amsart@footnotetext\@footnotetext{\if@RTL@footnote R\else L\fi}% +\footdir@temp\footdir@ORG@bidi@amsart@RTLfootnotetext\@RTLfootnotetext{R}% +\footdir@temp\footdir@ORG@bidi@amsart@LTRfootnotetext\@LTRfootnotetext{L}% + \renewenvironment{thebibliography}[1]{% \@bibtitlestyle \normalfont\bibliofont\labelsep .5em\relax @@ -108,6 +110,9 @@ \if@RTL\raggedleft\else\raggedright\fi \hyphenpenalty\@M \footnotesize} +\def\@idxitem{\par\hangindent \if@RTL-\fi2em} +\def\subitem{\par\hangindent \if@RTL-\fi2em\hspace*{1em}} +\def\subsubitem{\par\hangindent \if@RTL-\fi3em\hspace*{2em}} \def\maketitle{\par \@topnum\z@ % this prevents figures from falling at the top of page 1 \@setcopyright @@ -130,7 +135,7 @@ \@cleartopmattertags } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/amsbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def index 8e1c5381bce..7e4c78f7057 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def @@ -12,7 +12,7 @@ %% License information appended. %% %% -\ProvidesFile{amsbook-xetex-bidi.def}[2010/07/25 v0.7 bidi adaptations for amsbook class for XeTeX engine] +\ProvidesFile{amsbook-xetex-bidi.def}[2012/12/12 v0.8 bidi adaptations for amsbook class for XeTeX engine] \def\@tocline#1#2#3#4#5#6#7{\relax \ifnum #1>\c@tocdepth % then omit \else @@ -43,54 +43,59 @@ \if@RTL\raggedleft\else\raggedright\fi \hyphenpenalty\@M \footnotesize} -\def\right@footnote{% +\def\@idxitem{\par\hangindent \if@RTL-\fi2em} +\def\subitem{\par\hangindent \if@RTL-\fi2em\hspace*{1em}} +\def\subsubitem{\par\hangindent \if@RTL-\fi3em\hspace*{2em}} +\def\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{\kern-.4\p@ \hrule\@width 5pc\kern11\p@\kern-\footnotesep}\hfil\endR}} -\def\left@footnote{\kern-.4\p@ +\def\left@footnoterule{\kern-.4\p@ \hrule\@width 5pc\kern11\p@\kern-\footnotesep} + \long\def\@footnotetext#1{% - \begingroup - \setbox\footins - \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize + \insert\footins{% + \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \normalfont\footnotesize \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces#1\unskip\strut\par}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} + \splittopskip\footnotesep \splitmaxdepth \dp\strutbox + \floatingpenalty\@MM \hsize\columnwidth + \@parboxrestore \parindent\normalparindent \sloppy + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}} + \long\def\@RTLfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLtrue\reset@font\footnotesize + \insert\footins{% + \@RTLtrue% + \normalfont\footnotesize \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} + \splittopskip\footnotesep \splitmaxdepth \dp\strutbox + \floatingpenalty\@MM \hsize\columnwidth + \@parboxrestore \parindent\normalparindent \sloppy + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}} + \long\def\@LTRfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLfalse\reset@font\footnotesize + \insert\footins{% + \@RTLfalse% + \normalfont\footnotesize \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore \parindent\normalparindent \sloppy - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces #1\unskip\strut\par}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} + \splittopskip\footnotesep \splitmaxdepth \dp\strutbox + \floatingpenalty\@MM \hsize\columnwidth + \@parboxrestore \parindent\normalparindent \sloppy + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}} + +\footdir@temp\footdir@ORG@bidi@amsbook@footnotetext\@footnotetext{\if@RTL@footnote R\else L\fi}% +\footdir@temp\footdir@ORG@bidi@amsbook@RTLfootnotetext\@RTLfootnotetext{R}% +\footdir@temp\footdir@ORG@bidi@amsbook@LTRfootnotetext\@LTRfootnotetext{L}% + \renewenvironment{thebibliography}[1]{% \@bibtitlestyle \normalfont\bibliofont\labelsep .5em\relax @@ -131,7 +136,7 @@ \do\keywords \do\@keywords \do\subjclass \do\@subjclass } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/amsmath-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def index 41cffd17652..ef099eb8ac9 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def @@ -29,7 +29,7 @@ \DeclareRobustCommand{\[}{\begin{equation*}} \DeclareRobustCommand{\]}{\end{equation*}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/amsthm-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def index 9f21e618f8a..ffa6d49496b 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def @@ -15,7 +15,7 @@ \ProvidesFile{amsthm-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for amsthm package for XeTeX engine] \def\@thmcountersep{\@SepMark} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/array-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def index 92436b7e4cb..47fb4b72933 100644 --- a/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def @@ -72,7 +72,7 @@ \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\gdef\@halignto{}% \@RTLtabfalse\@tabarray} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/article-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def index 284c0589a4a..f64f6118f4e 100644 --- a/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def @@ -16,9 +16,9 @@ \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \let \LTRfootnote \LTRthanks \let \RTLfootnote \RTLthanks @@ -140,11 +140,11 @@ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par \endgroup \fi} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-3\p@ \hrule\@width.4\columnwidth \kern2.6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -209,7 +209,7 @@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/artikel1-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def index a52558b7cc8..d35be4db081 100644 --- a/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def @@ -128,13 +128,13 @@ {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% \endlist} -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \kern.5\baselineskip \hrule\@width\unitindent \kern.4\baselineskip } -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -147,9 +147,9 @@ \renewcommand*\maketitle{% \begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \long\def\@makefntext##1{\parindent\z@ \def\labelitemi{\textendash}\@revlabeltrue @@ -264,7 +264,7 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/artikel2-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def index 32d3befc7f3..9b9dba79832 100644 --- a/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def @@ -116,12 +116,12 @@ \renewcommand*\thesubsubsection{\thesubsection\@SepMark\@arabic\c@subsubsection} \renewcommand*\theparagraph{\thesubsubsection\@SepMark\@arabic\c@paragraph} \renewcommand*\thesubparagraph{\theparagraph\@SepMark\@arabic\c@subparagraph} -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \hrule\@width 3\unitindent \kern 2.6\p@ } -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -150,9 +150,9 @@ \renewcommand*\maketitle{% \begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \long\def\@makefntext##1{\parindent\z@ \def\labelitemi{\textendash}\@revlabeltrue @@ -267,7 +267,7 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/artikel3-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def index 6f4c2b5e51e..b7a92c9af05 100644 --- a/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def @@ -108,13 +108,13 @@ \fi} {\if@twocolumn\else\par\egroup\fi} \fi -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \kern.5\baselineskip \hrule\@width\unitindent \kern.4\baselineskip } -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -148,9 +148,9 @@ \renewcommand*\maketitle{% \begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \long\def\@makefntext##1{\parindent\z@ \def\labelitemi{\textendash}\@revlabeltrue @@ -275,7 +275,7 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/arydshln-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def index 32dd193ba00..b47ad6e3db1 100644 --- a/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def @@ -148,7 +148,7 @@ \let\adl@org@classz\@classz }{} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidi-longtable.sty b/Master/texmf-dist/tex/latex/bidi/bidi-longtable.sty new file mode 100644 index 00000000000..71651557f5c --- /dev/null +++ b/Master/texmf-dist/tex/latex/bidi/bidi-longtable.sty @@ -0,0 +1,97 @@ +%% +%% This is file `bidi-longtable.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bidi.dtx (with options: `bidi-longtable.sty') +%% +%% ______________________________________ +%% Copyright © 2009–2012 Vafa Khalighi +%% +%% License information appended. +%% +%% +\ProvidesPackage{bidi-longtable}[2012/12/12 v0.1 typesetting bidi longtables in XeTeX engine (experimental)] +\def\longtable{\if@RTL\@RTLtabtrue\fi% + \par + \ifx\multicols\@undefined + \else + \ifnum\col@number>\@ne + \@twocolumntrue + \fi + \fi + \if@twocolumn + \LT@err{longtable not in 1-column mode}\@ehc + \fi + \begingroup + \@ifnextchar[\LT@array{\LT@array[x]}} +\def\endlongtable{% + \crcr + \noalign{% + \let\LT@entry\LT@entry@chop + \xdef\LT@save@row{\LT@save@row}}% + \LT@echunk + \LT@start + \unvbox\z@ + \LT@get@widths + \if@filesw + {\let\LT@entry\LT@entry@write\immediate\write\@auxout{% + \gdef\expandafter\noexpand + \csname LT@\romannumeral\c@LT@tables\endcsname + {\LT@save@row}}}% + \fi + \ifx\LT@save@row\LT@@save@row + \else + \LT@warn{Column \@width s have changed\MessageBreak + in table \thetable}% + \LT@final@warn + \fi + \endgraf\penalty -\LT@end@pen + \endgroup + \global\@mparbottom\z@ + \pagegoal\vsize + \endgraf\penalty\z@\addvspace\LTpost + \ifvoid\footins\else\insert\footins{}\fi\@RTLtabfalse} +\def\LT@output{% + \ifnum\outputpenalty <-\@Mi + \ifnum\outputpenalty > -\LT@end@pen + \LT@err{floats and marginpars not allowed in a longtable}\@ehc + \else + \setbox\z@\vbox{\unvbox\@cclv}% + \ifdim \ht\LT@lastfoot>\ht\LT@foot + \dimen@\pagegoal + \advance\dimen@-\ht\LT@lastfoot + \ifdim\dimen@<\ht\z@ + \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% + \@makecol + \@outputpage + \setbox\z@\vbox{\box\LT@head}% + \fi + \fi + \global\@colroom\@colht + \global\vsize\@colht + \vbox + {\hbox{\if@RTLtab\beginR\fi\vbox{\unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi}\if@RTLtab\endR\fi}}% + \fi + \else + \setbox\@cclv\vbox{\hbox{\if@RTLtab\beginR\fi\vbox{\unvbox\@cclv\copy\LT@foot\vss}\if@RTLtab\endR\fi}}% + \@makecol + \@outputpage + \global\vsize\@colroom + \copy\LT@head\nobreak + \fi} +%% +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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 `bidi-longtable.sty'. diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty index dcf71fb5458..f071bdd520e 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty @@ -13,8 +13,8 @@ %% %% \NeedsTeXFormat{LaTeX2e} -\def\bididate{2012/07/25} -\def\bidiversion{v11.161} +\def\bididate{2012/12/12} +\def\bidiversion{v12 (Final Version)} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -31,6 +31,9 @@ Location on CTAN: /macros/latex/contrib/bidi} \everyjob{\bidi@everyjob\typeout{\bidiinfo}} \RequirePackage{iftex} \RequirePackage{biditools} +\RequirePackage{zref-abspage} +\RequirePackage{auxhook} +\RequirePackage{ltxcmds} \eqnewif{\if@RTLmain}{\if@rlmain} \eqnewif{\if@RTL}{\if@rl} \newif\if@RTLmaths @@ -73,7 +76,7 @@ Location on CTAN: /macros/latex/contrib/bidi} \input{loadingorder-bidi.def} \ProcessOptions %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidi.tex b/Master/texmf-dist/tex/latex/bidi/bidi.tex index 3c64387a3b4..79071f823d2 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi.tex +++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex @@ -12,7 +12,7 @@ %% License information appended. %% %% -\def\bididate{2012/07/25} +\def\bididate{2012/12/12} \def\bidiversion{v0.1} \catcode`@=11 \let \protect \relax @@ -60,7 +60,7 @@ Location on CTAN: /macros/latex/contrib/bidi} \fi \catcode`@=12 %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty index 312c73b6efd..d600f4bb871 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty @@ -69,7 +69,7 @@ \global\let\and\relax } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidicode.sty b/Master/texmf-dist/tex/latex/bidi/bidicode.sty index d21f69a345e..430bb4aec37 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidicode.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidicode.sty @@ -146,7 +146,7 @@ \def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt} \def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty index 7cf8d39f322..21f35f15bb0 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty @@ -64,24 +64,61 @@ \let\@footnotetext\bidi@p@ftntext \let\@LTRfootnotetext\bidi@p@LTRftntext \let\@RTLfootnotetext\bidi@p@RTLftntext + \let\@xfootnotenext\bidi@p@xftntext + \let\@xfootnote\bidi@p@xfootnote + \let\@xLTRfootnotenext\bidi@p@xLTRftntext + \let\@xLTRfootnote\bidi@p@xLTRfootnote + \let\@xRTLfootnotenext\bidi@p@xRTLftntext + \let\@xRTLfootnote\bidi@p@xRTLfootnote \if@RTLtab\beginR \fi $\let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} \def\endtabular{\crcr\egroup\if@RTLtab\egroup\endR\egroup\fi \egroup $\if@RTLtab\endR\fi\egroup - \the\bidi@p@ftn - \global\bidi@p@ftn{}% + \ifx\@captype\@undefined + \global\bidi@p@ftn\expandafter{\expandafter}\the\bidi@p@ftn\fi% \global\@RTLtabfalse} \long\def\bidi@p@ftntext#1{% - \edef\@tempy{\the\bidi@p@ftn\noexpand\footnotetext[\the\c@footnote]}% + \edef\@tempy{\the\bidi@p@ftn\noexpand\footnotetext[\the\csname c@\@mpfn\endcsname]}% \global\bidi@p@ftn\expandafter{\@tempy{#1}}}% \long\def\bidi@p@LTRftntext#1{% - \edef\@tempyi{\the\bidi@p@ftn\noexpand\LTRfootnotetext[\the\c@footnote]}% + \edef\@tempyi{\the\bidi@p@ftn\noexpand\LTRfootnotetext[\the\csname c@\@mpfn\endcsname]}% \global\bidi@p@ftn\expandafter{\@tempyi{#1}}}% \long\def\bidi@p@RTLftntext#1{% - \edef\@tempyii{\the\bidi@p@ftn\noexpand\RTLfootnotetext[\the\c@footnote]}% + \edef\@tempyii{\the\bidi@p@ftn\noexpand\RTLfootnotetext[\the\csname c@\@mpfn\endcsname]}% \global\bidi@p@ftn\expandafter{\@tempyii{#1}}}% + +\long\def\bidi@p@xftntext[#1]#2{% + \global\bidi@p@ftn\expandafter{\the\bidi@p@ftn\footnotetext[#1]{#2}}} + +\long\def\bidi@p@xLTRftntext[#1]#2{% + \global\bidi@p@ftn\expandafter{\the\bidi@p@ftn\LTRfootnotetext[#1]{#2}}} + +\long\def\bidi@p@xRTLftntext[#1]#2{% + \global\bidi@p@ftn\expandafter{\the\bidi@p@ftn\RTLfootnotetext[#1]{#2}}} + +\def\bidi@p@xfootnote[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark\bidi@p@xftntext[#1]} + +\def\bidi@p@xLTRfootnote[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark\bidi@p@xLTRftntext[#1]} + +\def\bidi@p@xRTLfootnote[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark\bidi@p@xRTLftntext[#1]} + \def\@xfloat #1[#2]{% \@nodocument \def \@captype {#1}% @@ -146,6 +183,12 @@ \let\@footnotetext\bidi@p@ftntext \let\@LTRfootnotetext\bidi@p@LTRftntext \let\@RTLfootnotetext\bidi@p@RTLftntext + \let\@xfootnotenext\bidi@p@xftntext + \let\@xfootnote\bidi@p@xfootnote + \let\@xLTRfootnotenext\bidi@p@xLTRftntext + \let\@xLTRfootnote\bidi@p@xLTRfootnote + \let\@xRTLfootnotenext\bidi@p@xRTLftntext + \let\@xRTLfootnote\bidi@p@xRTLfootnote \hsize\columnwidth \@parboxrestore \@floatboxreset @@ -155,12 +198,11 @@ \@minipagefalse \outer@nobreak \egroup %% end of vbox - \the\bidi@p@ftn - \global\bidi@p@ftn{}% + \global\bidi@p@ftn\expandafter{\expandafter}\the\bidi@p@ftn \color@endbox } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls index 4f755bc5281..176d8fe902c 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls +++ b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls @@ -261,7 +261,7 @@ \newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em} \let\@openbib@code\@empty %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidipoem.sty b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty index 2a5be924c9b..9c3ba9306ea 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidipoem.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty @@ -14,12 +14,17 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bidipoem}% -[2010/07/25 Environments for typesetting Persian traditional and modern poems] +[2012/12/12 v0.4 Environments for typesetting Persian traditional and modern poems] \def\poemcolsepskip{.1\versewidth plus .1\versewidth minus .05\versewidth} \def\poemmarginskip{1em plus 1fil minus 1em} \def\poemextrabaselineskip{0\baselineskip} \def\poemskip{\medskip} -\def\poemblocksep{\quad$\Box$} +\newcommand{\bidipoem@openbox}{\leavevmode + \hbox to.77778em{% + \hfil\vrule + \vbox to.675em{\hrule width.6em\vfil\hrule}% + \vrule\hfil}} +\def\poemblocksep{\quad\hbox{\bidipoem@openbox}} \newdimen\versewidth \newtoks\bidipoem@p@ftn \def\poem@verse#1{% @@ -31,6 +36,7 @@ \fi \fi \hbox to\poem@width{\unhbox#1}% +\global\bidipoem@p@ftn\expandafter{\expandafter}\the\bidipoem@p@ftn% } \def\poem@linebegin{\vadjust{}\hskip\@flushglue\hskip\poemmarginskip\relax} \def\poem@lineend{\nobreak\hskip\poemmarginskip\hskip\@flushglue\vadjust{}} @@ -46,8 +52,28 @@ } \def\poem@lineparsebegin{% \halign\bgroup -\global\setbox\verse@i=\hbox{\ignorespaces##\unskip}&& -\global\setbox\verse@ii=\hbox{\ignorespaces##\unskip} +\global\setbox\verse@i=\hbox{% +\let\@footnotetext\bidipoem@p@ftntext% +\let\@LTRfootnotetext\bidipoem@p@LTRftntext% +\let\@RTLfootnotetext\bidipoem@p@RTLftntext% +\let\@xfootnotenext\bidipoem@p@xftntext% +\let\@xfootnote\bidipoem@p@xfootnote% +\let\@xLTRfootnotenext\bidipoem@p@xLTRftntext% +\let\@xLTRfootnote\bidipoem@p@xLTRfootnote% +\let\@xRTLfootnotenext\bidipoem@p@xRTLftntext% +\let\@xRTLfootnote\bidipoem@p@xRTLfootnote% +\ignorespaces##\unskip}&& +\global\setbox\verse@ii=\hbox{% +\let\@footnotetext\bidipoem@p@ftntext% +\let\@LTRfootnotetext\bidipoem@p@LTRftntext% +\let\@RTLfootnotetext\bidipoem@p@RTLftntext% +\let\@xfootnotenext\bidipoem@p@xftntext% +\let\@xfootnote\bidipoem@p@xfootnote% +\let\@xLTRfootnotenext\bidipoem@p@xLTRftntext% +\let\@xLTRfootnote\bidipoem@p@xLTRfootnote% +\let\@xRTLfootnotenext\bidipoem@p@xRTLftntext% +\let\@xRTLfootnote\bidipoem@p@xRTLfootnote% +\ignorespaces##\unskip} \cr } \def\poem@lineparseend{% @@ -94,9 +120,6 @@ \global\versewidth=\poem@width \poemskip\leavevmode\par \begingroup - \let\@footnotetext\bidipoem@p@ftntext - \let\@LTRfootnotetext\bidipoem@p@LTRftntext - \let\@RTLfootnotetext\bidipoem@p@RTLftntext \tabskip=\z@ \parskip=\z@ \parindent=\z@ @@ -124,8 +147,6 @@ \fi\fi \poem@lineparseend \endgroup - \the\bidipoem@p@ftn - \global\bidipoem@p@ftn{}% \par \vskip\baselineskip \poemskip @@ -135,15 +156,47 @@ \poem@write@aux{poem@width@\romannumeral\c@poem@no}{\new@poem@width}% \ifx\AtEndDocument\undefined\poem@finish\fi } + \long\def\bidipoem@p@ftntext#1{% - \edef\@tempx{\the\bidipoem@p@ftn\noexpand\footnotetext[\the\c@footnote]}% + \edef\@tempx{\the\bidipoem@p@ftn\noexpand\footnotetext[\the\csname c@\@mpfn\endcsname]}% \global\bidipoem@p@ftn\expandafter{\@tempx{#1}}}% \long\def\bidipoem@p@LTRftntext#1{% - \edef\@tempxi{\the\bidipoem@p@ftn\noexpand\LTRfootnotetext[\the\c@footnote]}% + \edef\@tempxi{\the\bidipoem@p@ftn\noexpand\LTRfootnotetext[\the\csname c@\@mpfn\endcsname]}% \global\bidipoem@p@ftn\expandafter{\@tempxi{#1}}}% \long\def\bidipoem@p@RTLftntext#1{% - \edef\@tempxii{\the\bidipoem@p@ftn\noexpand\RTLfootnotetext[\the\c@footnote]}% + \edef\@tempxii{\the\bidipoem@p@ftn\noexpand\RTLfootnotetext[\the\csname c@\@mpfn\endcsname]}% \global\bidipoem@p@ftn\expandafter{\@tempxii{#1}}}% + +\long\def\bidipoem@p@xftntext[#1]#2{% + \global\bidipoem@p@ftn\expandafter{\the\bidipoem@p@ftn\footnotetext[#1]{#2}}} + +\long\def\bidipoem@p@xLTRftntext[#1]#2{% + \global\bidipoem@p@ftn\expandafter{\the\bidipoem@p@ftn\LTRfootnotetext[#1]{#2}}} + +\long\def\bidipoem@p@xRTLftntext[#1]#2{% + \global\bidipoem@p@ftn\expandafter{\the\bidipoem@p@ftn\RTLfootnotetext[#1]{#2}}} + +\def\bidipoem@p@xfootnote[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark\bidipoem@p@xftntext[#1]} + +\def\bidipoem@p@xLTRfootnote[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark\bidipoem@p@xLTRftntext[#1]} + +\def\bidipoem@p@xRTLfootnote[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark\bidipoem@p@xRTLftntext[#1]} + \newenvironment{traditionalpoem}{\@traditionalpoem}{\@endtraditionalpoem} \expandafter\def\csname traditionalpoem*\endcsname{\let\poem@obeylines=\obeylines\traditionalpoem} \expandafter\def\csname endtraditionalpoem*\endcsname{\endtraditionalpoem} @@ -167,9 +220,6 @@ \def\@modernpoem{% \par \begingroup - \let\@footnotetext\bidipoem@p@ftntext - \let\@LTRfootnotetext\bidipoem@p@LTRftntext - \let\@RTLfootnotetext\bidipoem@p@RTLftntext \parskip=\z@ \parindent=\z@ \def\[{\@settab\@tabplus\ignorespaces}% @@ -201,15 +251,39 @@ \ifpoem@started\else\let\@stopline\@stopfield\fi \end{tabbing}% \endgroup - \the\bidipoem@p@ftn - \global\bidipoem@p@ftn{}% \par } \newenvironment{modernpoem}{\@modernpoem}{\@endmodernpoem} \expandafter\def\csname modernpoem*\endcsname{\let\poem@obeylines=\obeylines\modernpoem} \expandafter\def\csname endmodernpoem*\endcsname{\endmodernpoem} +\gdef\@startfield{% +\global\setbox\@curfield\hbox\bgroup% +\let\@footnotetext\bidipoem@p@ftntext% +\let\@LTRfootnotetext\bidipoem@p@LTRftntext% +\let\@RTLfootnotetext\bidipoem@p@RTLftntext% +\let\@xfootnotenext\bidipoem@p@xftntext% +\let\@xfootnote\bidipoem@p@xfootnote% +\let\@xLTRfootnotenext\bidipoem@p@xLTRftntext% +\let\@xLTRfootnote\bidipoem@p@xLTRfootnote% +\let\@xRTLfootnotenext\bidipoem@p@xRTLftntext% +\let\@xRTLfootnote\bidipoem@p@xRTLfootnote% +\color@begingroup} +\gdef\@stopfield{% + \color@endgroup\egroup\global\bidipoem@p@ftn\expandafter{\expandafter}\the\bidipoem@p@ftn} +\gdef\@contfield{% +\global\setbox\@curfield\hbox\bgroup% +\let\@footnotetext\bidipoem@p@ftntext% +\let\@LTRfootnotetext\bidipoem@p@LTRftntext% +\let\@RTLfootnotetext\bidipoem@p@RTLftntext% +\let\@xfootnotenext\bidipoem@p@xftntext% +\let\@xfootnote\bidipoem@p@xfootnote% +\let\@xLTRfootnotenext\bidipoem@p@xLTRftntext% +\let\@xLTRfootnote\bidipoem@p@xLTRfootnote% +\let\@xRTLfootnotenext\bidipoem@p@xRTLftntext% +\let\@xRTLfootnote\bidipoem@p@xRTLfootnote% +\color@begingroup\unhbox\@curfield} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidipresentation.cls b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls index ff482d59d11..f68d0bd8afb 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls +++ b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls @@ -85,7 +85,7 @@ \setlength{\parsep}{0ex}} {\endlist} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/biditools.sty b/Master/texmf-dist/tex/latex/bidi/biditools.sty index 1324228742f..89275f827fd 100644 --- a/Master/texmf-dist/tex/latex/bidi/biditools.sty +++ b/Master/texmf-dist/tex/latex/bidi/biditools.sty @@ -533,7 +533,7 @@ Patching '\string\end' failed!\MessageBreak '\string\bidi@AfterEndEnvironment' will not work\@gobble}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/biditufte-book.cls b/Master/texmf-dist/tex/latex/bidi/biditufte-book.cls index 9acde276167..4e0dd930b36 100644 --- a/Master/texmf-dist/tex/latex/bidi/biditufte-book.cls +++ b/Master/texmf-dist/tex/latex/bidi/biditufte-book.cls @@ -68,7 +68,7 @@ {}% } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/biditufte-handout.cls b/Master/texmf-dist/tex/latex/bidi/biditufte-handout.cls index 6d50770012a..d5a3edce3c6 100644 --- a/Master/texmf-dist/tex/latex/bidi/biditufte-handout.cls +++ b/Master/texmf-dist/tex/latex/bidi/biditufte-handout.cls @@ -37,7 +37,7 @@ {}% } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidituftefloat.sty b/Master/texmf-dist/tex/latex/bidi/bidituftefloat.sty index a01d7498a62..5ad36991456 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftefloat.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftefloat.sty @@ -575,7 +575,7 @@ bidi implementation of tufte float] } \PassOptionsToPackage{caption=false}{subfig} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidituftegeneralstructure.sty b/Master/texmf-dist/tex/latex/bidi/bidituftegeneralstructure.sty index de9bda0059c..9aa0684c3bf 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftegeneralstructure.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftegeneralstructure.sty @@ -114,13 +114,14 @@ bidi implementation of tufte general structure] \end{multicols}% \end{fullwidth}% } -\renewcommand\@idxitem{\par\hangindent 2em} -\renewcommand\subitem{\par\hangindent 3em\hspace*{1em}} -\renewcommand\subsubitem{\par\hangindent 4em\hspace*{2em}} +\AtBeginDocument{% +\renewcommand\@idxitem{\par\hangindent \if@RTL-\fi2em}% +\renewcommand\subitem{\par\hangindent \if@RTL-\fi3em\hspace*{1em}}% +\renewcommand\subsubitem{\par\hangindent \if@RTL-\fi4em\hspace*{2em}}} \renewcommand\indexspace{\par\addvspace{1.0\baselineskip plus 0.5ex minus 0.2ex}\relax}% \newcommand{\lettergroup}[1]{}% swallow the letter heading in the index %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidituftehyperref.sty b/Master/texmf-dist/tex/latex/bidi/bidituftehyperref.sty index bfaae4e58fb..eda55a1f16a 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftehyperref.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftehyperref.sty @@ -38,7 +38,7 @@ bidi implementation of tufte hyperref] \PassOptionsToPackage{hyperfootnotes=false}{hyperref} } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidituftesidenote.sty b/Master/texmf-dist/tex/latex/bidi/bidituftesidenote.sty index 40e5793d1bd..6f8155c8cfd 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftesidenote.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftesidenote.sty @@ -470,7 +470,7 @@ bidi implementation of tufte sidenote] \let\cite\@bidituftesidenote@normal@cite% go back to using normal in-text \cite command } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidituftetitle.sty b/Master/texmf-dist/tex/latex/bidi/bidituftetitle.sty index 872ae9089d9..6ac3fd1fac0 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftetitle.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftetitle.sty @@ -151,7 +151,7 @@ bidi implementation of tufte title] \newpage \if@twocolumn\hbox{}\newpage\fi\fi\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bidituftetoc.sty b/Master/texmf-dist/tex/latex/bidi/bidituftetoc.sty index 39ec97d44f7..4a255cd22f0 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftetoc.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftetoc.sty @@ -148,7 +148,7 @@ bidi implementation of tufte toc] \renewcommand*\l@figure{\@bidituftetoc@lof@line} \let\l@table\l@figure %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/boek-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def index 600df3b3435..3591a9e015b 100644 --- a/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def @@ -88,13 +88,13 @@ \else \renewcommand*\l@chapter{\@regtocline{0}} \fi -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \kern.5\baselineskip \hrule\@width\unitindent \kern.4\baselineskip } -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -139,9 +139,9 @@ \renewcommand*\maketitle{% \begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \long\def\@makefntext##1{\parindent\z@ \def\labelitemi{\textendash}\@revlabeltrue @@ -192,7 +192,7 @@ \global\let\and\relax } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/boek3-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def index a15692e6cc5..cf9be332f99 100644 --- a/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def @@ -111,13 +111,13 @@ {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% \endlist} -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \kern.5\baselineskip \hrule\@width\unitindent \kern.4\baselineskip } -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -139,9 +139,9 @@ \renewcommand*\maketitle{% \begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \long\def\@makefntext##1{\parindent\z@ \def\labelitemi{\textendash}\@revlabeltrue @@ -192,7 +192,7 @@ \global\let\and\relax } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/book-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def index 2b5194a871f..f40d611e0d9 100644 --- a/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def @@ -32,9 +32,9 @@ \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \let \LTRfootnote \LTRthanks \let \RTLfootnote \RTLthanks @@ -155,11 +155,11 @@ \penalty\@highpenalty \endgroup \fi} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-3\p@ \hrule\@width.4\columnwidth \kern2.6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -227,7 +227,7 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/bookest-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def index 4ebe826d634..90aadd651ca 100644 --- a/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def @@ -46,7 +46,7 @@ \vskip 30\p@ }} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/breqn-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def index 94f82d70579..b35b455af1f 100644 --- a/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def @@ -68,7 +68,7 @@ }% } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/caption-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def index ee5620384d1..b8a83bbfa54 100644 --- a/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def @@ -15,7 +15,7 @@ \ProvidesFile{caption-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for caption package for XeTeX engine] \let\@makecaption\caption@makecaption %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/color-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def index 1fd97d1838f..a179ae21476 100644 --- a/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def @@ -56,7 +56,7 @@ \color@b@x{\fboxsep\z@\bidicolor#1{#2}\fbox}{\bidicolor#1{#3}}} \def\color@setgroup{\begingroup\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\set@color\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/colortbl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def index 9b05c778242..8995c4a8bfd 100644 --- a/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def @@ -51,7 +51,7 @@ \unhbox\z@\if@RTLtab\endL\fi}% \prepnext@tok} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/combine-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def index be3c6703002..2dea8f602ae 100644 --- a/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def @@ -28,7 +28,7 @@ \renewenvironment{tocindent}[1]{% \hangindent \if@RTL-\fi#1 \hangafter -100\relax}{} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/crop-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/crop-xetex-bidi.def index 4a2dfc9f03c..2ae6b760466 100644 --- a/Master/texmf-dist/tex/latex/bidi/crop-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/crop-xetex-bidi.def @@ -160,7 +160,7 @@ \CROP@execopt{frame}% }{} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/cutwin-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/cutwin-xetex-bidi.def index 8acb3ce780c..53dcef99578 100644 --- a/Master/texmf-dist/tex/latex/bidi/cutwin-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/cutwin-xetex-bidi.def @@ -51,7 +51,7 @@ \def\c@twrounds{1} \fi}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty index 94fe048daf9..dd1d2ccfec2 100644 --- a/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty +++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty @@ -111,7 +111,7 @@ \pagestyle{plain}} \AtBeginDocument{\makefooter} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty index 7681f0e25a8..d3ad2a887e4 100644 --- a/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty +++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty @@ -118,7 +118,7 @@ {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}% } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/dblfnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def index 77cc9374922..18049c7664c 100644 --- a/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def @@ -12,34 +12,14 @@ %% License information appended. %% %% -\ProvidesFile{dblfnote-xetex-bidi.def}[2011/09/05 v0.2 bidi adaptations for dblfnote package for XeTeX engine] -\def\right@footnote{% - \hbox to \DFNcolumnwidth - {\beginR \vbox{\kern -3\p@ - \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}} -\def\@iiiminipage#1#2[#3]#4{% - \leavevmode - \@pboxswfalse - \if@RTLtab\@bidi@list@minipage@parbox@not@nobtrue\fi - \if@RTL\if#1t\@bidi@list@minipage@parboxtrue\else\if#1b\@bidi@list@minipage@parboxtrue\fi\fi\fi - \setlength\@tempdima{#4}% - \def\@mpargs{{#1}{#2}[#3]{#4}}% - \setbox\@tempboxa\vbox\bgroup - \color@begingroup - \hsize\@tempdima - \textwidth\hsize \columnwidth\hsize - \@parboxrestore - \def\right@footnote{% - \hbox to \columnwidth - {\beginR \vbox{\kern -3\p@ - \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}} - \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@ - \let\@footnotetext\@mpfootnotetext - \let\@LTRfootnotetext\@mpLTRfootnotetext - \let\@RTLfootnotetext\@mpRTLfootnotetext - \let\@listdepth\@mplistdepth \@mplistdepth\z@ - \@minipagerestore - \@setminipage} +\ProvidesFile{dblfnote-xetex-bidi.def}[2012/12/12 v0.3 bidi adaptations for dblfnote package for XeTeX engine] +\let\autofootnoterule\relax +\let\rightfootnoterule\relax +\let\leftfootnoterule\relax +\let\textwidthfootnoterule\relax +\let\LRfootnoterule\relax +\def\footnoterule{\kern-3\p@ + \hrule \@width \DFNcolumnwidth \kern 2.6\p@}% \AtBeginDocument{\let\dfn@latex@footnotetext\@footnotetext \let\@footnotetext\dfn@footnotetext} \long\def\dfn@LTRfootnotetext#1{{\setbox\dfn@boxa\vbox{ @@ -198,7 +178,7 @@ \newcommand{\LTRdfnmakecol}{\renewcommand{\dfn@makecol}{\dfn@LTRmakecol}} \DFNalwaysdouble %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/draftwatermark-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def index 854125449a7..1c37c5fd275 100644 --- a/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def @@ -16,7 +16,7 @@ \renewcommand\SetWatermarkText[1]{% \def\sc@wm@text{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/empheq-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def index da15e688c73..26b07d35119 100644 --- a/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def @@ -175,7 +175,7 @@ } \MHInternalSyntaxOff %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/extarticle-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def index 7d1d4f4cce6..1dec55cd081 100644 --- a/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def @@ -84,11 +84,11 @@ {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% \endlist} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-3\p@ \hrule\@width.4\columnwidth \kern2.6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -97,9 +97,9 @@ \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \null\vfil \vskip 60\p@ @@ -187,7 +187,7 @@ \renewcommand\theparagraph {\thesubsubsection\@SepMark\@arabic\c@paragraph} \renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}%% %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/extbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def index 30cc100bff2..795a3d9e734 100644 --- a/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def @@ -16,9 +16,9 @@ \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \let \LTRfootnote \LTRthanks \let \RTLfootnote \RTLthanks @@ -186,7 +186,7 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/extletter-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def index 51d7fb6fb59..c6dc9a58ec4 100644 --- a/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def @@ -37,18 +37,18 @@ \fromname \else \fromsig \fi\strut}% \par} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-\p@ \hrule \@width .4\columnwidth \kern .6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-\p@ \hrule \@width .4\columnwidth \kern .6\p@}\hfil\endR}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/extrafootnotefeatures.def b/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def index 9be540bf844..6f351875373 100644 --- a/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def +++ b/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def @@ -12,64 +12,64 @@ %% License information appended. %% %% -\ProvidesFile{extrafootnotefeatures}[2012/01/01 v0.3 bidi extra footnote features for XeTeX engine] -\g@addto@macro\document{\textwidthfootnoterule} +\ProvidesFile{extrafootnotefeatures}[2012/12/12 v0.4 bidi extra footnote features for XeTeX engine] +\let\autofootnoterule\relax +\let\rightfootnoterule\relax +\let\leftfootnoterule\relax +\let\textwidthfootnoterule\relax +\let\LRfootnoterule\relax +\def\footnoterule{\kern-3\p@ + \hrule \@width \columnwidth \kern 2.6\p@} \bidi@ensure@newcommand{\setRTLparagraphfootnotes}{\@parafootRTLtrue} \bidi@ensure@newcommand{\setLTRparagraphfootnotes}{\@parafootRTLfalse} -\long\def\@footnotetext#1{% - \begingroup - \setbox\footins - \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi +\renewcommand{\@footnotetext}[1]{% + \insert\footins{% + \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont - \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule\z@\footnotesep\ignorespaces{\foottextfont #1}% - \@finalstrut\strutbox}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup% - \m@mmf@prepare} -\long\def\@RTLfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLtrue% + \reset@font + \foottextfont + \@preamfntext + \hsize\columnwidth + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% + \@finalstrut\strutbox}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@RTLfootnotetext}[1]{% + \insert\footins{% + \@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\RTLfoottextfont - \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% - \@finalstrut\strutbox}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup% - \m@mmf@prepare} -\long\def\@LTRfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLfalse% + \reset@font + \RTLfoottextfont + \@preamfntext + \hsize\columnwidth + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% + \@finalstrut\strutbox}% + \color@endgroup}% + \m@mmf@prepare} +\renewcommand{\@LTRfootnotetext}[1]{% + \insert\footins{% + \@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\LTRfoottextfont - \interlinepenalty\interfootnotelinepenalty - \splittopskip\footnotesep - \splitmaxdepth \dp\strutbox \floatingpenalty \@MM - \hsize\columnwidth \@parboxrestore - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% - \@finalstrut\strutbox}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup% - \m@mmf@prepare} + \reset@font + \LTRfoottextfont + \@preamfntext + \hsize\columnwidth + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark}% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% + \@finalstrut\strutbox}% + \color@endgroup}% + \m@mmf@prepare} \renewcommand{\@mpfootnotetext}[1]{% \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootins @@ -79,8 +79,6 @@ \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup \reset@font% - \bidi@footnotetext@dir{#1} - \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi \@makefntext{% \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% \@finalstrut\strutbox}% @@ -94,8 +92,6 @@ \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup \reset@font% - \bidi@footnotetext@dir{#1} - \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi \@makefntext{% \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% \@finalstrut\strutbox}% @@ -109,8 +105,6 @@ \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup \reset@font% - \bidi@footnotetext@dir{#1} - \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi \@makefntext{% \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% \@finalstrut\strutbox}% @@ -1819,7 +1813,7 @@ \bidi@ensure@newcommand{\feetabovefloat}{\gdef\@makecol{\mem@makecol}} \feetabovefloat% %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/extreport-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def index 6445abd93c4..3df334eb78e 100644 --- a/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def @@ -63,11 +63,11 @@ \Huge \bfseries #1\par\nobreak \vskip 40\p@ }} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-3\p@ \hrule\@width.4\columnwidth \kern2.6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -93,9 +93,9 @@ \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \null\vfil \vskip 60\p@ @@ -190,7 +190,7 @@ \renewcommand\thetable{% \ifnum \c@chapter>\z@\thechapter\@SepMark\fi\@arabic\c@table} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def index 7bead6973a9..9f06d9dc128 100644 --- a/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def @@ -25,7 +25,7 @@ \parbox[t]{\headwidth}{\centering\if@RTLmain\beginR\else\beginL\fi#3\if@RTLmain\endR\else\endL\fi}\hfill \llap{\parbox[t]{\headwidth}{\bidi@raggedleft\if@RTLmain\beginR\else\beginL\fi#4\if@RTLmain\endR\else\endL\fi}}}}\endL}\if@RTLmain\beginR\else\beginL\fi#5\if@RTLmain\endR\else\endL\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/fix2col-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fix2col-xetex-bidi.def new file mode 100644 index 00000000000..dd0ea44a6b4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/bidi/fix2col-xetex-bidi.def @@ -0,0 +1,97 @@ +%% +%% This is file `fix2col-xetex-bidi.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bidi.dtx (with options: `fix2col-xetex-bidi.def') +%% +%% ______________________________________ +%% Copyright © 2009–2012 Vafa Khalighi +%% +%% License information appended. +%% +%% +\ProvidesFile{fix2col-xetex-bidi.def}[2012/12/12 v0.1 bidi adaptations for fix2col package for XeTeX engine] +\def\RTL@outputdblcol{% + \if@firstcolumn + \global\@firstcolumnfalse + \global\setbox\@leftcolumn\copy\@outputbox + \splitmaxdepth\maxdimen + \vbadness\maxdimen + \setbox\@outputbox\vsplit\@outputbox to\maxdimen + \toks@\expandafter{\topmark}% + \xdef\@firstcoltopmark{\the\toks@}% + \toks@\expandafter{\splitfirstmark}% + \xdef\@firstcolfirstmark{\the\toks@}% + \ifx\@firstcolfirstmark\@empty + \global\let\@setmarks\relax + \else + \gdef\@setmarks{% + \let\firstmark\@firstcolfirstmark + \let\topmark\@firstcoltopmark}% + \fi +\else \global\@firstcolumntrue +\setbox\@outputbox \vbox {\hbox to\textwidth {% +\hskip \columnwidth +\hfil \vrule width\columnseprule \hfil +\hbox to\columnwidth {\box\@leftcolumn \hss}% +\hskip -\textwidth +\hbox to\columnwidth{\box\@outputbox \hss}% +\hskip \columnsep +\hskip \columnwidth }}% +\@combinedblfloats \@setmarks \@outputpage +\begingroup \@dblfloatplacement \@startdblcolumn +\@whilesw\if@fcolmade \fi +{\@outputpage \@startdblcolumn }\endgroup +\fi} +\def\LTR@outputdblcol{% + \if@firstcolumn + \global\@firstcolumnfalse + \global\setbox\@leftcolumn\copy\@outputbox + \splitmaxdepth\maxdimen + \vbadness\maxdimen + \setbox\@outputbox\vsplit\@outputbox to\maxdimen + \toks@\expandafter{\topmark}% + \xdef\@firstcoltopmark{\the\toks@}% + \toks@\expandafter{\splitfirstmark}% + \xdef\@firstcolfirstmark{\the\toks@}% + \ifx\@firstcolfirstmark\@empty + \global\let\@setmarks\relax + \else + \gdef\@setmarks{% + \let\firstmark\@firstcolfirstmark + \let\topmark\@firstcoltopmark}% + \fi + \else + \global\@firstcolumntrue + \setbox\@outputbox\vbox{% + \hb@xt@\textwidth{% + \hb@xt@\columnwidth{\box\@leftcolumn \hss}% + \hfil + \vrule \@width\columnseprule + \hfil + \hb@xt@\columnwidth{\box\@outputbox \hss}}}% + \@combinedblfloats + \@setmarks + \@outputpage + \begingroup + \@dblfloatplacement + \@startdblcolumn + \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}% + \endgroup + \fi} +%% +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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 `fix2col-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def index 4fd34466f34..27402b260f6 100644 --- a/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def @@ -43,7 +43,7 @@ \endL\egroup \endtrivlist} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/float-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def index 9cbe8caa353..61a31615843 100644 --- a/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def @@ -17,7 +17,7 @@ \ifdim\wd\@tempboxa>\hsize {\@fs@cfont #1:} #2\par \else\hbox to\hsize{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/flowfram-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def index e75f8f11003..eb780e5ca05 100644 --- a/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def @@ -146,7 +146,7 @@ #2\relax \fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/footnote-luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def index b8b8449700e..30293bd6efd 100644 --- a/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def @@ -14,7 +14,7 @@ %% \ProvidesFile{footnote-luatex-bidi.def}[2010/07/25 v0.1 bidi footnote macros for LuaTeX engine] %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/footnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def index cf4646c8673..b02baf6c434 100644 --- a/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def @@ -12,55 +12,145 @@ %% License information appended. %% %% -\ProvidesFile{footnote-xetex-bidi.def}[2010/07/25 v0.5 bidi footnote macros for XeTeX engine] +\ProvidesFile{footnote-xetex-bidi.def}[2012/12/12 v0.6 bidi footnote macros for XeTeX engine] \if@RTLmain\@RTL@footnotetrue\else\@RTL@footnotefalse\fi -\def\bidi@footnote@output{{% - \dimen0=\ht\footins - \advance\dimen0 by\dp\footins - \def\@elt##1##2{% - \ifx\bidi@footnoterule\relax\global\let\bidi@footnoterule##2\fi - \advance\dimen0 by -##1\relax - \ifdim\dimen0<\z@ - {% - \let\@elt\relax\let\right@footnote\relax\let\left@footnote\relax - \dimen0=-\dimen0% - \xdef\new@bidi@footnote@list{\new@bidi@footnote@list\noexpand\@elt{\the\dimen0}{##2}}% -}% - \fi - \ifdim\dimen0>\z@\else -\let\right@footnote\relax\let\left@footnote\relax -\def\@elt####1####2{% - {\let\@elt\relax - \xdef\new@bidi@footnote@list{\new@bidi@footnote@list\noexpand\@elt{####1}{####2}}}% -}% +\newif\ifbidi@autofootnoterule +\newcounter{footdir@label} +\renewcommand*{\thefootdir@label}{footdir@\the\value{footdir@label}} +\newcommand*{\footdir@write}{% + \stepcounter{footdir@label}% + \zref@labelbyprops{\thefootdir@label}{abspage}% +} +\newif\iffootdir@debug +\newcommand*{\debugfootnotedirection}{\footdir@debugtrue} +\newtoks\footdir@toks +\newcommand*{\footdir@debug}[1]{% + \iffootdir@debug + \typeout{[footdir] #1}% + \fi +} +\@ifpackagelater{zref-abspage}{2012/10/27}{% + \newcommand*{\footdir@LeftRightElse}{% + \ltx@ifundefined{footdir@\the\value{zabspage}}{% + \footdir@debug{abspage \the\value{zabspage}: else}% + \ltx@thirdofthree + }{% + \if\csname footdir@\the\value{zabspage}\endcsname L% + \footdir@debug{abspage \the\value{zabspage}: left}% + \expandafter\ltx@firstofthree + \else + \footdir@debug{abspage \the\value{zabspage}: right}% + \expandafter\ltx@secondofthree \fi }% - \def\new@bidi@footnote@list{}% - \bidi@footnote@list - \global\let\bidi@footnote@list\new@bidi@footnote@list - }} -\def\right@footnote{% + }% +}{% + \providecommand*{\c@zabspage}{\c@abspage}% + \newcommand*{\footdir@LeftRightElse}{% + \footdir@write + \zifrefundefined{\thefootdir@label}{% + \footdir@debug{abspage ??: else}% + \ltx@thirdofthree + }{% + \edef\footdir@abspage{% + \zref@extractdefault{\thefootdir@label}{abspage}{0}% + }% + \ltx@ifundefined{footdir@\footdir@abspage}{% + \footdir@debug{\footdir@abspage: else}% + \ltx@thirdofthree + }{% + \if\csname footdir@\footdir@abspage\endcsname L% + \footdir@debug{\footdir@abspage: left}% + \expandafter\ltx@firstofthree + \else + \footdir@debug{\footdir@abspage: right}% + \expandafter\ltx@secondofthree + \fi + }% + }% + }% +} +\newcommand*{\footdir@fntext}[1]{% + \zifrefundefined{\thefootdir@label}{% + }{% + \edef\footdir@name{% + footdir@\zref@extractdefault{\thefootdir@label}{abspage}{0}% + }% + \@ifundefined{\footdir@name}{% + \expandafter\gdef\csname\footdir@name\endcsname{#1}% + }{}% + }% +} + +\newcommand*{\footdir@temp}[3]{% + \@ifdefinable{#1}{% + \let#1#2% + \renewcommand{#2}[1]{% + \footdir@write + \footdir@fntext{#3}% + \stepcounter{footdir@label}% + \footdir@fntext{#3}% + \footdir@toks{##1}% + \footdir@toks\expandafter{% + \the\expandafter\footdir@toks + \expandafter + \zref@labelbyprops\expandafter{\thefootdir@label}{abspage}% + }% + \expandafter#1\expandafter{\the\footdir@toks}% + }% + }% +} + +\def\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{\kern -3\p@ \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}} -\def\left@footnote{% +\def\left@footnoterule{% \hrule width .4\columnwidth\kern 2.6\p@} -\def\textwidth@footnote{\kern-3\p@ +\def\textwidth@footnoterule{\kern-3\p@ \hrule \@width \columnwidth \kern 2.6\p@} -\def\right@footnoterule{\bidi@footnote@output\right@footnote\global\let\bidi@footnoterule\relax} -\def\left@footnoterule{\bidi@footnote@output\left@footnote\global\let\bidi@footnoterule\relax} -\def\textwidth@footnoterule{\bidi@footnote@output\textwidth@footnote\global\let\bidi@footnoterule\relax} -\def\auto@footnoterule{\bidi@footnote@output - \ifx\bidi@footnoterule\relax\if@RTL\right@footnote\else\left@footnote\fi\else\bidi@footnoterule\fi - \global\let\bidi@footnoterule\relax} -\def\leftfootnoterule{\def\footnoterule{\left@footnoterule}} +\def\leftfootnoterule{% +\bidi@autofootnoterulefalse% +\def\footnoterule{\left@footnoterule}} \let\LRfootnoterule=\leftfootnoterule -\def\rightfootnoterule{\def\footnoterule{\right@footnoterule}} -\def\textwidthfootnoterule{\def\footnoterule{\textwidth@footnoterule}} -\def\autofootnoterule{\def\footnoterule{\auto@footnoterule}} -\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} -\def\bidi@footnote@list{} -\let\bidi@footnoterule\relax +\def\rightfootnoterule{% +\bidi@autofootnoterulefalse% +\def\footnoterule{\right@footnoterule}} +\def\textwidthfootnoterule{% +\bidi@autofootnoterulefalse% +\def\footnoterule{\textwidth@footnoterule}} + +\def\auto@footnoterule{% +\footdir@LeftRightElse% +\left@footnoterule% +\right@footnoterule% +\left@footnoterule% +} + +\def\autofootnoterule{% +\bidi@autofootnoteruletrue% +\def\footnoterule{\auto@footnoterule}% +} + +\newcommand*{\SplitFootnoteRule}{% + \gdef\split@prev{0} + \let\pagefootnoterule\footnoterule + \let\mpfootnoterule\footnoterule + \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@} + \def\footnoterule{\relax + \ifx \@listdepth\@mplistdepth + \mpfootnoterule + \else + \ifnum\split@prev=\z@ + \pagefootnoterule + \else + \splitfootnoterule + \fi + \xdef\split@prev{\the\insertpenalties}% + \fi + }% +} + \def\RTLfootnote{\@ifnextchar[\@xRTLfootnote{\stepcounter\@mpfn \protected@xdef\@thefnmark{\thempfn}% \@footnotemark\@RTLfootnotetext}} @@ -79,83 +169,62 @@ \unrestored@protected@xdef\@thefnmark{\thempfn}% \endgroup \@footnotemark\@LTRfootnotetext} -\def\insertRTL{\bgroup\beginR\@RTLtrue} -\def\endinsertRTL{\endR\egroup} -\def\insertLTR{\bgroup\beginL\@RTLfalse} -\def\endinsertLTR{\endL\egroup} -\DeclareRobustCommand\InLTR{\insertLTR} -\DeclareRobustCommand\EInLTR{\endinsertLTR} -\DeclareRobustCommand\InRTL{\insertRTL} -\DeclareRobustCommand\EInRTL{\endinsertRTL} -\long\def\parse@lsent#1#2\EInLTR#3#4#5\parse@end{\@sentdirfalse -\def\@tempa{\InLTR}\def\@tempb{\EInLTR}\def\@tempc{#1}\def\@tempd{#4}% -\ifx\@tempa\@tempc\ifx\@tempb\@tempd\@sentdirtrue\fi\fi} -\long\def\parse@rsent#1#2\EInRTL#3#4#5\parse@end{\@sentdirfalse -\def\@tempa{\InRTL}\def\@tempb{\EInRTL}\def\@tempc{#1}\def\@tempd{#4}% -\ifx\@tempa\@tempc\ifx\@tempb\@tempd\@sentdirtrue\fi\fi} -\long\def\iflsentence#1{\parse@lsent#1\EInLTR123\parse@end\if@sentdir} -\long\def\ifrsentence#1{\parse@rsent#1\EInRTL123\parse@end\if@sentdir} -\long\def\bidi@footnotetext@dir#1{% - \@tempswatrue - \ifrsentence{#1}\@rtl\@tempswafalse\fi - \iflsentence{#1}\@ltr\@tempswafalse\fi - \if@tempswa\if@RTL\@rtl\else\@ltr\fi\fi - \xdef\bidi@this@footnote{\if@RTL\noexpand\right@footnote\else\noexpand\left@footnote\fi}% -} -\def\bidi@footnotetext@after{% - {% - \let\@elt\relax\let\right@footnote\relax\let\left@footnote\relax - \dimen0=\ht\footins - \advance\dimen0 by\dp\footins - \xdef\bidi@footnote@list{\bidi@footnote@list\@elt{\the\dimen0}{\bidi@this@footnote}}% - }% -} + \def\setfootnoteRL{\@RTL@footnotetrue} \def\unsetfootnoteRL{\@RTL@footnotefalse} \def\setfootnoteLR{\unsetfootnoteRL} -\long\def\@footnotetext#1{% - \begingroup - \setbox\footins - \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi\reset@font\footnotesize + +\long\def\@footnotetext#1{\insert\footins{% + \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \reset@font\footnotesize \interlinepenalty\interfootnotelinepenalty \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces#1\strut}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} -\long\def\@RTLfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLtrue\reset@font\footnotesize + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}}% + +\long\def\@RTLfootnotetext#1{\insert\footins{% + \@RTLtrue% + \reset@font\footnotesize \interlinepenalty\interfootnotelinepenalty \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces #1\strut}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} -\long\def\@LTRfootnotetext#1{% - \begingroup - \setbox\footins - \vbox{\@RTLfalse\reset@font\footnotesize + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}}% + +\long\def\@LTRfootnotetext#1{\insert\footins{% + \@RTLfalse% + \reset@font\footnotesize \interlinepenalty\interfootnotelinepenalty \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore - \bidi@footnotetext@dir{#1}% - \protected@edef\@currentlabel{\csname p@footnote\endcsname\@thefnmark}\@makefntext - {\rule{\z@}{\footnotesep}\ignorespaces#1\strut}}% - \bidi@footnotetext@after - \insert\footins{\unvbox\footins}% - \endgroup} + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}}% + +\footdir@temp\footdir@ORG@bidi@footnotetext\@footnotetext{\if@RTL@footnote R\else L\fi}% +\footdir@temp\footdir@ORG@bidi@RTLfootnotetext\@RTLfootnotetext{R}% +\footdir@temp\footdir@ORG@bidi@LTRfootnotetext\@LTRfootnotetext{L}% + \long\def\@mpRTLfootnotetext#1{% + \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\rightfootnoterule\fi\fi% \global\setbox\@mpfootins\vbox{\@RTLtrue% \unvbox\@mpfootins \reset@font\footnotesize @@ -164,12 +233,11 @@ \protected@edef\@currentlabel {\csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \bidi@footnotetext@dir{#1} - \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% \color@endgroup}} \long\def\@mpLTRfootnotetext#1{% + \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\leftfootnoterule\fi\fi% \global\setbox\@mpfootins\vbox{\@RTLfalse% \unvbox\@mpfootins \reset@font\footnotesize @@ -178,12 +246,11 @@ \protected@edef\@currentlabel {\csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \bidi@footnotetext@dir{#1} - \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% \color@endgroup}} \long\def\@mpfootnotetext#1{% + \ifbidi@autofootnoterule\ifnum\c@mpfootnote=1\if@RTL@footnote\rightfootnoterule\else\leftfootnoterule\fi\fi\fi% \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootins \reset@font\footnotesize @@ -192,8 +259,6 @@ \protected@edef\@currentlabel {\csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \bidi@footnotetext@dir{#1} - \ifnum\c@mpfootnote=1\if@RTL\global\let\bidi@footnoterule\right@footnote\else\global\let\bidi@footnoterule\left@footnote\fi\fi \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% \color@endgroup}} @@ -247,7 +312,7 @@ \@RTLfootnotetext} \leftfootnoterule %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/framed-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def index 034ad24734d..9e750560353 100644 --- a/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def @@ -188,7 +188,7 @@ \sloppy } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/graphicx-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def index 2b6a8ee607f..982d765cdad 100644 --- a/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def @@ -131,7 +131,7 @@ \Gscale@box\@tempa[\@tempb]{\box\@tempboxa}% \@end@tempboxa} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/hvfloat-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/hvfloat-xetex-bidi.def index 2b24f1da4cd..eeb712e0974 100644 --- a/Master/texmf-dist/tex/latex/bidi/hvfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/hvfloat-xetex-bidi.def @@ -287,7 +287,7 @@ \fi } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/hyperref-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def index e8569cf7320..ef177c0fcb6 100644 --- a/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def @@ -246,7 +246,7 @@ }% \endgroup %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/leqno-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def index f39d99b59fd..1ebc8f52326 100644 --- a/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def @@ -17,7 +17,7 @@ \rlap{ \hskip -\displaywidth{\normalfont\normalcolor\if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/letter-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def index 0bf2cda2f73..443595a74b0 100644 --- a/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def @@ -26,18 +26,18 @@ {\if@RTL\raggedleft\else\raggedright\fi \toname \\ \toaddress \par}% \vspace{2\parskip}% #1\par\nobreak} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-\p@ \hrule \@width .4\columnwidth \kern .6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-\p@ \hrule \@width .4\columnwidth \kern .6\p@}\hfil\endR}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/lettrine-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def index 67580afaee2..51d471cdb13 100644 --- a/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def @@ -103,7 +103,7 @@ \hskip \the\L@Findent}\fi}$% \usebox{\L@tbox}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/listings-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def index b99bff86742..17a9fbb3e8b 100644 --- a/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def @@ -22,7 +22,7 @@ \gdef\thelstlisting{\@arabic\c@lstlisting} \fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def index 85f55861115..8582816e3a0 100644 --- a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def @@ -12,7 +12,7 @@ %% License information appended. %% %% -\ProvidesFile{loadingorder-bidi.def}[2012/01/01 v0.8a making sure that bidi is the last package loaded] +\ProvidesFile{loadingorder-bidi.def}[2012/12/12 v0.9 making sure that bidi is the last package loaded] \bidi@isloaded{amsmath} \bidi@isloaded{amsthm} \bidi@isloaded{breqn} @@ -35,6 +35,7 @@ \bidi@isloaded{ntheorem-hyper} \bidi@isloaded{hyperref} \bidi@isloaded{fancyhdr} +\bidi@isloaded{fix2col} \bidi@isloaded{draftwatermark} \bidi@isloaded{empheq} \bidi@isloaded{pdfpages} @@ -63,6 +64,7 @@ \bidi@isloaded{tabls} \bidi@isloaded{tabulary} \bidi@isloaded{tocstyle} +\bidi@isloaded{tocbibind} \bidi@isloaded{fontspec} \bidi@isloaded{arabxetex} \bidi@isloaded{polyglossia} @@ -216,6 +218,9 @@ \if@bidi@tocstyleloaded@\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tocstyle after bidi package. Please load package tocstyle before bidi package, and then try to run xelatex on your document again}{}]{tocstyle} \fi% + \if@bidi@tocbibindloaded@\else + \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tocbibind after bidi package. Please load package tocbibind before bidi package, and then try to run xelatex on your document again}{}]{tocbibind} + \fi% \if@bidi@fontspecloaded@\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fontspec after bidi package. Please load package fontspec before bidi package, and then try to run xelatex on your document again}{}]{fontspec} \fi% @@ -230,7 +235,7 @@ \fi% } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/longtable-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def index c11aca30969..42960ec31bc 100644 --- a/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def @@ -12,7 +12,7 @@ %% License information appended. %% %% -\ProvidesFile{longtable-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for longtable package for XeTeX engine] +\ProvidesFile{longtable-xetex-bidi.def}[2012/12/12 v0.2 bidi adaptations for longtable package for XeTeX engine] \def\LT@makecaption#1#2#3{% \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{% \sbox\@tempboxa{\if@RTL\beginR\fi#1{#2: }#3\if@RTL\endR\fi}% @@ -23,8 +23,22 @@ \fi \endgraf\vskip\baselineskip}% \hss}}} -%% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +\def\LT@startpbox#1{% + \bgroup + \let\@footnotetext\LT@p@ftntext + \let\@LTRfootnotetext\LT@p@LTRftntext + \let\@RTLfootnotetext\LT@p@RTLftntext + \setlength\hsize{#1}% + \@arrayparboxrestore + \vrule \@height \ht\@arstrutbox \@width \z@} +\def\LT@p@LTRftntext#1{% + \edef\@tempa{\the\LT@p@ftn\noexpand\LTRfootnotetext[\the\c@footnote]}% + \global\LT@p@ftn\expandafter{\@tempa{#1}}}% +\def\LT@p@RTLftntext#1{% + \edef\@tempa{\the\LT@p@ftn\noexpand\RTLfootnotetext[\the\c@footnote]}% + \global\LT@p@ftn\expandafter{\@tempa{#1}}}% +%% +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def index a6daf3b3f8d..acbe3971209 100644 --- a/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def @@ -16,7 +16,7 @@ \directlua { tex.enableprimitives('',{'pagedir','bodydir','pardir','textdir','mathdir'}) } \input{footnote-luatex-bidi.def} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/memoir-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def index 266cab74fdd..a366283d459 100644 --- a/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def @@ -169,7 +169,7 @@ \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi \begin{bibitemlist}{#1}}{\end{bibitemlist}\postbibhook} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/minitoc-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def index 295f32bf726..48a7e0bec2d 100644 --- a/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def @@ -51,7 +51,7 @@ \par}% \fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/multicol-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def index 46c3c1cf635..5f63e2c28b9 100644 --- a/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def @@ -110,14 +110,14 @@ \hsize\textwidth \columnwidth\textwidth \orig@RTLfootnotetext{#1}\endgroup} -\def\right@footnote{% +\def\right@footnoterule{% \hbox to \textwidth {\beginR \vbox{\kern -3\p@ \hrule width .4\columnwidth \kern2.6\p@}\hfil\endR}} -\def\textwidth@footnote{\kern-3\p@ +\def\textwidth@footnoterule{\kern-3\p@ \hrule \@width \textwidth \kern 2.6\p@} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/multienum-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/multienum-xetex-bidi.def index 701e827b895..df652e7f141 100644 --- a/Master/texmf-dist/tex/latex/bidi/multienum-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/multienum-xetex-bidi.def @@ -80,7 +80,7 @@ \parbox[t]{\labelwidth}{\hfill{\labelname}}\hskip\labelsep \parbox[t]{\remainxoxx}{\bidi@raggedright #3}\smallskip} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/natbib-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def index 12095eb6e36..272a4781d12 100644 --- a/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def @@ -40,7 +40,7 @@ \bibcleanup }% %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/ntheorem-hyper-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/ntheorem-hyper-xetex-bidi.def index e7b7c9ee357..3e94e8138b9 100644 --- a/Master/texmf-dist/tex/latex/bidi/ntheorem-hyper-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/ntheorem-hyper-xetex-bidi.def @@ -33,7 +33,7 @@ \if@RTL\parshape \@ne 0pt \linewidth\else \parshape \@ne \@totalleftmargin \linewidth\fi \@ifnextchar[{\@ythm{#1}{#2}{#3}}{\@xthm{#1}{#2}{#3}}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/ntheorem-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/ntheorem-xetex-bidi.def index 2c76973d0f8..a5b938f6089 100644 --- a/Master/texmf-dist/tex/latex/bidi/ntheorem-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/ntheorem-xetex-bidi.def @@ -34,7 +34,7 @@ \if@RTL\parshape \@ne 0pt \linewidth\else \parshape \@ne \@totalleftmargin \linewidth\fi \@ifnextchar[{\@ythm{#1}{#2}{#3}}{\@xthm{#1}{#2}{#3}}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/pdfpages-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def index ceb501256b5..a46baf1889f 100644 --- a/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def @@ -61,7 +61,7 @@ \AM@ClearShipoutPicture } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/pgf-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def index de82a09203f..79ca8fe5181 100644 --- a/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def @@ -18,7 +18,7 @@ \def\pgfpicture{\ifmmode\else\LTR\beginL\fi\origin@pgfpicture} \def\endpgfpicture{\origin@endpgfpicture\ifmmode\else\endL\endLTR\fi}% %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/picinpar-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/picinpar-xetex-bidi.def index f306f955b6a..72e667b3856 100644 --- a/Master/texmf-dist/tex/latex/bidi/picinpar-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/picinpar-xetex-bidi.def @@ -21,7 +21,7 @@ \hbox to\picwd{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi} \fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/plain-luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def index 188ed444dbd..9db1fc0e970 100644 --- a/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def @@ -14,7 +14,7 @@ %% \directlua { tex.enableprimitives('',tex.extraprimitives()) } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/plain-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def index d8104c69c0b..d98714c5397 100644 --- a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def @@ -96,7 +96,7 @@ \def\leftline#1{\line{\if@RTL\beginR\fi#1\if@RTL\endR\fi\hss}} \def\rightline#1{\line{\hss\if@RTL\beginR\fi#1\if@RTL\endR\fi}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/pstricks-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def index 678efbe40db..4d33e49cb13 100644 --- a/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def @@ -18,7 +18,7 @@ \def\pspicture{\ifmmode\else\LTR\beginL\fi\origin@pspicture} \def\endpspicture{\origin@endpspicture\ifmmode\else\endL\endLTR\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/quotchap-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def index 18505f8e3f8..7f6f47fa2fc 100644 --- a/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def @@ -29,7 +29,7 @@ \vbox to\z@{\leavevmode\copy\@quotebox\vss} \global\let\@printcites\relax} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/ragged2e-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def index 174a979e957..bd161195910 100644 --- a/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def @@ -99,7 +99,7 @@ \def\RaggedLeft{\if@RTL\origin@RaggedRight\else\origin@RaggedLeft\fi} \def\RaggedRight{\if@RTL\origin@RaggedLeft\else\origin@RaggedRight\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/rapport1-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def index df805032a8d..ff16e34ec7f 100644 --- a/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def @@ -106,13 +106,13 @@ \else \renewcommand*\l@chapter{\@regtocline{0}} \fi -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \kern.5\baselineskip \hrule\@width\unitindent \kern.4\baselineskip } -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -153,9 +153,9 @@ \renewcommand*\maketitle{% \begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \long\def\@makefntext##1{\parindent\z@ \def\labelitemi{\textendash}\@revlabeltrue @@ -270,7 +270,7 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/rapport3-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def index 8c2e4c1862f..743c6925196 100644 --- a/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def @@ -33,9 +33,9 @@ \renewcommand*\maketitle{% \begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \let \LTRfootnote \LTRthanks \let \RTLfootnote \RTLthanks @@ -273,13 +273,13 @@ {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% \endlist} -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \kern.5\baselineskip \hrule\@width\unitindent \kern.4\baselineskip } -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -292,7 +292,7 @@ \hyphenpenalty=\@M \exhyphenpenalty=\@M \if@RTL\leftskip\else\rightskip\fi=0cm plus .7\hsize\relax} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/refrep-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def index 3543fffb1d7..14811cdc252 100644 --- a/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def @@ -16,9 +16,9 @@ \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let\footnote\thanks \let\LTRfootnote\LTRthanks \let\RTLfootnote\RTLthanks @@ -154,11 +154,11 @@ \renewcommand\secshape{\if@RTL\rightskip\else\leftskip\fi=-\leftmarginwidth% \if@RTL\leftskip\else\rightskip\fi=\@flushglue% \hyphenpenalty=2000} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-3\p@ \hrule\@width.4\columnwidth \kern 2.6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -196,7 +196,7 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/report-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def index fb51db3562f..ca7e22f53e2 100644 --- a/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def @@ -31,9 +31,9 @@ \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let \footnote \thanks \let \LTRfootnote \LTRthanks \let \RTLfootnote \RTLthanks @@ -154,11 +154,11 @@ \penalty\@highpenalty \endgroup \fi} -\renewcommand\left@footnote{% +\renewcommand\left@footnoterule{% \kern-3\p@ \hrule\@width.4\columnwidth \kern2.6\p@} -\renewcommand\right@footnote{% +\renewcommand\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -217,7 +217,7 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def index 93ae9985de3..f2d7889f6bd 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def @@ -56,14 +56,14 @@ \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi {\usekomafont{footnoterule}{% \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{\kern -3\p@ \normalsize\ftn@rule@test@values @@ -79,9 +79,9 @@ #1% }% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let\footnote\thanks \let\LTRfootnote\LTRthanks \let\RTLfootnote\RTLthanks @@ -376,12 +376,12 @@ \fi \bib@endhook } -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi \hrule\@width.4\columnwidth \kern 2.6\p@} -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -481,7 +481,7 @@ \fi } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def index 59d717c2a14..9cde3cfa667 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def @@ -56,14 +56,14 @@ \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi {\usekomafont{footnoterule}{% \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{\kern -3\p@ \normalsize\ftn@rule@test@values @@ -79,9 +79,9 @@ #1% }% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let\footnote\thanks \let\LTRfootnote\LTRthanks \let\RTLfootnote\RTLthanks @@ -432,12 +432,12 @@ \fi \bib@endhook } -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi \hrule\@width.4\columnwidth \kern 2.6\p@} -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -537,7 +537,7 @@ \fi } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/scrlettr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def index 3caf9ef0bf3..a0f7366f5fe 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def @@ -35,10 +35,10 @@ } \deffootnote[1em]{1.5em}{1em} {\textsuperscript{\thefootnotemark}} -\def\left@footnote{\kern-1\p@ +\def\left@footnoterule{\kern-1\p@ \hrule width 0.4\columnwidth \kern .6\p@} -\def\right@footnote{% +\def\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{\kern -3\p@ \kern-1\p@ @@ -123,7 +123,7 @@ \fromsig\strut}\par \vspace{1.5\baselineskip}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def index bd71517cf33..044299bd366 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def @@ -56,14 +56,14 @@ \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi {\usekomafont{footnoterule}{% \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{\kern -3\p@ \normalsize\ftn@rule@test@values @@ -79,9 +79,9 @@ #1% }% \let\footnotesize\small - \let\right@footnote\relax - \let\left@footnote\relax - \let\textwidth@footnote\relax + \let\right@footnoterule\relax + \let\left@footnoterule\relax + \let\textwidth@footnoterule\relax \let\footnote\thanks \let\LTRfootnote\LTRthanks \let\RTLfootnote\RTLthanks @@ -389,12 +389,12 @@ \fi \bib@endhook } -\renewcommand*\left@footnote{% +\renewcommand*\left@footnoterule{% \kern-3\p@ \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi \hrule\@width.4\columnwidth \kern 2.6\p@} -\renewcommand*\right@footnote{% +\renewcommand*\right@footnoterule{% \hbox to \columnwidth {\beginR \vbox{% \kern-3\p@ @@ -494,7 +494,7 @@ \fi } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/sidecap-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/sidecap-xetex-bidi.def index 2c138fbc123..082d0a307b3 100644 --- a/Master/texmf-dist/tex/latex/bidi/sidecap-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/sidecap-xetex-bidi.def @@ -20,7 +20,7 @@ \isSC@ODD{\RaggedLeft}{\RaggedRight}\else% \isSC@ODD{\RaggedRight}{\RaggedLeft}\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/stabular-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def index 1c2d630f6a8..6054046404a 100644 --- a/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def @@ -40,7 +40,7 @@ \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi \@preamble} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/subfigure-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def index bbb63a759bc..3648a47a2e0 100644 --- a/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def @@ -18,7 +18,7 @@ \let\p@subtable=\thetable% } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/tabls-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def index ef94c5e8332..88eea93f285 100644 --- a/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def @@ -48,7 +48,7 @@ \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi \@preamble} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/tabulary-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def index 14e54e5b25d..67dd7457451 100644 --- a/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def @@ -43,7 +43,7 @@ \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} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/titlesec-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def index 4c4043268e3..f58b4ffcbda 100644 --- a/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def @@ -42,7 +42,7 @@ \nobreak\ttl@midlongest#5\@@par}% \ttl@endlongest} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/titletoc-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def index 77b4dd38720..484fbe4f106 100644 --- a/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def @@ -57,7 +57,7 @@ \advance\if@RTL\leftskip\else\rightskip\fi#2\relax \def\@pnumwidth{#2}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/tocbibind-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def index 5b08f113325..69c53ee8217 100644 --- a/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def @@ -12,7 +12,7 @@ %% License information appended. %% %% -\ProvidesFile{tocbibind-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for tocbibind package for XeTeX engine] +\ProvidesFile{tocbibind-xetex-bidi.def}[2012/12/12 v0.3 bidi adaptations for tocbibind package for XeTeX engine] \if@dotocbib \@ifpackageloaded{natbib}{}{% natbib not loaded \renewcommand{\bibsection}{\t@cb@bchapsec} @@ -43,8 +43,57 @@ {} \fi +\if@inltxdoc\else + \renewenvironment{theindex}% + {\if@twocolumn + \@restonecolfalse + \else + \@restonecoltrue + \fi + \if@bibchapter + \if@donumindex + \refstepcounter{chapter} + \twocolumn[\vspace*{2\topskip}% + \@makechapterhead{\indexname}]% + \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}\indexname} + \chaptermark{\indexname} + \else + \if@dotocind + \twocolumn[\vspace*{2\topskip}% + \@makeschapterhead{\indexname}]% + \prw@mkboth{\indexname} + \addcontentsline{toc}{chapter}{\indexname} + \else + \twocolumn[\vspace*{2\topskip}% + \@makeschapterhead{\indexname}]% + \prw@mkboth{\indexname} + \fi + \fi + \else + \if@donumindex + \twocolumn[\vspace*{-1.5\topskip}% + \@nameuse{\@tocextra}{\indexname}]% + \csname \@tocextra mark\endcsname{\indexname} + \else + \if@dotocind + \twocolumn[\vspace*{-1.5\topskip}% + \toc@headstar{\@tocextra}{\indexname}]% + \prw@mkboth{\indexname} + \addcontentsline{toc}{\@tocextra}{\indexname} + \else + \twocolumn[\vspace*{-1.5\topskip}% + \toc@headstar{\@tocextra}{\indexname}]% + \prw@mkboth{\indexname} + \fi + \fi + \fi + \thispagestyle{plain}\parindent\z@ + \parskip\z@ \@plus .3\p@\relax + \let\item\@idxitem} + {\if@restonecol\onecolumn\else\clearpage\fi} +\fi %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/tocloft-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def index ed95731d27d..760dbef3f38 100644 --- a/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def @@ -321,7 +321,7 @@ \if@RTL\leftskip\else\rightskip\fi \@tocrmarg\relax \textit{#1}\protect\par}}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/tocstyle-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def index 8128e56bf86..547991449a1 100644 --- a/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def @@ -259,7 +259,7 @@ \@tempa } %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/wrapfig-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def index edff2164eaa..8a804f80c60 100644 --- a/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def @@ -89,7 +89,7 @@ \aftergroup\WF@startwrapping % after the \endgroup which immediately follows \fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/xcolor-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def index c3465491a0b..9395be56f2d 100644 --- a/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def @@ -117,7 +117,7 @@ {\@ifxempty{#3}{\bidicolor#1}{\bidicolor#3}{#4}}} \def\color@setgroup{\begingroup\ifhmode\if@RTL\beginL\aftergroup\endR\fi\fi\set@color\ifhmode\if@RTL\beginR\aftergroup\endL\fi\fi} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def index 6516f3d31a5..c6d0b7042e1 100644 --- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def @@ -12,7 +12,7 @@ %% License information appended. %% %% -\ProvidesFile{xetex-bidi.def}[2012/07/25 v1.0.4 bidi adaptations for XeTeX engine] +\ProvidesFile{xetex-bidi.def}[2012/12/12 v1.0.6 bidi adaptations for XeTeX engine] \newcommand{\TeXXeTOn}{\TeXXeTstate=1 } \newcommand{\TeXXeTOff}{\TeXXeTstate=0 } \TeXXeTOn @@ -249,7 +249,7 @@ \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\else \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi \else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi\fi - \ignorespaces}{\endtrivlist} + \ignorespaces}{\vskip\z@} \newenvironment{RTLitems} {\par\@RTLtrue \if@bidi@list@minipage@parbox @@ -258,7 +258,7 @@ \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi \else \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi\fi - \ignorespaces}{\endtrivlist} + \ignorespaces}{\vskip\z@} \newenvironment{LTRbibitems} {\par\@RTLfalse \if@bidi@list@minipage@parbox @@ -267,7 +267,7 @@ \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\else \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi \else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi\fi - \ignorespaces}{\endtrivlist} + \ignorespaces}{\vskip\z@} \newenvironment{RTLbibitems} {\par\@RTLtrue \if@bidi@list@minipage@parbox @@ -276,7 +276,7 @@ \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi \else \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi\fi - \ignorespaces}{\endtrivlist} + \ignorespaces}{\vskip\z@} \def\raggedright{% \let\\\@centercr \rightskip\z@skip\rightskip\@flushglue @@ -654,6 +654,9 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \def\leqno{\ifnum\predisplaydirection<\z@ \bidi@saved@eqno \else \bidi@saved@leqno \fi} \def\@eqnnum{{\normalfont \normalcolor \if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}} \input{footnote-xetex-bidi.def} +\if@bidi@csundef{@idxitem}{}{% +\renewcommand\@idxitem{\par\hangindent \if@RTL-\fi40\p@}% +} \@ifclassloaded{article}{\@ifclassloaded{svmult}{}{\input{article-xetex-bidi.def}}}{} \@ifclassloaded{extarticle}{\input{extarticle-xetex-bidi.def}}{} \@ifclassloaded{artikel1}{\input{artikel1-xetex-bidi.def}}{} @@ -700,6 +703,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \@ifpackageloaded{hyperref}{\input{hyperref-xetex-bidi.def}}{} \@ifpackageloaded{ntheorem-hyper}{\input{ntheorem-hyper-xetex-bidi.def}}{} \@ifpackageloaded{fancyhdr}{\input{fancyhdr-xetex-bidi.def}}{} +\@ifpackageloaded{fix2col}{\input{fix2col-xetex-bidi.def}}{} \@ifpackageloaded{draftwatermark}{\input{draftwatermark-xetex-bidi.def}}{} \@ifpackageloaded{dblfnote}{\input{dblfnote-xetex-bidi.def}}{} \@ifpackageloaded{empheq}{\input{empheq-xetex-bidi.def}}{} @@ -753,7 +757,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xetex-bidi.def}}}{} \DeclareOption{extrafootnotefeatures}{\input{extrafootnotefeatures.def}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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/latex/bidi/xltxtra-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def index 6d494f83428..72c77e2d237 100644 --- a/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def @@ -18,7 +18,7 @@ \let\@@XeLaTeX\XeLaTeX \def\XeLaTeX{\@ensure@LTR{\@@XeLaTeX}} %% -%% Copyright © 2009–2012 Vafa Khalighi <vafakhlg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafak12@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 |