diff options
| author | Karl Berry <karl@freefriends.org> | 2011-10-06 23:15:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-10-06 23:15:52 +0000 |
| commit | b4fefed5b0939741f33ffadc04310e124c70178f (patch) | |
| tree | d3facbcd7ef880ed8d3366b12b5cfbab8a1a93a6 /Master/texmf-dist | |
| parent | 0cc9d75d99a00ca3206f389fde8fe87cccec4424 (diff) | |
bidi (6oct11)
git-svn-id: svn://tug.org/texlive/trunk@24222 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
106 files changed, 1495 insertions, 986 deletions
diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README index 9853d4365d4..6258209b1b6 100644 --- a/Master/texmf-dist/doc/latex/bidi/README +++ b/Master/texmf-dist/doc/latex/bidi/README @@ -1,20 +1,18 @@ ___________________ The bidi package -v1.3.4 +v1.3.5 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX. -This version fixes all the bugs that were present in v1.3.3. - ___________________ -VAFA KHALIGHI +Vafa Khalighi vafaklg@gmail.com -Copyright © 2007–2011 +Copyright © 2007–2012 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. +by Vafa Khalighi. diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.pdf b/Master/texmf-dist/doc/latex/bidi/bidi.pdf Binary files differindex dff6bba5158..0de21ef6077 100644 --- a/Master/texmf-dist/doc/latex/bidi/bidi.pdf +++ b/Master/texmf-dist/doc/latex/bidi/bidi.pdf diff --git a/Master/texmf-dist/doc/latex/bidi/test-bidi.tex b/Master/texmf-dist/doc/latex/bidi/test-bidi.tex index 7c4a31b66fc..e81a1dc599b 100644 --- a/Master/texmf-dist/doc/latex/bidi/test-bidi.tex +++ b/Master/texmf-dist/doc/latex/bidi/test-bidi.tex @@ -1,7 +1,7 @@ \documentclass{article} \usepackage{bidi} \title{Testing Basic Bidi Direction Change} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle In this document we test bidi direction change in \textsf{RTL} and \textsf{LTR}. These tests includes \texttt{flushleft}, \texttt{flushright} environments and \verb|\centerline{...}|, \verb|\leftline{...}|,\verb|\rightline{...}|,\verb|\raggedleft| and \verb|\raggedright| macros. diff --git a/Master/texmf-dist/doc/latex/bidi/test-supertabular.tex b/Master/texmf-dist/doc/latex/bidi/test-supertabular.tex index d0f7252b987..af040d23c2c 100644 --- a/Master/texmf-dist/doc/latex/bidi/test-supertabular.tex +++ b/Master/texmf-dist/doc/latex/bidi/test-supertabular.tex @@ -2,7 +2,7 @@ \usepackage{supertabular} \usepackage{bidi} \title{Testing \textsf{supertabular} package in RTL and LTR} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle \section{LTR} diff --git a/Master/texmf-dist/doc/latex/bidi/test-tabular.tex b/Master/texmf-dist/doc/latex/bidi/test-tabular.tex index 6f03bab1b18..826f38c3515 100644 --- a/Master/texmf-dist/doc/latex/bidi/test-tabular.tex +++ b/Master/texmf-dist/doc/latex/bidi/test-tabular.tex @@ -1,7 +1,7 @@ \documentclass{article} \usepackage{bidi} \title{Testing \LaTeX's Default Tabular in \textsf{RTL} and \textsf{LTR}} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \newcommand{\rb}[1]{\raisebox{1.5ex}[0mm]{#1}} \begin{document} \maketitle diff --git a/Master/texmf-dist/doc/latex/bidi/test-tabularx.tex b/Master/texmf-dist/doc/latex/bidi/test-tabularx.tex index 446a67550b8..719c266896f 100644 --- a/Master/texmf-dist/doc/latex/bidi/test-tabularx.tex +++ b/Master/texmf-dist/doc/latex/bidi/test-tabularx.tex @@ -2,7 +2,7 @@ \usepackage{tabularx} \usepackage{bidi} \title{Testing \textsf{tabularx} Package in RTL and LTR} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle \section{LTR} diff --git a/Master/texmf-dist/doc/latex/bidi/test-tabulary.tex b/Master/texmf-dist/doc/latex/bidi/test-tabulary.tex index 6b9a4858fe7..81067943c49 100644 --- a/Master/texmf-dist/doc/latex/bidi/test-tabulary.tex +++ b/Master/texmf-dist/doc/latex/bidi/test-tabulary.tex @@ -4,7 +4,7 @@ \setlength\tymax{\maxdimen} \usepackage{bidi} \title{Testing \textsf{tabulary} package in RTL and LTR} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle \section{LTR} diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx index d57ca5c10b8..48a056d02aa 100644 --- a/Master/texmf-dist/source/latex/bidi/bidi.dtx +++ b/Master/texmf-dist/source/latex/bidi/bidi.dtx @@ -5,24 +5,22 @@ %<*readme> ___________________ The bidi package -v1.3.4 +v1.3.5 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX. -This version fixes all the bugs that were present in v1.3.3. - ___________________ -VAFA KHALIGHI +Vafa Khalighi vafaklg@gmail.com -Copyright © 2007–2011 +Copyright © 2007–2012 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. +by Vafa Khalighi. %</readme> %<*internal> \fi @@ -34,7 +32,7 @@ by VAFA KHALIGHI. \preamble ______________________________________ - Copyright © 2009–2011 VAFA KHALIGHI + Copyright © 2009–2012 Vafa Khalighi License information appended. @@ -42,14 +40,14 @@ by VAFA KHALIGHI. \endpreamble \postamble -Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +by Vafa Khalighi. @@ -189,7 +187,7 @@ by VAFA KHALIGHI. \usepackage{bbding} \usepackage{bidicode} \usepackage[numbered]{hypdoc} -\hypersetup{pdftitle={The \textsf{bidi} Package (Support for bidirectional typesetting in plain \TeX{} and \LaTeXe)},pdfauthor={VAFA KHALIGHI <vafaklg@gmail.com>}} +\hypersetup{pdftitle={The \textsf{bidi} Package (Support for bidirectional typesetting in plain \TeX{} and \LaTeXe)},pdfauthor={Vafa Khalighi <vafaklg@gmail.com>}} \setlength\columnseprule{.4pt} \newcommand\XeTeX{Xe\TeX} \newcommand\XeLaTeX{Xe\LaTeX} @@ -230,9 +228,9 @@ by VAFA KHALIGHI. % \makeatletter % \title{The \textsf{bidi} Package\\[5pt] % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe} -% \author{VAFA KHALIGHI\\ +% \author{Vafa Khalighi\\ % \url{vafaklg@gmail.com}} -% \date{\today\qquad Version 1.3.4} +% \date{\today\qquad Version 1.3.5} % \maketitle % \tableofcontents %\section*{Introduction} @@ -246,8 +244,8 @@ by VAFA KHALIGHI. %Description: A convenient interface for typesetting bidirectional texts %in plain TeX and LaTeX. The package includes adaptations for use %with many other commonly-used packages. -%Copyright (c) 2009-2011 VAFA KHALIGHI -%v1.3.4, 2011/12/01 +%Copyright (c) 2009-2012 Vafa Khalighi +%v1.3.5, 2012/01/01 %License: LaTeX Project Public License, version 1.3c or higher (your choice) %Location on CTAN: /macros/latex/contrib/bidi %\end{lstlisting} @@ -2520,8 +2518,8 @@ by VAFA KHALIGHI. % \subsection{\textsf{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2011/12/01} -\def\bidiversion{v1.3.4} +\def\bididate{2012/01/01} +\def\bidiversion{v1.3.5} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -2529,7 +2527,7 @@ bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J Description: A convenient interface for typesetting bidirectional^^J texts in plain TeX and LaTeX. The package includes adaptations for use^^J with many other commonly-used packages.^^J -Copyright © 2009–2011 VAFA KHALIGHI^^J +Copyright © 2009–2012 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J Location on CTAN: /macros/latex/contrib/bidi} @@ -2557,6 +2555,28 @@ Location on CTAN: /macros/latex/contrib/bidi} \expandafter\@gobbletwo\string#3\endcsname {\let#2#3% \let#1#3}} +\newcommand*{\if@bidi@csdef}[1]{% + \ifcsname#1\endcsname + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} +\newcommand{\if@bidi@def}[1]{% + \ifdefined#1% + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} +\newcommand{\bidi@namelongdef}[1]{% + \long\expandafter\def\csname #1\endcsname} +\def\bidi@ensure@newcommand{\@star@or@long\bidi@ensure@new@command} +\def\bidi@ensure@new@command#1{% + \begingroup \escapechar\m@ne\xdef\@gtempa{{\string#1}}\endgroup + \expandafter\if@bidi@csdef\@gtempa + {\relax% + \let\@ifdefinable\@rc@ifdefinable% + \new@command#1}{\new@command#1}} +\def\bidi@ensure@newlength#1{\if@bidi@def#1{}{\newskip#1}} \eqnewif{\if@RTLmain}{\if@rlmain} \eqnewif{\if@RTL}{\if@rl} \newif\if@RTLmaths @@ -2567,6 +2587,8 @@ Location on CTAN: /macros/latex/contrib/bidi} \newif\if@LTRbibitems \newif\if@RTLbibitems \newif\if@sentdir +\newif\if@parafootRTL +\newif\if@RTLcolumnfootnotes \eqnewif{\if@RTL@footnote}{\if@rl@footnote} \@RTLmainfalse \AtBeginDocument{% @@ -2601,7 +2623,7 @@ Location on CTAN: /macros/latex/contrib/bidi} %\fi % \subsection{\textsf{bidi.tex}} % \begin{macrocode} -\def\bididate{2011/12/01} +\def\bididate{2012/01/01} \def\bidiversion{v0.1} \catcode`@=11 \newlinechar`\^^J @@ -2610,7 +2632,7 @@ bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J Description: A convenient interface for typesetting bidirectional^^J texts in plain TeX and LaTeX. The package includes adaptations for use^^J with many other commonly-used packages.^^J -Copyright © 2009–2011 VAFA KHALIGHI^^J +Copyright © 2009–2012 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J Location on CTAN: /macros/latex/contrib/bidi} @@ -6995,43 +7017,141 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{extrafootnotefeatures.def}} % \begin{macrocode} -\ProvidesFile{extrafootnotefeatures}[2011/08/01 v0.2 bidi extra footnote features for XeTeX engine] -\newif\if@parafootRTL -\newcommand{\setRTLparagraphfootnotes}{\@parafootRTLtrue} -\newcommand{\setLTRparagraphfootnotes}{\@parafootRTLfalse} +\ProvidesFile{extrafootnotefeatures}[2012/01/01 v0.3 bidi extra footnote features for XeTeX engine] +\g@addto@macro\document{\textwidthfootnoterule} +\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 + \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% + \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% + \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} +\renewcommand{\@mpfootnotetext}[1]{% + \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootins + \def\baselinestretch{\m@m@footnote@spacing}% + \foottextfont \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \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}% + \color@endgroup}} +\renewcommand{\@mpLTRfootnotetext}[1]{% + \global\setbox\@mpfootins\vbox{\@RTLfalse% + \unvbox\@mpfootins + \def\baselinestretch{\m@m@footnote@spacing}% + \LTRfoottextfont \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \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}% + \color@endgroup}} +\renewcommand{\@mpRTLfootnotetext}[1]{% + \global\setbox\@mpfootins\vbox{\@RTLtrue% + \unvbox\@mpfootins + \def\baselinestretch{\m@m@footnote@spacing}% + \RTLfoottextfont \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \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}% + \color@endgroup}} \let\m@mold@footnotetext\@footnotetext \let\m@mold@LTRfootnotetext\@LTRfootnotetext \let\m@mold@RTLfootnotetext\@RTLfootnotetext \let\m@mold@mpfootnotetext\@mpfootnotetext \let\m@mold@mpLTRfootnotetext\@mpLTRfootnotetext \let\m@mold@mpRTLfootnotetext\@mpRTLfootnotetext -\newcommand{\normalfootnotes}{% +\bidi@ensure@newcommand{\normalfootnotes}{% \let\@footnotetext\m@mold@footnotetext \let\@LTRfootnotetext\m@mold@LTRfootnotetext \let\@RTLfootnotetext\m@mold@RTLfootnotetext \let\@mpfootnotetext\m@mold@mpfootnotetext \let\@mpLTRfootnotetext\m@mold@mpLTRfootnotetext \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext} -\newif\if@RTLcolumnfootnotes -\newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue} -\newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse} -\g@addto@macro\document{\textwidthfootnoterule} -\newcommand*{\setSingleSpace}[1]{% +\@ifclassloaded{memoir}{\let\plainfootnotes\normalfootnotes}{} +\bidi@ensure@newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue} +\bidi@ensure@newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse} +\bidi@ensure@newcommand*{\setSingleSpace}[1]{% \def\m@m@singlespace{#1}% \def\m@m@footnote@spacing{#1}% \def\m@m@float@spacing{#1} % } \setSingleSpace{1} \newinsert\sideins -\newcommand*{\multiplefootnotemarker}{3sp} -\newcommand*{\m@mmf@prepare}{% +\bidi@ensure@newcommand*{\multiplefootnotemarker}{3sp} +\bidi@ensure@newcommand*{\m@mmf@prepare}{% \kern-\multiplefootnotemarker \kern\multiplefootnotemarker\relax} -\newlength{\footmarkwidth} -\newlength{\footmarksep} -\newlength{\footparindent} -\newcommand*{\footmarkstyle}[1]{\def\footscript##1{#1}} -\newcommand{\footfootmark}{% +\bidi@ensure@newlength{\footmarkwidth} +\bidi@ensure@newlength{\footmarksep} +\bidi@ensure@newlength{\footparindent} +\bidi@ensure@newcommand*{\footmarkstyle}[1]{\def\footscript##1{#1}} +\bidi@ensure@newcommand{\footfootmark}{% \ifdim\footmarkwidth < \z@ \llap{\hb@xt@ -\footmarkwidth{% \hss\normalfont\footscript{\@thefnmark}}% @@ -7046,33 +7166,35 @@ bidi implementation of tufte title] \footmarkstyle{\textsuperscript{#1}} \setlength{\footmarkwidth}{1.8em} \setlength{\footparindent}{1em} -\newcommand{\m@mdoextrafeet}{\extrafeetins} -\newcommand*{\extrafeetins}{% +\bidi@ensure@newcommand{\m@mdoextrafeet}{\extrafeetins} +\bidi@ensure@newcommand*{\extrafeetins}{% \setbox\@outputbox \vbox{% \boxmaxdepth \@maxdepth \unvbox\@outputbox \ifvoid\footinsv@r\else\@footstartv@r\@footgroupv@r\fi \extrafeetinshook}} -\newcommand{\extrafeetinshook}{} -\newcommand{\foottextfont}{\footnotesize} -\newlength{\footinsdim} +\bidi@ensure@newcommand{\extrafeetinshook}{} +\bidi@ensure@newcommand{\foottextfont}{\footnotesize} +\bidi@ensure@newcommand{\LTRfoottextfont}{\footnotesize} +\bidi@ensure@newcommand{\RTLfoottextfont}{\footnotesize} +\bidi@ensure@newlength{\footinsdim} \setlength{\footinsdim}{8in} % standard for \dimen\footins -\newcommand{\@preamfntext}{% +\bidi@ensure@newcommand{\@preamfntext}{% \interlinepenalty\interfootnotelinepenalty \floatingpenalty \@MM \splittopskip=\footnotesep \splitmaxdepth=\dp\strutbox \@parboxrestore} -\newcommand{\m@mdoextrafeetmini}{% +\bidi@ensure@newcommand{\m@mdoextrafeetmini}{% \extrafeetminihook} -\newcommand{\extrafeetendmini}{% +\bidi@ensure@newcommand{\extrafeetendmini}{% \ifvoid\@mpfootinsv@r\else \vskip\skip\@mpfootins \normalcolor\footnoterule\mp@footgroupv@r \fi \extrafeetendminihook} -\newcommand{\extrafeetendminihook}{} -\newcommand{\m@mdoextrafeetendmini}{\extrafeetendmini} +\bidi@ensure@newcommand{\extrafeetendminihook}{} +\bidi@ensure@newcommand{\m@mdoextrafeetendmini}{\extrafeetendmini} \def\endminipage{% \par \unskip @@ -7087,7 +7209,7 @@ bidi implementation of tufte title] \color@endgroup \egroup \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}} -\newcommand{\m@make@footstart}[1]{% +\bidi@ensure@newcommand{\m@make@footstart}[1]{% \@namedef{@footstart#1}{% \vskip\bigskipamount \leftskip=\z@ @@ -7098,20 +7220,20 @@ bidi implementation of tufte title] \count\footinsv@r=1000 % no magnifcation \dimen\footinsv@r=\footinsdim \m@make@footstart{v@r} -\newcommand{\@footgroupv@r}{} +\bidi@ensure@newcommand{\@footgroupv@r}{} \newinsert\@mpfootinsv@r -\newcommand{\mp@footgroupv@r}{} +\bidi@ensure@newcommand{\mp@footgroupv@r}{} \newcount\m@m@k \newdimen\m@m@h -\newcommand*{\m@mrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 +\bidi@ensure@newcommand*{\m@mrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 \@@line{\if@RTLcolumnfootnotes\beginR\fi\splittopskip=\m@m@h \vbadness=\@M \hfilneg \valign{##\vfill\cr\m@mdosplits}\if@RTLcolumnfootnotes\endR\fi}} -\newcommand*{\m@mdosplits}{\ifnum\m@m@k>0 \noalign{\hfil}\m@msplitoff +\bidi@ensure@newcommand*{\m@mdosplits}{\ifnum\m@m@k>0 \noalign{\hfil}\m@msplitoff \global\advance\m@m@k-1\cr\m@mdosplits\fi} -\newcommand*{\m@msplitoff}{\dimen0=\ht0 +\bidi@ensure@newcommand*{\m@msplitoff}{\dimen0=\ht0 \divide\dimen0 by\m@m@k \advance\dimen0 by\m@m@h \setbox2 \vsplit0 to \dimen0 \unvbox2 } -\newcommand{\twocolumnfootnotes}{% +\bidi@ensure@newcommand{\twocolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@twocolfootnotetext \let\@LTRfootnotetext\@twocolLTRfootnotetext @@ -7125,7 +7247,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mptwocolRTLfootnotetext \m@make@mptwocol@footgroup{v@r}% \let\mp@footgroupv@r\@mptwocol@footgroupv@r} -\newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -7135,36 +7257,41 @@ bidi implementation of tufte title] \@twocolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@twocolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@twocolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamtwofmt}{% +\bidi@ensure@newcommand{\@preamtwofmt}{% \hsize .45\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@twocolfootfmt}[1]{% +\bidi@ensure@newcommand{\@twocolfootfmt}[1]{% \@preamtwofmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mptwocolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@twocolLTRfootfmt}[1]{% + \@preamtwofmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@twocolRTLfootfmt}[1]{% + \@preamtwofmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mptwocolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -7176,48 +7303,48 @@ bidi implementation of tufte title] \@twocolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptwocolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptwocolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptwocolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptwocolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\twocolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\twocolumnfootstyle}[1]{% \m@make@twocolfootnotetext{#1}% \m@make@mptwocolfootnotetext{#1}% \m@make@twocolfootfmt{#1}% \m@make@twocol@footgroup{#1}% \m@make@mptwocol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@twocolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mptwocolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@twocol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mptwocol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@twocolfootnotetext}[1]{% - \@namelongdef{@twocolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@twocolfootnotetext}[1]{% + \bidi@namelongdef{@twocolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -7228,8 +7355,8 @@ bidi implementation of tufte title] \@nameuse{@twocolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mptwocolfootnotetext}[1]{% -\@namelongdef{@mptwocolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mptwocolfootnotetext}[1]{% +\bidi@namelongdef{@mptwocolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -7240,20 +7367,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@twocolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@twocolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@twocolfootfmt}[1]{% \@namedef{@twocolfootfmt#1}##1{% \@preamtwofmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@twocol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@twocol@footgroup}[1]{% \@namedef{@twocol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{\tw@}{\splittopskip}}}} -\newcommand{\m@make@mptwocol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mptwocol@footgroup}[1]{% \@namedef{@mptwocol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\tw@}{\splittopskip}}}} -\newcommand{\threecolumnfootnotes}{% +\bidi@ensure@newcommand{\threecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@threecolfootnotetext \let\@LTRfootnotetext\@threecolLTRfootnotetext @@ -7267,7 +7394,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mpthreecolRTLfootnotetext \m@make@mpthreecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpthreecol@footgroupv@r} -\newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -7276,34 +7403,39 @@ bidi implementation of tufte title] \color@begingroup \@threecolfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolLTRfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@threecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@threecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolRTLfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@preamthreefmt}{% +\bidi@ensure@newcommand{\@preamthreefmt}{% \hsize .3\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@threecolfootfmt}[1]{% +\bidi@ensure@newcommand{\@threecolfootfmt}[1]{% \@preamthreefmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpthreecolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@threecolLTRfootfmt}[1]{% + \@preamthreefmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@threecolRTLfootfmt}[1]{% + \@preamthreefmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpthreecolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -7314,46 +7446,46 @@ bidi implementation of tufte title] \color@begingroup \@threecolfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@mpthreecolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpthreecolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolLTRfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@mpthreecolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpthreecolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolRTLfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\threecolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\threecolumnfootstyle}[1]{% \m@make@threecolfootnotetext{#1}% \m@make@mpthreecolfootnotetext{#1}% \m@make@threecolfootfmt{#1}% \m@make@threecol@footgroup{#1}% \m@make@mpthreecol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@threecolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpthreecolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@threecol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpthreecol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=3\footinsdim \expandafter\count\csname footins#1\endcsname=333\relax} -\newcommand{\m@make@threecolfootnotetext}[1]{% -\@namelongdef{@threecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@threecolfootnotetext}[1]{% +\bidi@namelongdef{@threecolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -7363,8 +7495,8 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@threecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@mpthreecolfootnotetext}[1]{% -\@namelongdef{@mpthreecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpthreecolfootnotetext}[1]{% +\bidi@namelongdef{@mpthreecolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -7375,20 +7507,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@threecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@threecolfootfmt}[1]{% -\@namelongdef{@threecolfootfmt#1}##1{% +\bidi@ensure@newcommand{\m@make@threecolfootfmt}[1]{% +\bidi@namelongdef{@threecolfootfmt#1}##1{% \@preamthreefmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@threecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@threecol@footgroup}[1]{% \@namedef{@threecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{\thr@@}{\splittopskip}}}} -\newcommand{\m@make@mpthreecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpthreecol@footgroup}[1]{% \@namedef{@mpthreecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\thr@@}{\splittopskip}}}} -\newcommand{\fourcolumnfootnotes}{% +\bidi@ensure@newcommand{\fourcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@fourcolfootnotetext \let\@LTRfootnotetext\@fourcolLTRfootnotetext @@ -7402,7 +7534,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mpfourcolRTLfootnotetext \m@make@mpfourcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpfourcol@footgroupv@r} -\newcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -7412,36 +7544,41 @@ bidi implementation of tufte title] \@fourcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fourcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@fourcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamfourfmt}{% +\bidi@ensure@newcommand{\@preamfourfmt}{% \hsize .25\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@fourcolfootfmt}[1]{% +\bidi@ensure@newcommand{\@fourcolfootfmt}[1]{% \@preamfourfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpfourcolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@fourcolLTRfootfmt}[1]{% + \@preamfourfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@fourcolRTLfootfmt}[1]{% + \@preamfourfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpfourcolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -7453,48 +7590,48 @@ bidi implementation of tufte title] \@fourcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfourcolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfourcolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfourcolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfourcolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\fourcolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\fourcolumnfootstyle}[1]{% \m@make@fourcolfootnotetext{#1}% \m@make@mpfourcolfootnotetext{#1}% \m@make@fourcolfootfmt{#1}% \m@make@fourcol@footgroup{#1}% \m@make@mpfourcol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@fourcolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpfourcolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@fourcol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpfourcol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@fourcolfootnotetext}[1]{% - \@namelongdef{@fourcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@fourcolfootnotetext}[1]{% + \bidi@namelongdef{@fourcolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -7505,8 +7642,8 @@ bidi implementation of tufte title] \@nameuse{@fourcolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpfourcolfootnotetext}[1]{% -\@namelongdef{@mpfourcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpfourcolfootnotetext}[1]{% +\bidi@namelongdef{@mpfourcolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -7517,20 +7654,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@fourcolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@fourcolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@fourcolfootfmt}[1]{% \@namedef{@fourcolfootfmt#1}##1{% \@preamfourfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@fourcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@fourcol@footgroup}[1]{% \@namedef{@fourcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{4}{\splittopskip}}}} -\newcommand{\m@make@mpfourcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpfourcol@footgroup}[1]{% \@namedef{@mpfourcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{4}{\splittopskip}}}} -\newcommand{\fivecolumnfootnotes}{% +\bidi@ensure@newcommand{\fivecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@fivecolfootnotetext \let\@LTRfootnotetext\@fivecolLTRfootnotetext @@ -7544,7 +7681,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mpfivecolRTLfootnotetext \m@make@mpfivecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpfivecol@footgroupv@r} -\newcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -7554,36 +7691,41 @@ bidi implementation of tufte title] \@fivecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fivecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@fivecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamfivefmt}{% +\bidi@ensure@newcommand{\@preamfivefmt}{% \hsize .2\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@fivecolfootfmt}[1]{% +\bidi@ensure@newcommand{\@fivecolfootfmt}[1]{% \@preamfivefmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpfivecolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@fivecolLTRfootfmt}[1]{% + \@preamfivefmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@fivecolRTLfootfmt}[1]{% + \@preamfivefmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpfivecolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -7595,48 +7737,48 @@ bidi implementation of tufte title] \@fivecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfivecolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfivecolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfivecolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfivecolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\fivecolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\fivecolumnfootstyle}[1]{% \m@make@fivecolfootnotetext{#1}% \m@make@mpfivecolfootnotetext{#1}% \m@make@fivecolfootfmt{#1}% \m@make@fivecol@footgroup{#1}% \m@make@mpfivecol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@fivecolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpfivecolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@fivecol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpfivecol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@fivecolfootnotetext}[1]{% - \@namelongdef{@fivecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@fivecolfootnotetext}[1]{% + \bidi@namelongdef{@fivecolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -7647,8 +7789,8 @@ bidi implementation of tufte title] \@nameuse{@fivecolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpfivecolfootnotetext}[1]{% -\@namelongdef{@mpfivecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpfivecolfootnotetext}[1]{% +\bidi@namelongdef{@mpfivecolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -7659,20 +7801,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@fivecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@fivecolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@fivecolfootfmt}[1]{% \@namedef{@fivecolfootfmt#1}##1{% \@preamfivefmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@fivecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@fivecol@footgroup}[1]{% \@namedef{@fivecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{5}{\splittopskip}}}} -\newcommand{\m@make@mpfivecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpfivecol@footgroup}[1]{% \@namedef{@mpfivecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{5}{\splittopskip}}}} -\newcommand{\sixcolumnfootnotes}{% +\bidi@ensure@newcommand{\sixcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@sixcolfootnotetext \let\@LTRfootnotetext\@sixcolLTRfootnotetext @@ -7686,7 +7828,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mpsixcolRTLfootnotetext \m@make@mpsixcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpsixcol@footgroupv@r} -\newcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -7696,36 +7838,41 @@ bidi implementation of tufte title] \@sixcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sixcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@sixcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamsixfmt}{% +\bidi@ensure@newcommand{\@preamsixfmt}{% \hsize .16\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@sixcolfootfmt}[1]{% +\bidi@ensure@newcommand{\@sixcolfootfmt}[1]{% \@preamsixfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpsixcolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sixcolLTRfootfmt}[1]{% + \@preamsixfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@sixcolRTLfootfmt}[1]{% + \@preamsixfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpsixcolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -7737,48 +7884,48 @@ bidi implementation of tufte title] \@sixcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsixcolLTRfootnotetext}[1]{\@RTLfalse% +\bidi@ensure@newcommand{\@mpsixcolLTRfootnotetext}[1]{\@RTLfalse% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsixcolRTLfootnotetext}[1]{\@RTLtrue% +\bidi@ensure@newcommand{\@mpsixcolRTLfootnotetext}[1]{\@RTLtrue% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\sixcolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\sixcolumnfootstyle}[1]{% \m@make@sixcolfootnotetext{#1}% \m@make@mpsixcolfootnotetext{#1}% \m@make@sixcolfootfmt{#1}% \m@make@sixcol@footgroup{#1}% \m@make@mpsixcol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@sixcolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpsixcolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@sixcol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpsixcol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@sixcolfootnotetext}[1]{% - \@namelongdef{@sixcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@sixcolfootnotetext}[1]{% + \bidi@namelongdef{@sixcolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -7789,8 +7936,8 @@ bidi implementation of tufte title] \@nameuse{@sixcolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpsixcolfootnotetext}[1]{% -\@namelongdef{@mpsixcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpsixcolfootnotetext}[1]{% +\bidi@namelongdef{@mpsixcolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -7801,20 +7948,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@sixcolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@sixcolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@sixcolfootfmt}[1]{% \@namedef{@sixcolfootfmt#1}##1{% \@preamsixfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@sixcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@sixcol@footgroup}[1]{% \@namedef{@sixcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{6}{\splittopskip}}}} -\newcommand{\m@make@mpsixcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpsixcol@footgroup}[1]{% \@namedef{@mpsixcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{6}{\splittopskip}}}} -\newcommand{\sevencolumnfootnotes}{% +\bidi@ensure@newcommand{\sevencolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@sevencolfootnotetext \let\@LTRfootnotetext\@sevencolLTRfootnotetext @@ -7828,7 +7975,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mpsevencolRTLfootnotetext \m@make@mpsevencol@footgroup{v@r}% \let\mp@footgroupv@r\@mpsevencol@footgroupv@r} -\newcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -7838,36 +7985,41 @@ bidi implementation of tufte title] \@sevencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sevencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@sevencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamsevenfmt}{% +\bidi@ensure@newcommand{\@preamsevenfmt}{% \hsize .142\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@sevencolfootfmt}[1]{% +\bidi@ensure@newcommand{\@sevencolfootfmt}[1]{% \@preamsevenfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpsevencolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sevencolLTRfootfmt}[1]{% + \@preamsevenfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@sevencolRTLfootfmt}[1]{% + \@preamsevenfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpsevencolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -7879,48 +8031,48 @@ bidi implementation of tufte title] \@sevencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsevencolLTRfootnotetext}[1]{\@RTLfalse% +\bidi@ensure@newcommand{\@mpsevencolLTRfootnotetext}[1]{\@RTLfalse% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsevencolRTLfootnotetext}[1]{\@RTLtrue% +\bidi@ensure@newcommand{\@mpsevencolRTLfootnotetext}[1]{\@RTLtrue% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\sevencolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\sevencolumnfootstyle}[1]{% \m@make@sevencolfootnotetext{#1}% \m@make@mpsevencolfootnotetext{#1}% \m@make@sevencolfootfmt{#1}% \m@make@sevencol@footgroup{#1}% \m@make@mpsevencol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@sevencolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpsevencolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@sevencol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpsevencol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@sevencolfootnotetext}[1]{% - \@namelongdef{@sevencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@sevencolfootnotetext}[1]{% + \bidi@namelongdef{@sevencolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -7931,8 +8083,8 @@ bidi implementation of tufte title] \@nameuse{@sevencolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpsevencolfootnotetext}[1]{% -\@namelongdef{@mpsevencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpsevencolfootnotetext}[1]{% +\bidi@namelongdef{@mpsevencolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -7943,20 +8095,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@sevencolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@sevencolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@sevencolfootfmt}[1]{% \@namedef{@sevencolfootfmt#1}##1{% \@preamsevenfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@sevencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@sevencol@footgroup}[1]{% \@namedef{@sevencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{7}{\splittopskip}}}} -\newcommand{\m@make@mpsevencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpsevencol@footgroup}[1]{% \@namedef{@mpsevencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{7}{\splittopskip}}}} -\newcommand{\eightcolumnfootnotes}{% +\bidi@ensure@newcommand{\eightcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@eightcolfootnotetext \let\@LTRfootnotetext\@eightcolLTRfootnotetext @@ -7970,7 +8122,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mpeightcolRTLfootnotetext \m@make@mpeightcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpeightcol@footgroupv@r} -\newcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -7980,36 +8132,41 @@ bidi implementation of tufte title] \@eightcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@eightcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@eightcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preameightfmt}{% +\bidi@ensure@newcommand{\@preameightfmt}{% \hsize .125\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@eightcolfootfmt}[1]{% +\bidi@ensure@newcommand{\@eightcolfootfmt}[1]{% \@preameightfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpeightcolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@eightcolLTRfootfmt}[1]{% + \@preameightfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@eightcolRTLfootfmt}[1]{% + \@preameightfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpeightcolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -8021,48 +8178,48 @@ bidi implementation of tufte title] \@eightcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpeightcolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpeightcolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpeightcolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpeightcolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\eightcolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\eightcolumnfootstyle}[1]{% \m@make@eightcolfootnotetext{#1}% \m@make@mpeightcolfootnotetext{#1}% \m@make@eightcolfootfmt{#1}% \m@make@eightcol@footgroup{#1}% \m@make@mpeightcol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@eightcolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpeightcolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@eightcol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpeightcol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@eightcolfootnotetext}[1]{% - \@namelongdef{@eightcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@eightcolfootnotetext}[1]{% + \bidi@namelongdef{@eightcolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -8073,8 +8230,8 @@ bidi implementation of tufte title] \@nameuse{@eightcolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpeightcolfootnotetext}[1]{% -\@namelongdef{@mpeightcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpeightcolfootnotetext}[1]{% +\bidi@namelongdef{@mpeightcolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -8085,20 +8242,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@eightcolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@eightcolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@eightcolfootfmt}[1]{% \@namedef{@eightcolfootfmt#1}##1{% \@preameightfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@eightcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@eightcol@footgroup}[1]{% \@namedef{@eightcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{8}{\splittopskip}}}} -\newcommand{\m@make@mpeightcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpeightcol@footgroup}[1]{% \@namedef{@mpeightcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{8}{\splittopskip}}}} -\newcommand{\ninecolumnfootnotes}{% +\bidi@ensure@newcommand{\ninecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@ninecolfootnotetext \let\@LTRfootnotetext\@ninecolLTRfootnotetext @@ -8112,7 +8269,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mpninecolRTLfootnotetext \m@make@mpninecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpninecol@footgroupv@r} -\newcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -8122,36 +8279,41 @@ bidi implementation of tufte title] \@ninecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@ninecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@ninecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamninefmt}{% +\bidi@ensure@newcommand{\@preamninefmt}{% \hsize .1\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@ninecolfootfmt}[1]{% +\bidi@ensure@newcommand{\@ninecolfootfmt}[1]{% \@preamninefmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpninecolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@ninecolLTRfootfmt}[1]{% + \@preamninefmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@ninecolRTLfootfmt}[1]{% + \@preamninefmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpninecolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -8163,48 +8325,48 @@ bidi implementation of tufte title] \@ninecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpninecolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpninecolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpninecolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpninecolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\ninecolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\ninecolumnfootstyle}[1]{% \m@make@ninecolfootnotetext{#1}% \m@make@mpninecolfootnotetext{#1}% \m@make@ninecolfootfmt{#1}% \m@make@ninecol@footgroup{#1}% \m@make@mpninecol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@ninecolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpninecolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@ninecol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpninecol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@ninecolfootnotetext}[1]{% - \@namelongdef{@ninecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@ninecolfootnotetext}[1]{% + \bidi@namelongdef{@ninecolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -8215,8 +8377,8 @@ bidi implementation of tufte title] \@nameuse{@ninecolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpninecolfootnotetext}[1]{% -\@namelongdef{@mpninecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpninecolfootnotetext}[1]{% +\bidi@namelongdef{@mpninecolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -8227,20 +8389,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@ninecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@ninecolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@ninecolfootfmt}[1]{% \@namedef{@ninecolfootfmt#1}##1{% \@preamninefmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@ninecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@ninecol@footgroup}[1]{% \@namedef{@ninecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{9}{\splittopskip}}}} -\newcommand{\m@make@mpninecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpninecol@footgroup}[1]{% \@namedef{@mpninecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{9}{\splittopskip}}}} -\newcommand{\tencolumnfootnotes}{% +\bidi@ensure@newcommand{\tencolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@tencolfootnotetext \let\@LTRfootnotetext\@tencolLTRfootnotetext @@ -8254,7 +8416,7 @@ bidi implementation of tufte title] \let\@mpRTLfootnotetext\@mptencolRTLfootnotetext \m@make@mptencol@footgroup{v@r}% \let\mp@footgroupv@r\@mptencol@footgroupv@r} -\newcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -8264,36 +8426,41 @@ bidi implementation of tufte title] \@tencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@tencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@tencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamtenfmt}{% +\bidi@ensure@newcommand{\@preamtenfmt}{% \hsize .1\hsize \parindent=\z@ \tolerance=5000\relax -% \raggedright \leavevmode} -\newcommand{\@tencolfootfmt}[1]{% +\bidi@ensure@newcommand{\@tencolfootfmt}[1]{% \@preamtenfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mptencolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@tencolLTRfootfmt}[1]{% + \@preamtenfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@tencolRTLfootfmt}[1]{% + \@preamtenfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mptencolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -8305,48 +8472,48 @@ bidi implementation of tufte title] \@tencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptencolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptencolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptencolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptencolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\tencolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\tencolumnfootstyle}[1]{% \m@make@tencolfootnotetext{#1}% \m@make@mptencolfootnotetext{#1}% \m@make@tencolfootfmt{#1}% \m@make@tencol@footgroup{#1}% \m@make@mptencol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@tencolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mptencolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@tencol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mptencol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@tencolfootnotetext}[1]{% - \@namelongdef{@tencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@tencolfootnotetext}[1]{% + \bidi@namelongdef{@tencolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -8357,8 +8524,8 @@ bidi implementation of tufte title] \@nameuse{@tencolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mptencolfootnotetext}[1]{% -\@namelongdef{@mptencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mptencolfootnotetext}[1]{% +\bidi@namelongdef{@mptencolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -8369,20 +8536,20 @@ bidi implementation of tufte title] \color@begingroup \@nameuse{@tencolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@tencolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@tencolfootfmt}[1]{% \@namedef{@tencolfootfmt#1}##1{% \@preamtenfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@tencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@tencol@footgroup}[1]{% \@namedef{@tencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{10}{\splittopskip}}}} -\newcommand{\m@make@mptencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mptencol@footgroup}[1]{% \@namedef{@mptencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{10}{\splittopskip}}}} -\newcommand{\m@munvxh}[1]{% +\bidi@ensure@newcommand{\m@munvxh}[1]{% \setbox0=\vbox{\unvbox#1% \global\setbox1=\lastbox}% \unhbox1 @@ -8390,17 +8557,17 @@ bidi implementation of tufte title] \unskip \unpenalty \hskip\m@mipn@skip} -\newcommand{\m@mungebox}{% +\bidi@ensure@newcommand{\m@mungebox}{% \setbox0=\hbox{\m@munvxh0}% \dp0=\z@ \ht0=\footfudgefactor\wd0 \box0 \penalty0} \newskip\m@mipn@skip -\newcommand*{\m@minterparanoteglue}[1]{% +\bidi@ensure@newcommand*{\m@minterparanoteglue}[1]{% {\foottextfont\global\m@mipn@skip=#1\relax}} \m@minterparanoteglue{1em plus.4em minus.4em} -\newcommand*{\m@mmakehboxofhboxes}{% +\bidi@ensure@newcommand*{\m@mmakehboxofhboxes}{% \if@parafootRTL\@RTLtrue\else\@RTLfalse\fi% \setbox0=\hbox{}% \loop @@ -8409,10 +8576,10 @@ bidi implementation of tufte title] \ifhbox2 \setbox0=\hbox{\box2\unhbox0} \repeat} -\newcommand*{\m@mremovehboxes}{\setbox0=\lastbox +\bidi@ensure@newcommand*{\m@mremovehboxes}{\setbox0=\lastbox \ifhbox0{\m@mremovehboxes}\unhbox0 \fi} -\newcommand*{\footfudgefiddle}{64} -\newcommand{\paragraphfootnotes}{% +\bidi@ensure@newcommand*{\footfudgefiddle}{64} +\bidi@ensure@newcommand{\paragraphfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@parafootnotetext \let\@LTRfootnotetext\@paraLTRfootnotetext @@ -8431,7 +8598,7 @@ bidi implementation of tufte title] \multiply\dimen0 by 1024 \divide\dimen0 by \hsize \multiply\dimen0 by \footfudgefiddle \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}} -\newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{\@RTLfalse +\bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{\@RTLfalse \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -8442,33 +8609,41 @@ bidi implementation of tufte title] \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse +\bidi@ensure@newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{\beginL#1\endL}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@paraRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse +\bidi@ensure@newcommand{\@paraRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{\beginR#1\endR}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@parafootfmt}[1]{% +\bidi@ensure@newcommand{\@parafootfmt}[1]{% \parindent=\z@ \parfillskip=0pt \@plus 1fil {\footfootmark\strut {\foottextfont #1}\penalty-10}} -\newcommand{\@mpparafootnotetext}[1]{% +\bidi@ensure@newcommand{\@paraLTRfootfmt}[1]{% + \parindent=\z@ + \parfillskip=0pt \@plus 1fil + {\footfootmark\strut {\LTRfoottextfont #1}\penalty-10}} +\bidi@ensure@newcommand{\@paraRTLfootfmt}[1]{% + \parindent=\z@ + \parfillskip=0pt \@plus 1fil + {\footfootmark\strut {\RTLfoottextfont #1}\penalty-10}} +\bidi@ensure@newcommand{\@mpparafootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -8481,42 +8656,42 @@ bidi implementation of tufte title] \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@mpparaLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpparaLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{\beginL#1\endL}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@mpparaRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpparaRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{\beginR#1\endR}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\paragraphfootstyle}[1]{% +\bidi@ensure@newcommand{\paragraphfootstyle}[1]{% \m@make@parafootnotetext{#1}% \m@make@mpparafootnotetext{#1}% \m@make@parafootfmt{#1}% \m@make@para@footgroup{#1}% \m@make@mppara@footgroup{#1}% \m@make@para@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@parafootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpparafootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@para@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mppara@footgroup#1}}% @@ -8528,8 +8703,8 @@ bidi implementation of tufte title] \multiply\dimen0 by 1024 \divide\dimen0 by \hsize \multiply\dimen0 by 64 \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}} -\newcommand{\m@make@parafootnotetext}[1]{% -\@namelongdef{@parafootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@parafootnotetext}[1]{% +\bidi@namelongdef{@parafootnotetext#1}##1{% \insert\@nameuse{footins#1}{ \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -8541,8 +8716,8 @@ bidi implementation of tufte title] \noindent \@nameuse{@parafootfmt#1}{##1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare}} -\newcommand{\m@make@mpparafootnotetext}[1]{% -\@namelongdef{@mpparafootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpparafootnotetext}[1]{% +\bidi@namelongdef{@mpparafootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -8555,27 +8730,27 @@ bidi implementation of tufte title] \noindent \@nameuse{@parafootfmt#1}{##1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare}} -\newcommand{\m@make@parafootfmt}[1]{% -\@namelongdef{@parafootfmt#1}##1{% +\bidi@ensure@newcommand{\m@make@parafootfmt}[1]{% +\bidi@namelongdef{@parafootfmt#1}##1{% \parindent=\z@ \parfillskip=0pt \@plus 1fil {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\penalty-10}}} -\newcommand{\m@make@para@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@para@footgroup}[1]{% \@namedef{@para@footgroup#1}{% \unvbox\@nameuse{footins#1} \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \@nameuse{foottextfont#1}% \noindent\unhbox0\par}} -\newcommand{\m@make@mppara@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mppara@footgroup}[1]{% \@namedef{@mppara@footgroup#1}{% \unvbox\@nameuse{@mpfootins#1} \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \@nameuse{foottextfont#1}% \noindent\unhbox0\par}} -\newcommand{\m@make@para@footstart}[1]{% +\bidi@ensure@newcommand{\m@make@para@footstart}[1]{% \@namedef{@para@footstart#1}{% \vskip\bigskipamount \leftskip=\z@ @@ -8583,11 +8758,11 @@ bidi implementation of tufte title] \parindent=\z@ \vskip\skip\@nameuse{footins#1}% \footnoterule}} -\newcommand*{\m@m@makecolfloats}{% +\bidi@ensure@newcommand*{\m@m@makecolfloats}{% \xdef\@freelist{\@freelist\@midlist}% \global\let\@midlist\@empty \@combinefloats} -\newcommand*{\m@m@makecoltext}{% +\bidi@ensure@newcommand*{\m@m@makecoltext}{% \ifvbox\@kludgeins \@makespecialcolbox \else @@ -8598,8 +8773,8 @@ bidi implementation of tufte title] \vskip -\dimen@ \@textbottom}% \fi} -\newcommand*{\m@m@makecolintro}{} -\newcommand*{\m@mopfootnote}{\setbox\@outputbox \vbox{% +\bidi@ensure@newcommand*{\m@m@makecolintro}{} +\bidi@ensure@newcommand*{\m@mopfootnote}{\setbox\@outputbox \vbox{% \boxmaxdepth\@maxdepth \@tempdima\dp\@cclv \unvbox\@cclv @@ -8610,7 +8785,7 @@ bidi implementation of tufte title] \footnoterule \unvbox \footins \color@endgroup}} -\newcommand*{\m@mopsidebar}{% +\bidi@ensure@newcommand*{\m@mopsidebar}{% \ifvoid\sideins\else \setbox\@outputbox \vbox{% \sidecontents @@ -8628,7 +8803,7 @@ bidi implementation of tufte title] \m@mopsidebar \m@m@makecoltext \global \maxdepth \@maxdepth} -\newcommand{\feetabovefloat}{\gdef\@makecol{\mem@makecol}} +\bidi@ensure@newcommand{\feetabovefloat}{\gdef\@makecol{\mem@makecol}} \feetabovefloat% % \end{macrocode} % \iffalse @@ -12319,7 +12494,24 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{scrartcl-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{scrartcl-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrartcl class for XeTeX engine] +\ProvidesFile{scrartcl-xetex-bidi.def}[2012/01/01 v0.6 bidi adaptations for scrartcl class for XeTeX engine] +\newcommand{\scr@saved@LTRfootnotetext}{} +\newcommand{\scr@saved@RTLfootnotetext}{} +\let\scr@saved@footnotetext\@footnotetext +\let\scr@saved@LTRfootnotetext\@LTRfootnotetext +\let\scr@saved@RTLfootnotetext\@RTLfootnotetext +\renewcommand{\@footnotetext}[1]{% + \scr@saved@footnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@LTRfootnotetext}[1]{% + \scr@saved@LTRfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@RTLfootnotetext}[1]{% + \scr@saved@RTLfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} \renewcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -12690,6 +12882,10 @@ bidi implementation of tufte title] \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}% \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble + \let\scr@tmp@LTRfootnotetext=\@LTRfootnotetext + \let\@LTRfootnotetext=\@gobble + \let\scr@tmp@RTLfootnotetext=\@RTLfootnotetext + \let\@RTLfootnotetext=\@gobble \sbox\@tempboxa{% {\capfont{\strut\ignorespaces #1{{\caplabelfont{#2\captionformat}}}% @@ -12697,6 +12893,10 @@ bidi implementation of tufte title] }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined + \let\@LTRfootnotetext=\scr@tmp@LTRfootnotetext + \let\scr@tmp@LTRfootnotetext=\undefined + \let\@RTLfootnotetext=\scr@tmp@RTLfootnotetext + \let\scr@tmp@RTLfootnotetext=\undefined \setcounter{footnote}{\@tempcntb}% \setcounter{mpfootnote}{\@tempcnta}% \else @@ -12769,7 +12969,24 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{scrbook-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{scrbook-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrbook class for XeTeX engine] +\ProvidesFile{scrbook-xetex-bidi.def}[2012/01/01 v0.6 bidi adaptations for scrbook class for XeTeX engine] +\newcommand{\scr@saved@LTRfootnotetext}{} +\newcommand{\scr@saved@RTLfootnotetext}{} +\let\scr@saved@footnotetext\@footnotetext +\let\scr@saved@LTRfootnotetext\@LTRfootnotetext +\let\scr@saved@RTLfootnotetext\@RTLfootnotetext +\renewcommand{\@footnotetext}[1]{% + \scr@saved@footnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@LTRfootnotetext}[1]{% + \scr@saved@LTRfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@RTLfootnotetext}[1]{% + \scr@saved@RTLfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} \renewcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -13196,6 +13413,10 @@ bidi implementation of tufte title] \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}% \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble + \let\scr@tmp@LTRfootnotetext=\@LTRfootnotetext + \let\@LTRfootnotetext=\@gobble + \let\scr@tmp@RTLfootnotetext=\@RTLfootnotetext + \let\@RTLfootnotetext=\@gobble \sbox\@tempboxa{% {\capfont{\strut\ignorespaces #1{{\caplabelfont{#2\captionformat}}}% @@ -13203,6 +13424,10 @@ bidi implementation of tufte title] }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined + \let\@LTRfootnotetext=\scr@tmp@LTRfootnotetext + \let\scr@tmp@LTRfootnotetext=\undefined + \let\@RTLfootnotetext=\scr@tmp@RTLfootnotetext + \let\scr@tmp@RTLfootnotetext=\undefined \setcounter{footnote}{\@tempcntb}% \setcounter{mpfootnote}{\@tempcnta}% \else @@ -13392,7 +13617,24 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{scrreprt-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{scrreprt-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrreprt class for XeTeX engine] +\ProvidesFile{scrreprt-xetex-bidi.def}[2012/01/01 v0.6 bidi adaptations for scrreprt class for XeTeX engine] +\newcommand{\scr@saved@LTRfootnotetext}{} +\newcommand{\scr@saved@RTLfootnotetext}{} +\let\scr@saved@footnotetext\@footnotetext +\let\scr@saved@LTRfootnotetext\@LTRfootnotetext +\let\scr@saved@RTLfootnotetext\@RTLfootnotetext +\renewcommand{\@footnotetext}[1]{% + \scr@saved@footnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@LTRfootnotetext}[1]{% + \scr@saved@LTRfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@RTLfootnotetext}[1]{% + \scr@saved@RTLfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} \renewcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -13776,6 +14018,10 @@ bidi implementation of tufte title] \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}% \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble + \let\scr@tmp@LTRfootnotetext=\@LTRfootnotetext + \let\@LTRfootnotetext=\@gobble + \let\scr@tmp@RTLfootnotetext=\@RTLfootnotetext + \let\@RTLfootnotetext=\@gobble \sbox\@tempboxa{% {\capfont{\strut\ignorespaces #1{{\caplabelfont{#2\captionformat}}}% @@ -13783,6 +14029,10 @@ bidi implementation of tufte title] }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined + \let\@LTRfootnotetext=\scr@tmp@LTRfootnotetext + \let\scr@tmp@LTRfootnotetext=\undefined + \let\@RTLfootnotetext=\scr@tmp@RTLfootnotetext + \let\scr@tmp@RTLfootnotetext=\undefined \setcounter{footnote}{\@tempcntb}% \setcounter{mpfootnote}{\@tempcnta}% \else @@ -16077,7 +16327,7 @@ AAA&BBB&CCC\\\cdashline{1-2}[.4pt/1pt] \documentclass{article} \usepackage{bidi} \title{Testing Basic Bidi Direction Change} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle In this document we test bidi direction change in \textsf{RTL} and \textsf{LTR}. These tests includes \texttt{flushleft}, \texttt{flushright} environments and \verb|\centerline{...}|, \verb|\leftline{...}|,\verb|\rightline{...}|,\verb|\raggedleft| and \verb|\raggedright| macros. @@ -16677,7 +16927,7 @@ dynamic frame when using one of the \cmdname{Ncolumntop} type of commands. \usepackage{supertabular} \usepackage{bidi} \title{Testing \textsf{supertabular} package in RTL and LTR} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle \section{LTR} @@ -16794,7 +17044,7 @@ zeta & GREEK SMALL LETTER ZETA & 03B6\\ \documentclass{article} \usepackage{bidi} \title{Testing \LaTeX's Default Tabular in \textsf{RTL} and \textsf{LTR}} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \newcommand{\rb}[1]{\raisebox{1.5ex}[0mm]{#1}} \begin{document} \maketitle @@ -16860,7 +17110,7 @@ In this document we test \LaTeX's default tabular in \textsf{RTL} and \textsf{LT \usepackage{tabularx} \usepackage{bidi} \title{Testing \textsf{tabularx} Package in RTL and LTR} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle \section{LTR} @@ -16904,7 +17154,7 @@ Lion & Yellow & Elephants & Tartare \\\cline{4-4} \setlength\tymax{\maxdimen} \usepackage{bidi} \title{Testing \textsf{tabulary} package in RTL and LTR} -\author{VAFA KHALIGHI} +\author{Vafa Khalighi} \begin{document} \maketitle \section{LTR} diff --git a/Master/texmf-dist/source/latex/bidi/bidi.ins b/Master/texmf-dist/source/latex/bidi/bidi.ins index 808d8c1ee95..ee20a245f21 100644 --- a/Master/texmf-dist/source/latex/bidi/bidi.ins +++ b/Master/texmf-dist/source/latex/bidi/bidi.ins @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `batchfile') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -17,21 +17,21 @@ \preamble ______________________________________ - Copyright © 2009–2011 VAFA KHALIGHI + Copyright © 2009–2012 Vafa Khalighi License information appended. \endpreamble \postamble -Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +by Vafa Khalighi. \endpostamble \askforoverwritefalse @@ -134,14 +134,14 @@ by VAFA KHALIGHI. \generate{\file{xltxtra-xetex-bidi.def}{\from{\jobname.dtx}{xltxtra-xetex-bidi.def}}} \endbatchfile %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 8d674d2475f..130657a8593 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `amsart-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -130,14 +130,14 @@ \@cleartopmattertags } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 8406fecbf2e..a649fdd94bc 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `amsbook-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -131,14 +131,14 @@ \do\keywords \do\@keywords \do\subjclass \do\@subjclass } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 fc1ad313130..a35204bec3d 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsmath-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `amsmath-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -27,14 +27,14 @@ \DeclareRobustCommand{\[}{\begin{equation*}} \DeclareRobustCommand{\]}{\end{equation*}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 4a2a7fbe109..b0f49d97bcf 100644 --- a/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/amsthm-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `amsthm-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -15,14 +15,14 @@ \ProvidesFile{amsthm-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for amsthm package for XeTeX engine] \def\@thmcountersep{\@SepMark} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 4556b79674f..fc6f68a39bd 100644 --- a/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `array-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -72,14 +72,14 @@ \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\gdef\@halignto{}% \@RTLtabfalse\@tabarray} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 63b61fa025d..518233901d7 100644 --- a/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/article-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `article-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -209,14 +209,14 @@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 dcf6a33c1ce..821229c9a03 100644 --- a/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/artikel1-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `artikel1-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -264,14 +264,14 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 f3b8fcfeab3..5ee35835585 100644 --- a/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/artikel2-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `artikel2-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -267,14 +267,14 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 e3d0ed59d39..e0833b03122 100644 --- a/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/artikel3-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `artikel3-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -275,14 +275,14 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 a5ea2a272f6..7cdd317ef0c 100644 --- a/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `arydshln-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -148,14 +148,14 @@ \let\adl@org@classz\@classz }{} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty index 028131bbd27..2444b8a391f 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty @@ -7,14 +7,14 @@ %% bidi.dtx (with options: `bidi.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% \NeedsTeXFormat{LaTeX2e} -\def\bididate{2011/12/01} -\def\bidiversion{v1.3.4} +\def\bididate{2012/01/01} +\def\bidiversion{v1.3.5} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -22,7 +22,7 @@ bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J Description: A convenient interface for typesetting bidirectional^^J texts in plain TeX and LaTeX. The package includes adaptations for use^^J with many other commonly-used packages.^^J -Copyright © 2009–2011 VAFA KHALIGHI^^J +Copyright © 2009–2012 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J Location on CTAN: /macros/latex/contrib/bidi} @@ -50,6 +50,28 @@ Location on CTAN: /macros/latex/contrib/bidi} \expandafter\@gobbletwo\string#3\endcsname {\let#2#3% \let#1#3}} +\newcommand*{\if@bidi@csdef}[1]{% + \ifcsname#1\endcsname + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} +\newcommand{\if@bidi@def}[1]{% + \ifdefined#1% + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} +\newcommand{\bidi@namelongdef}[1]{% + \long\expandafter\def\csname #1\endcsname} +\def\bidi@ensure@newcommand{\@star@or@long\bidi@ensure@new@command} +\def\bidi@ensure@new@command#1{% + \begingroup \escapechar\m@ne\xdef\@gtempa{{\string#1}}\endgroup + \expandafter\if@bidi@csdef\@gtempa + {\relax% + \let\@ifdefinable\@rc@ifdefinable% + \new@command#1}{\new@command#1}} +\def\bidi@ensure@newlength#1{\if@bidi@def#1{}{\newskip#1}} \eqnewif{\if@RTLmain}{\if@rlmain} \eqnewif{\if@RTL}{\if@rl} \newif\if@RTLmaths @@ -60,6 +82,8 @@ Location on CTAN: /macros/latex/contrib/bidi} \newif\if@LTRbibitems \newif\if@RTLbibitems \newif\if@sentdir +\newif\if@parafootRTL +\newif\if@RTLcolumnfootnotes \eqnewif{\if@RTL@footnote}{\if@rl@footnote} \@RTLmainfalse \AtBeginDocument{% @@ -88,14 +112,14 @@ Location on CTAN: /macros/latex/contrib/bidi} \input{loadingorder-bidi.def} \ProcessOptions %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.tex b/Master/texmf-dist/tex/latex/bidi/bidi.tex index bcea0502569..1a353fe43d4 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi.tex +++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex @@ -7,12 +7,12 @@ %% bidi.dtx (with options: `bidi.tex') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% -\def\bididate{2011/12/01} +\def\bididate{2012/01/01} \def\bidiversion{v0.1} \catcode`@=11 \newlinechar`\^^J @@ -21,7 +21,7 @@ bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J Description: A convenient interface for typesetting bidirectional^^J texts in plain TeX and LaTeX. The package includes adaptations for use^^J with many other commonly-used packages.^^J -Copyright © 2009–2011 VAFA KHALIGHI^^J +Copyright © 2009–2012 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J Location on CTAN: /macros/latex/contrib/bidi} @@ -59,14 +59,14 @@ Location on CTAN: /macros/latex/contrib/bidi} \fi \catcode`@=12 %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty index e9d55621845..1aaf82fb72b 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidi2in1.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidi2in1.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -69,14 +69,14 @@ \global\let\and\relax } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidicode.sty b/Master/texmf-dist/tex/latex/bidi/bidicode.sty index 354bfb83188..623d9ece648 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidicode.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidicode.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidicode.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -146,14 +146,14 @@ \def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt} \def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty index f3bd6df48ce..902bb293a76 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidiftnxtra.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidiftnxtra.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -160,14 +160,14 @@ \color@endbox } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls index cae3c7657f7..2bd1f0bec04 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls +++ b/Master/texmf-dist/tex/latex/bidi/bidimoderncv.cls @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidimoderncv.cls') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -261,14 +261,14 @@ \newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em} \let\@openbib@code\@empty %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidipoem.sty b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty index baca0feb7c1..7d3e7069dc1 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidipoem.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidipoem.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidipoem.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -209,14 +209,14 @@ \expandafter\def\csname modernpoem*\endcsname{\let\poem@obeylines=\obeylines\modernpoem} \expandafter\def\csname endmodernpoem*\endcsname{\endmodernpoem} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls index 5348d46a9ea..c1305e75db8 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls +++ b/Master/texmf-dist/tex/latex/bidi/bidipresentation.cls @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidipresentation.cls') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -85,14 +85,14 @@ \setlength{\parsep}{0ex}} {\endlist} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/biditufte-book.cls b/Master/texmf-dist/tex/latex/bidi/biditufte-book.cls index 36b799fe7fc..c03c94a4b23 100644 --- a/Master/texmf-dist/tex/latex/bidi/biditufte-book.cls +++ b/Master/texmf-dist/tex/latex/bidi/biditufte-book.cls @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `biditufte-book.cls') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -68,14 +68,14 @@ {}% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/biditufte-handout.cls b/Master/texmf-dist/tex/latex/bidi/biditufte-handout.cls index e923f155391..138ef11ddc2 100644 --- a/Master/texmf-dist/tex/latex/bidi/biditufte-handout.cls +++ b/Master/texmf-dist/tex/latex/bidi/biditufte-handout.cls @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `biditufte-handout.cls') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -37,14 +37,14 @@ {}% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidituftefloat.sty b/Master/texmf-dist/tex/latex/bidi/bidituftefloat.sty index e9f20f454f2..83d268dae04 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftefloat.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftefloat.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidituftefloat.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -575,14 +575,14 @@ bidi implementation of tufte float] } \PassOptionsToPackage{caption=false}{subfig} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidituftegeneralstructure.sty b/Master/texmf-dist/tex/latex/bidi/bidituftegeneralstructure.sty index 4b636cfdcaa..1a51dc82d4d 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftegeneralstructure.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftegeneralstructure.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidituftegeneralstructure.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -120,14 +120,14 @@ bidi implementation of tufte general structure] \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–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidituftehyperref.sty b/Master/texmf-dist/tex/latex/bidi/bidituftehyperref.sty index 0fcec0545e5..2e1545de7f9 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftehyperref.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftehyperref.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidituftehyperref.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -38,14 +38,14 @@ bidi implementation of tufte hyperref] \PassOptionsToPackage{hyperfootnotes=false}{hyperref} } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidituftesidenote.sty b/Master/texmf-dist/tex/latex/bidi/bidituftesidenote.sty index e6da5e3fd62..55739f70c1f 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftesidenote.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftesidenote.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidituftesidenote.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -470,14 +470,14 @@ bidi implementation of tufte sidenote] \let\cite\@bidituftesidenote@normal@cite% go back to using normal in-text \cite command } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidituftetitle.sty b/Master/texmf-dist/tex/latex/bidi/bidituftetitle.sty index 4e823bc6b65..916b80ff755 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftetitle.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftetitle.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidituftetitle.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -151,14 +151,14 @@ bidi implementation of tufte title] \newpage \if@twocolumn\hbox{}\newpage\fi\fi\fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/bidituftetoc.sty b/Master/texmf-dist/tex/latex/bidi/bidituftetoc.sty index 2fabd639ed8..09855289277 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidituftetoc.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidituftetoc.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bidituftetoc.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -148,14 +148,14 @@ bidi implementation of tufte toc] \renewcommand*\l@figure{\@bidituftetoc@lof@line} \let\l@table\l@figure %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 a4d2dd0ea48..98397e229da 100644 --- a/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/boek-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `boek-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -192,14 +192,14 @@ \global\let\and\relax } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 d9a80924cbc..7627c5dbc63 100644 --- a/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/boek3-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `boek3-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -192,14 +192,14 @@ \global\let\and\relax } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 ca95d8d1316..deda9230c55 100644 --- a/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/book-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `book-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -227,14 +227,14 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 810a3daf75a..b0488f04192 100644 --- a/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/bookest-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `bookest-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -46,14 +46,14 @@ \vskip 30\p@ }} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 23fdae0fadd..b24af7e619d 100644 --- a/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/breqn-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `breqn-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -68,14 +68,14 @@ }% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 df8e8f09d96..abad54a6736 100644 --- a/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/caption-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `caption-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -15,14 +15,14 @@ \ProvidesFile{caption-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for caption package for XeTeX engine] \let\@makecaption\caption@makecaption %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 66fccba2c07..91e309894db 100644 --- a/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/color-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `color-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -56,14 +56,14 @@ \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–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 ba9d77d43dc..cb6fcd66f5b 100644 --- a/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/colortbl-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `colortbl-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -51,14 +51,14 @@ \unhbox\z@\if@RTL\endL\fi}% \prepnext@tok} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 29dfa8e9528..61c2f1bb776 100644 --- a/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `combine-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -28,14 +28,14 @@ \renewenvironment{tocindent}[1]{% \hangindent \if@RTL-\fi#1 \hangafter -100\relax}{} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty index 0e765293f01..7c501288458 100644 --- a/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty +++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidicasual.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `cvthemebidicasual.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -111,14 +111,14 @@ \pagestyle{plain}} \AtBeginDocument{\makefooter} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty index 164eed7b146..bb5d21acf1a 100644 --- a/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty +++ b/Master/texmf-dist/tex/latex/bidi/cvthemebidiclassic.sty @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `cvthemebidiclassic.sty') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -118,14 +118,14 @@ {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 3e548860d9f..14bae3a0931 100644 --- a/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `dblfnote-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -196,14 +196,14 @@ \newcommand{\LTRdfnmakecol}{\renewcommand{\dfn@makecol}{\dfn@LTRmakecol}} \DFNalwaysdouble %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 ca3fd11a6e7..44fb7c8ecaa 100644 --- a/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/draftwatermark-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `draftwatermark-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -16,14 +16,14 @@ \renewcommand\SetWatermarkText[1]{% \def\sc@wm@text{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 e26b08d12b7..2681e9f8fad 100644 --- a/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `empheq-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -175,14 +175,14 @@ } \MHInternalSyntaxOff %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 d25e6a58323..e3368063366 100644 --- a/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extarticle-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `extarticle-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -187,14 +187,14 @@ \renewcommand\theparagraph {\thesubsubsection\@SepMark\@arabic\c@paragraph} \renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}%% %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 c44ae5a092e..629de88649e 100644 --- a/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extbook-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `extbook-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -186,14 +186,14 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 73273b02dae..72d289350a1 100644 --- a/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extletter-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `extletter-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -48,14 +48,14 @@ \hrule \@width .4\columnwidth \kern .6\p@}\hfil\endR}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def b/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def index aa17588e35f..d8b03a322b5 100644 --- a/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def +++ b/Master/texmf-dist/tex/latex/bidi/extrafootnotefeatures.def @@ -7,48 +7,146 @@ %% bidi.dtx (with options: `extrafootnotefeatures.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% -\ProvidesFile{extrafootnotefeatures}[2011/08/01 v0.2 bidi extra footnote features for XeTeX engine] -\newif\if@parafootRTL -\newcommand{\setRTLparagraphfootnotes}{\@parafootRTLtrue} -\newcommand{\setLTRparagraphfootnotes}{\@parafootRTLfalse} +\ProvidesFile{extrafootnotefeatures}[2012/01/01 v0.3 bidi extra footnote features for XeTeX engine] +\g@addto@macro\document{\textwidthfootnoterule} +\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 + \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% + \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% + \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} +\renewcommand{\@mpfootnotetext}[1]{% + \global\setbox\@mpfootins\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox\@mpfootins + \def\baselinestretch{\m@m@footnote@spacing}% + \foottextfont \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \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}% + \color@endgroup}} +\renewcommand{\@mpLTRfootnotetext}[1]{% + \global\setbox\@mpfootins\vbox{\@RTLfalse% + \unvbox\@mpfootins + \def\baselinestretch{\m@m@footnote@spacing}% + \LTRfoottextfont \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \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}% + \color@endgroup}} +\renewcommand{\@mpRTLfootnotetext}[1]{% + \global\setbox\@mpfootins\vbox{\@RTLtrue% + \unvbox\@mpfootins + \def\baselinestretch{\m@m@footnote@spacing}% + \RTLfoottextfont \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \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}% + \color@endgroup}} \let\m@mold@footnotetext\@footnotetext \let\m@mold@LTRfootnotetext\@LTRfootnotetext \let\m@mold@RTLfootnotetext\@RTLfootnotetext \let\m@mold@mpfootnotetext\@mpfootnotetext \let\m@mold@mpLTRfootnotetext\@mpLTRfootnotetext \let\m@mold@mpRTLfootnotetext\@mpRTLfootnotetext -\newcommand{\normalfootnotes}{% +\bidi@ensure@newcommand{\normalfootnotes}{% \let\@footnotetext\m@mold@footnotetext \let\@LTRfootnotetext\m@mold@LTRfootnotetext \let\@RTLfootnotetext\m@mold@RTLfootnotetext \let\@mpfootnotetext\m@mold@mpfootnotetext \let\@mpLTRfootnotetext\m@mold@mpLTRfootnotetext \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext} -\newif\if@RTLcolumnfootnotes -\newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue} -\newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse} -\g@addto@macro\document{\textwidthfootnoterule} -\newcommand*{\setSingleSpace}[1]{% +\@ifclassloaded{memoir}{\let\plainfootnotes\normalfootnotes}{} +\bidi@ensure@newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue} +\bidi@ensure@newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse} +\bidi@ensure@newcommand*{\setSingleSpace}[1]{% \def\m@m@singlespace{#1}% \def\m@m@footnote@spacing{#1}% \def\m@m@float@spacing{#1} % } \setSingleSpace{1} \newinsert\sideins -\newcommand*{\multiplefootnotemarker}{3sp} -\newcommand*{\m@mmf@prepare}{% +\bidi@ensure@newcommand*{\multiplefootnotemarker}{3sp} +\bidi@ensure@newcommand*{\m@mmf@prepare}{% \kern-\multiplefootnotemarker \kern\multiplefootnotemarker\relax} -\newlength{\footmarkwidth} -\newlength{\footmarksep} -\newlength{\footparindent} -\newcommand*{\footmarkstyle}[1]{\def\footscript##1{#1}} -\newcommand{\footfootmark}{% +\bidi@ensure@newlength{\footmarkwidth} +\bidi@ensure@newlength{\footmarksep} +\bidi@ensure@newlength{\footparindent} +\bidi@ensure@newcommand*{\footmarkstyle}[1]{\def\footscript##1{#1}} +\bidi@ensure@newcommand{\footfootmark}{% \ifdim\footmarkwidth < \z@ \llap{\hb@xt@ -\footmarkwidth{% \hss\normalfont\footscript{\@thefnmark}}% @@ -63,33 +161,35 @@ \footmarkstyle{\textsuperscript{#1}} \setlength{\footmarkwidth}{1.8em} \setlength{\footparindent}{1em} -\newcommand{\m@mdoextrafeet}{\extrafeetins} -\newcommand*{\extrafeetins}{% +\bidi@ensure@newcommand{\m@mdoextrafeet}{\extrafeetins} +\bidi@ensure@newcommand*{\extrafeetins}{% \setbox\@outputbox \vbox{% \boxmaxdepth \@maxdepth \unvbox\@outputbox \ifvoid\footinsv@r\else\@footstartv@r\@footgroupv@r\fi \extrafeetinshook}} -\newcommand{\extrafeetinshook}{} -\newcommand{\foottextfont}{\footnotesize} -\newlength{\footinsdim} +\bidi@ensure@newcommand{\extrafeetinshook}{} +\bidi@ensure@newcommand{\foottextfont}{\footnotesize} +\bidi@ensure@newcommand{\LTRfoottextfont}{\footnotesize} +\bidi@ensure@newcommand{\RTLfoottextfont}{\footnotesize} +\bidi@ensure@newlength{\footinsdim} \setlength{\footinsdim}{8in} % standard for \dimen\footins -\newcommand{\@preamfntext}{% +\bidi@ensure@newcommand{\@preamfntext}{% \interlinepenalty\interfootnotelinepenalty \floatingpenalty \@MM \splittopskip=\footnotesep \splitmaxdepth=\dp\strutbox \@parboxrestore} -\newcommand{\m@mdoextrafeetmini}{% +\bidi@ensure@newcommand{\m@mdoextrafeetmini}{% \extrafeetminihook} -\newcommand{\extrafeetendmini}{% +\bidi@ensure@newcommand{\extrafeetendmini}{% \ifvoid\@mpfootinsv@r\else \vskip\skip\@mpfootins \normalcolor\footnoterule\mp@footgroupv@r \fi \extrafeetendminihook} -\newcommand{\extrafeetendminihook}{} -\newcommand{\m@mdoextrafeetendmini}{\extrafeetendmini} +\bidi@ensure@newcommand{\extrafeetendminihook}{} +\bidi@ensure@newcommand{\m@mdoextrafeetendmini}{\extrafeetendmini} \def\endminipage{% \par \unskip @@ -104,7 +204,7 @@ \color@endgroup \egroup \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}} -\newcommand{\m@make@footstart}[1]{% +\bidi@ensure@newcommand{\m@make@footstart}[1]{% \@namedef{@footstart#1}{% \vskip\bigskipamount \leftskip=\z@ @@ -115,20 +215,20 @@ \count\footinsv@r=1000 % no magnifcation \dimen\footinsv@r=\footinsdim \m@make@footstart{v@r} -\newcommand{\@footgroupv@r}{} +\bidi@ensure@newcommand{\@footgroupv@r}{} \newinsert\@mpfootinsv@r -\newcommand{\mp@footgroupv@r}{} +\bidi@ensure@newcommand{\mp@footgroupv@r}{} \newcount\m@m@k \newdimen\m@m@h -\newcommand*{\m@mrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 +\bidi@ensure@newcommand*{\m@mrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 \@@line{\if@RTLcolumnfootnotes\beginR\fi\splittopskip=\m@m@h \vbadness=\@M \hfilneg \valign{##\vfill\cr\m@mdosplits}\if@RTLcolumnfootnotes\endR\fi}} -\newcommand*{\m@mdosplits}{\ifnum\m@m@k>0 \noalign{\hfil}\m@msplitoff +\bidi@ensure@newcommand*{\m@mdosplits}{\ifnum\m@m@k>0 \noalign{\hfil}\m@msplitoff \global\advance\m@m@k-1\cr\m@mdosplits\fi} -\newcommand*{\m@msplitoff}{\dimen0=\ht0 +\bidi@ensure@newcommand*{\m@msplitoff}{\dimen0=\ht0 \divide\dimen0 by\m@m@k \advance\dimen0 by\m@m@h \setbox2 \vsplit0 to \dimen0 \unvbox2 } -\newcommand{\twocolumnfootnotes}{% +\bidi@ensure@newcommand{\twocolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@twocolfootnotetext \let\@LTRfootnotetext\@twocolLTRfootnotetext @@ -142,7 +242,7 @@ \let\@mpRTLfootnotetext\@mptwocolRTLfootnotetext \m@make@mptwocol@footgroup{v@r}% \let\mp@footgroupv@r\@mptwocol@footgroupv@r} -\newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -152,35 +252,41 @@ \@twocolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@twocolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@twocolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamtwofmt}{% +\bidi@ensure@newcommand{\@preamtwofmt}{% \hsize .45\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@twocolfootfmt}[1]{% +\bidi@ensure@newcommand{\@twocolfootfmt}[1]{% \@preamtwofmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mptwocolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@twocolLTRfootfmt}[1]{% + \@preamtwofmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@twocolRTLfootfmt}[1]{% + \@preamtwofmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mptwocolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -192,48 +298,48 @@ \@twocolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptwocolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptwocolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptwocolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptwocolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@twocolfootfmt{#1}% + \@twocolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\twocolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\twocolumnfootstyle}[1]{% \m@make@twocolfootnotetext{#1}% \m@make@mptwocolfootnotetext{#1}% \m@make@twocolfootfmt{#1}% \m@make@twocol@footgroup{#1}% \m@make@mptwocol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@twocolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mptwocolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@twocol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mptwocol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@twocolfootnotetext}[1]{% - \@namelongdef{@twocolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@twocolfootnotetext}[1]{% + \bidi@namelongdef{@twocolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -244,8 +350,8 @@ \@nameuse{@twocolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mptwocolfootnotetext}[1]{% -\@namelongdef{@mptwocolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mptwocolfootnotetext}[1]{% +\bidi@namelongdef{@mptwocolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -256,20 +362,20 @@ \color@begingroup \@nameuse{@twocolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@twocolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@twocolfootfmt}[1]{% \@namedef{@twocolfootfmt#1}##1{% \@preamtwofmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@twocol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@twocol@footgroup}[1]{% \@namedef{@twocol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{\tw@}{\splittopskip}}}} -\newcommand{\m@make@mptwocol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mptwocol@footgroup}[1]{% \@namedef{@mptwocol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\tw@}{\splittopskip}}}} -\newcommand{\threecolumnfootnotes}{% +\bidi@ensure@newcommand{\threecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@threecolfootnotetext \let\@LTRfootnotetext\@threecolLTRfootnotetext @@ -283,7 +389,7 @@ \let\@mpRTLfootnotetext\@mpthreecolRTLfootnotetext \m@make@mpthreecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpthreecol@footgroupv@r} -\newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -292,33 +398,39 @@ \color@begingroup \@threecolfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolLTRfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@threecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@threecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolRTLfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@preamthreefmt}{% +\bidi@ensure@newcommand{\@preamthreefmt}{% \hsize .3\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@threecolfootfmt}[1]{% +\bidi@ensure@newcommand{\@threecolfootfmt}[1]{% \@preamthreefmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpthreecolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@threecolLTRfootfmt}[1]{% + \@preamthreefmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@threecolRTLfootfmt}[1]{% + \@preamthreefmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpthreecolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -329,46 +441,46 @@ \color@begingroup \@threecolfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@mpthreecolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpthreecolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolLTRfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\@mpthreecolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpthreecolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@threecolfootfmt{#1}% + \@threecolRTLfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\newcommand{\threecolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\threecolumnfootstyle}[1]{% \m@make@threecolfootnotetext{#1}% \m@make@mpthreecolfootnotetext{#1}% \m@make@threecolfootfmt{#1}% \m@make@threecol@footgroup{#1}% \m@make@mpthreecol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@threecolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpthreecolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@threecol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpthreecol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=3\footinsdim \expandafter\count\csname footins#1\endcsname=333\relax} -\newcommand{\m@make@threecolfootnotetext}[1]{% -\@namelongdef{@threecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@threecolfootnotetext}[1]{% +\bidi@namelongdef{@threecolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -378,8 +490,8 @@ \color@begingroup \@nameuse{@threecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@mpthreecolfootnotetext}[1]{% -\@namelongdef{@mpthreecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpthreecolfootnotetext}[1]{% +\bidi@namelongdef{@mpthreecolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -390,20 +502,20 @@ \color@begingroup \@nameuse{@threecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@threecolfootfmt}[1]{% -\@namelongdef{@threecolfootfmt#1}##1{% +\bidi@ensure@newcommand{\m@make@threecolfootfmt}[1]{% +\bidi@namelongdef{@threecolfootfmt#1}##1{% \@preamthreefmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@threecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@threecol@footgroup}[1]{% \@namedef{@threecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{\thr@@}{\splittopskip}}}} -\newcommand{\m@make@mpthreecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpthreecol@footgroup}[1]{% \@namedef{@mpthreecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\thr@@}{\splittopskip}}}} -\newcommand{\fourcolumnfootnotes}{% +\bidi@ensure@newcommand{\fourcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@fourcolfootnotetext \let\@LTRfootnotetext\@fourcolLTRfootnotetext @@ -417,7 +529,7 @@ \let\@mpRTLfootnotetext\@mpfourcolRTLfootnotetext \m@make@mpfourcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpfourcol@footgroupv@r} -\newcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -427,35 +539,41 @@ \@fourcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fourcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@fourcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamfourfmt}{% +\bidi@ensure@newcommand{\@preamfourfmt}{% \hsize .25\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@fourcolfootfmt}[1]{% +\bidi@ensure@newcommand{\@fourcolfootfmt}[1]{% \@preamfourfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpfourcolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@fourcolLTRfootfmt}[1]{% + \@preamfourfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@fourcolRTLfootfmt}[1]{% + \@preamfourfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpfourcolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -467,48 +585,48 @@ \@fourcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfourcolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfourcolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfourcolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfourcolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fourcolfootfmt{#1}% + \@fourcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\fourcolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\fourcolumnfootstyle}[1]{% \m@make@fourcolfootnotetext{#1}% \m@make@mpfourcolfootnotetext{#1}% \m@make@fourcolfootfmt{#1}% \m@make@fourcol@footgroup{#1}% \m@make@mpfourcol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@fourcolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpfourcolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@fourcol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpfourcol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@fourcolfootnotetext}[1]{% - \@namelongdef{@fourcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@fourcolfootnotetext}[1]{% + \bidi@namelongdef{@fourcolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -519,8 +637,8 @@ \@nameuse{@fourcolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpfourcolfootnotetext}[1]{% -\@namelongdef{@mpfourcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpfourcolfootnotetext}[1]{% +\bidi@namelongdef{@mpfourcolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -531,20 +649,20 @@ \color@begingroup \@nameuse{@fourcolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@fourcolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@fourcolfootfmt}[1]{% \@namedef{@fourcolfootfmt#1}##1{% \@preamfourfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@fourcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@fourcol@footgroup}[1]{% \@namedef{@fourcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{4}{\splittopskip}}}} -\newcommand{\m@make@mpfourcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpfourcol@footgroup}[1]{% \@namedef{@mpfourcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{4}{\splittopskip}}}} -\newcommand{\fivecolumnfootnotes}{% +\bidi@ensure@newcommand{\fivecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@fivecolfootnotetext \let\@LTRfootnotetext\@fivecolLTRfootnotetext @@ -558,7 +676,7 @@ \let\@mpRTLfootnotetext\@mpfivecolRTLfootnotetext \m@make@mpfivecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpfivecol@footgroupv@r} -\newcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -568,35 +686,41 @@ \@fivecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@fivecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@fivecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamfivefmt}{% +\bidi@ensure@newcommand{\@preamfivefmt}{% \hsize .2\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@fivecolfootfmt}[1]{% +\bidi@ensure@newcommand{\@fivecolfootfmt}[1]{% \@preamfivefmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpfivecolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@fivecolLTRfootfmt}[1]{% + \@preamfivefmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@fivecolRTLfootfmt}[1]{% + \@preamfivefmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpfivecolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -608,48 +732,48 @@ \@fivecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfivecolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfivecolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpfivecolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpfivecolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@fivecolfootfmt{#1}% + \@fivecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\fivecolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\fivecolumnfootstyle}[1]{% \m@make@fivecolfootnotetext{#1}% \m@make@mpfivecolfootnotetext{#1}% \m@make@fivecolfootfmt{#1}% \m@make@fivecol@footgroup{#1}% \m@make@mpfivecol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@fivecolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpfivecolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@fivecol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpfivecol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@fivecolfootnotetext}[1]{% - \@namelongdef{@fivecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@fivecolfootnotetext}[1]{% + \bidi@namelongdef{@fivecolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -660,8 +784,8 @@ \@nameuse{@fivecolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpfivecolfootnotetext}[1]{% -\@namelongdef{@mpfivecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpfivecolfootnotetext}[1]{% +\bidi@namelongdef{@mpfivecolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -672,20 +796,20 @@ \color@begingroup \@nameuse{@fivecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@fivecolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@fivecolfootfmt}[1]{% \@namedef{@fivecolfootfmt#1}##1{% \@preamfivefmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@fivecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@fivecol@footgroup}[1]{% \@namedef{@fivecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{5}{\splittopskip}}}} -\newcommand{\m@make@mpfivecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpfivecol@footgroup}[1]{% \@namedef{@mpfivecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{5}{\splittopskip}}}} -\newcommand{\sixcolumnfootnotes}{% +\bidi@ensure@newcommand{\sixcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@sixcolfootnotetext \let\@LTRfootnotetext\@sixcolLTRfootnotetext @@ -699,7 +823,7 @@ \let\@mpRTLfootnotetext\@mpsixcolRTLfootnotetext \m@make@mpsixcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpsixcol@footgroupv@r} -\newcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -709,35 +833,41 @@ \@sixcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sixcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@sixcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamsixfmt}{% +\bidi@ensure@newcommand{\@preamsixfmt}{% \hsize .16\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@sixcolfootfmt}[1]{% +\bidi@ensure@newcommand{\@sixcolfootfmt}[1]{% \@preamsixfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpsixcolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sixcolLTRfootfmt}[1]{% + \@preamsixfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@sixcolRTLfootfmt}[1]{% + \@preamsixfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpsixcolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -749,48 +879,48 @@ \@sixcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsixcolLTRfootnotetext}[1]{\@RTLfalse% +\bidi@ensure@newcommand{\@mpsixcolLTRfootnotetext}[1]{\@RTLfalse% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsixcolRTLfootnotetext}[1]{\@RTLtrue% +\bidi@ensure@newcommand{\@mpsixcolRTLfootnotetext}[1]{\@RTLtrue% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sixcolfootfmt{#1}% + \@sixcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\sixcolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\sixcolumnfootstyle}[1]{% \m@make@sixcolfootnotetext{#1}% \m@make@mpsixcolfootnotetext{#1}% \m@make@sixcolfootfmt{#1}% \m@make@sixcol@footgroup{#1}% \m@make@mpsixcol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@sixcolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpsixcolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@sixcol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpsixcol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@sixcolfootnotetext}[1]{% - \@namelongdef{@sixcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@sixcolfootnotetext}[1]{% + \bidi@namelongdef{@sixcolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -801,8 +931,8 @@ \@nameuse{@sixcolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpsixcolfootnotetext}[1]{% -\@namelongdef{@mpsixcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpsixcolfootnotetext}[1]{% +\bidi@namelongdef{@mpsixcolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -813,20 +943,20 @@ \color@begingroup \@nameuse{@sixcolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@sixcolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@sixcolfootfmt}[1]{% \@namedef{@sixcolfootfmt#1}##1{% \@preamsixfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@sixcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@sixcol@footgroup}[1]{% \@namedef{@sixcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{6}{\splittopskip}}}} -\newcommand{\m@make@mpsixcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpsixcol@footgroup}[1]{% \@namedef{@mpsixcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{6}{\splittopskip}}}} -\newcommand{\sevencolumnfootnotes}{% +\bidi@ensure@newcommand{\sevencolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@sevencolfootnotetext \let\@LTRfootnotetext\@sevencolLTRfootnotetext @@ -840,7 +970,7 @@ \let\@mpRTLfootnotetext\@mpsevencolRTLfootnotetext \m@make@mpsevencol@footgroup{v@r}% \let\mp@footgroupv@r\@mpsevencol@footgroupv@r} -\newcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -850,35 +980,41 @@ \@sevencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@sevencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@sevencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamsevenfmt}{% +\bidi@ensure@newcommand{\@preamsevenfmt}{% \hsize .142\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@sevencolfootfmt}[1]{% +\bidi@ensure@newcommand{\@sevencolfootfmt}[1]{% \@preamsevenfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpsevencolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sevencolLTRfootfmt}[1]{% + \@preamsevenfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@sevencolRTLfootfmt}[1]{% + \@preamsevenfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpsevencolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -890,48 +1026,48 @@ \@sevencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsevencolLTRfootnotetext}[1]{\@RTLfalse% +\bidi@ensure@newcommand{\@mpsevencolLTRfootnotetext}[1]{\@RTLfalse% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpsevencolRTLfootnotetext}[1]{\@RTLtrue% +\bidi@ensure@newcommand{\@mpsevencolRTLfootnotetext}[1]{\@RTLtrue% \global\setbox\@mpfootinsv@r\vbox{% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@sevencolfootfmt{#1}% + \@sevencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\sevencolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\sevencolumnfootstyle}[1]{% \m@make@sevencolfootnotetext{#1}% \m@make@mpsevencolfootnotetext{#1}% \m@make@sevencolfootfmt{#1}% \m@make@sevencol@footgroup{#1}% \m@make@mpsevencol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@sevencolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpsevencolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@sevencol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpsevencol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@sevencolfootnotetext}[1]{% - \@namelongdef{@sevencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@sevencolfootnotetext}[1]{% + \bidi@namelongdef{@sevencolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -942,8 +1078,8 @@ \@nameuse{@sevencolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpsevencolfootnotetext}[1]{% -\@namelongdef{@mpsevencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpsevencolfootnotetext}[1]{% +\bidi@namelongdef{@mpsevencolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -954,20 +1090,20 @@ \color@begingroup \@nameuse{@sevencolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@sevencolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@sevencolfootfmt}[1]{% \@namedef{@sevencolfootfmt#1}##1{% \@preamsevenfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@sevencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@sevencol@footgroup}[1]{% \@namedef{@sevencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{7}{\splittopskip}}}} -\newcommand{\m@make@mpsevencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpsevencol@footgroup}[1]{% \@namedef{@mpsevencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{7}{\splittopskip}}}} -\newcommand{\eightcolumnfootnotes}{% +\bidi@ensure@newcommand{\eightcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@eightcolfootnotetext \let\@LTRfootnotetext\@eightcolLTRfootnotetext @@ -981,7 +1117,7 @@ \let\@mpRTLfootnotetext\@mpeightcolRTLfootnotetext \m@make@mpeightcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpeightcol@footgroupv@r} -\newcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -991,35 +1127,41 @@ \@eightcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@eightcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@eightcolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preameightfmt}{% +\bidi@ensure@newcommand{\@preameightfmt}{% \hsize .125\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@eightcolfootfmt}[1]{% +\bidi@ensure@newcommand{\@eightcolfootfmt}[1]{% \@preameightfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpeightcolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@eightcolLTRfootfmt}[1]{% + \@preameightfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@eightcolRTLfootfmt}[1]{% + \@preameightfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpeightcolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -1031,48 +1173,48 @@ \@eightcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpeightcolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpeightcolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpeightcolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpeightcolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@eightcolfootfmt{#1}% + \@eightcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\eightcolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\eightcolumnfootstyle}[1]{% \m@make@eightcolfootnotetext{#1}% \m@make@mpeightcolfootnotetext{#1}% \m@make@eightcolfootfmt{#1}% \m@make@eightcol@footgroup{#1}% \m@make@mpeightcol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@eightcolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpeightcolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@eightcol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpeightcol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@eightcolfootnotetext}[1]{% - \@namelongdef{@eightcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@eightcolfootnotetext}[1]{% + \bidi@namelongdef{@eightcolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -1083,8 +1225,8 @@ \@nameuse{@eightcolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpeightcolfootnotetext}[1]{% -\@namelongdef{@mpeightcolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpeightcolfootnotetext}[1]{% +\bidi@namelongdef{@mpeightcolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -1095,20 +1237,20 @@ \color@begingroup \@nameuse{@eightcolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@eightcolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@eightcolfootfmt}[1]{% \@namedef{@eightcolfootfmt#1}##1{% \@preameightfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@eightcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@eightcol@footgroup}[1]{% \@namedef{@eightcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{8}{\splittopskip}}}} -\newcommand{\m@make@mpeightcol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpeightcol@footgroup}[1]{% \@namedef{@mpeightcol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{8}{\splittopskip}}}} -\newcommand{\ninecolumnfootnotes}{% +\bidi@ensure@newcommand{\ninecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@ninecolfootnotetext \let\@LTRfootnotetext\@ninecolLTRfootnotetext @@ -1122,7 +1264,7 @@ \let\@mpRTLfootnotetext\@mpninecolRTLfootnotetext \m@make@mpninecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpninecol@footgroupv@r} -\newcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -1132,35 +1274,41 @@ \@ninecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@ninecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@ninecolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamninefmt}{% +\bidi@ensure@newcommand{\@preamninefmt}{% \hsize .1\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@ninecolfootfmt}[1]{% +\bidi@ensure@newcommand{\@ninecolfootfmt}[1]{% \@preamninefmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mpninecolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@ninecolLTRfootfmt}[1]{% + \@preamninefmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@ninecolRTLfootfmt}[1]{% + \@preamninefmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mpninecolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -1172,48 +1320,48 @@ \@ninecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpninecolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpninecolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mpninecolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpninecolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@ninecolfootfmt{#1}% + \@ninecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\ninecolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\ninecolumnfootstyle}[1]{% \m@make@ninecolfootnotetext{#1}% \m@make@mpninecolfootnotetext{#1}% \m@make@ninecolfootfmt{#1}% \m@make@ninecol@footgroup{#1}% \m@make@mpninecol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@ninecolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpninecolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@ninecol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mpninecol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@ninecolfootnotetext}[1]{% - \@namelongdef{@ninecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@ninecolfootnotetext}[1]{% + \bidi@namelongdef{@ninecolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -1224,8 +1372,8 @@ \@nameuse{@ninecolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mpninecolfootnotetext}[1]{% -\@namelongdef{@mpninecolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpninecolfootnotetext}[1]{% +\bidi@namelongdef{@mpninecolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -1236,20 +1384,20 @@ \color@begingroup \@nameuse{@ninecolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@ninecolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@ninecolfootfmt}[1]{% \@namedef{@ninecolfootfmt#1}##1{% \@preamninefmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@ninecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@ninecol@footgroup}[1]{% \@namedef{@ninecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{9}{\splittopskip}}}} -\newcommand{\m@make@mpninecol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mpninecol@footgroup}[1]{% \@namedef{@mpninecol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{9}{\splittopskip}}}} -\newcommand{\tencolumnfootnotes}{% +\bidi@ensure@newcommand{\tencolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@tencolfootnotetext \let\@LTRfootnotetext\@tencolLTRfootnotetext @@ -1263,7 +1411,7 @@ \let\@mpRTLfootnotetext\@mptencolRTLfootnotetext \m@make@mptencol@footgroup{v@r}% \let\mp@footgroupv@r\@mptencol@footgroupv@r} -\newcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -1273,35 +1421,41 @@ \@tencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@tencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% +\bidi@ensure@newcommand{\@tencolRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLtrue% \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@preamtenfmt}{% +\bidi@ensure@newcommand{\@preamtenfmt}{% \hsize .1\hsize \parindent=\z@ \tolerance=5000\relax \leavevmode} -\newcommand{\@tencolfootfmt}[1]{% +\bidi@ensure@newcommand{\@tencolfootfmt}[1]{% \@preamtenfmt {\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak} -\newcommand{\@mptencolfootnotetext}[1]{% +\bidi@ensure@newcommand{\@tencolLTRfootfmt}[1]{% + \@preamtenfmt + {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@tencolRTLfootfmt}[1]{% + \@preamtenfmt + {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} +\bidi@ensure@newcommand{\@mptencolfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -1313,48 +1467,48 @@ \@tencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptencolLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptencolLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolLTRfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\@mptencolRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mptencolRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLtrue% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \@tencolfootfmt{#1}% + \@tencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\newcommand{\tencolumnfootstyle}[1]{% +\bidi@ensure@newcommand{\tencolumnfootstyle}[1]{% \m@make@tencolfootnotetext{#1}% \m@make@mptencolfootnotetext{#1}% \m@make@tencolfootfmt{#1}% \m@make@tencol@footgroup{#1}% \m@make@mptencol@footgroup{#1}% \m@make@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@tencolfootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mptencolfootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@tencol@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mptencol@footgroup#1}}% \expandafter\dimen\csname footins#1\endcsname=2\footinsdim \expandafter\count\csname footins#1\endcsname=500\relax} -\newcommand{\m@make@tencolfootnotetext}[1]{% - \@namelongdef{@tencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@tencolfootnotetext}[1]{% + \bidi@namelongdef{@tencolfootnotetext#1}##1{% \insert\@nameuse{footins#1}{% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -1365,8 +1519,8 @@ \@nameuse{@tencolfootfmt#1}{##1}% \color@endgroup}% \m@mmf@prepare}} -\newcommand{\m@make@mptencolfootnotetext}[1]{% -\@namelongdef{@mptencolfootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mptencolfootnotetext}[1]{% +\bidi@namelongdef{@mptencolfootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -1377,20 +1531,20 @@ \color@begingroup \@nameuse{@tencolfootfmt#1}{##1}% \color@endgroup}\m@mmf@prepare}} -\newcommand{\m@make@tencolfootfmt}[1]{% +\bidi@ensure@newcommand{\m@make@tencolfootfmt}[1]{% \@namedef{@tencolfootfmt#1}##1{% \@preamtenfmt {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} -\newcommand{\m@make@tencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@tencol@footgroup}[1]{% \@namedef{@tencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{10}{\splittopskip}}}} -\newcommand{\m@make@mptencol@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mptencol@footgroup}[1]{% \@namedef{@mptencol@footgroup#1}{{% \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{10}{\splittopskip}}}} -\newcommand{\m@munvxh}[1]{% +\bidi@ensure@newcommand{\m@munvxh}[1]{% \setbox0=\vbox{\unvbox#1% \global\setbox1=\lastbox}% \unhbox1 @@ -1398,17 +1552,17 @@ \unskip \unpenalty \hskip\m@mipn@skip} -\newcommand{\m@mungebox}{% +\bidi@ensure@newcommand{\m@mungebox}{% \setbox0=\hbox{\m@munvxh0}% \dp0=\z@ \ht0=\footfudgefactor\wd0 \box0 \penalty0} \newskip\m@mipn@skip -\newcommand*{\m@minterparanoteglue}[1]{% +\bidi@ensure@newcommand*{\m@minterparanoteglue}[1]{% {\foottextfont\global\m@mipn@skip=#1\relax}} \m@minterparanoteglue{1em plus.4em minus.4em} -\newcommand*{\m@mmakehboxofhboxes}{% +\bidi@ensure@newcommand*{\m@mmakehboxofhboxes}{% \if@parafootRTL\@RTLtrue\else\@RTLfalse\fi% \setbox0=\hbox{}% \loop @@ -1417,10 +1571,10 @@ \ifhbox2 \setbox0=\hbox{\box2\unhbox0} \repeat} -\newcommand*{\m@mremovehboxes}{\setbox0=\lastbox +\bidi@ensure@newcommand*{\m@mremovehboxes}{\setbox0=\lastbox \ifhbox0{\m@mremovehboxes}\unhbox0 \fi} -\newcommand*{\footfudgefiddle}{64} -\newcommand{\paragraphfootnotes}{% +\bidi@ensure@newcommand*{\footfudgefiddle}{64} +\bidi@ensure@newcommand{\paragraphfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \let\@footnotetext\@parafootnotetext \let\@LTRfootnotetext\@paraLTRfootnotetext @@ -1439,7 +1593,7 @@ \multiply\dimen0 by 1024 \divide\dimen0 by \hsize \multiply\dimen0 by \footfudgefiddle \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}} -\newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{\@RTLfalse +\bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{\@RTLfalse \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -1450,33 +1604,41 @@ \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse +\bidi@ensure@newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{\beginL#1\endL}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@paraRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse +\bidi@ensure@newcommand{\@paraRTLfootnotetext}[1]{\insert\footinsv@r{\@RTLfalse \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \@preamfntext \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{\beginR#1\endR}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@parafootfmt}[1]{% +\bidi@ensure@newcommand{\@parafootfmt}[1]{% \parindent=\z@ \parfillskip=0pt \@plus 1fil {\footfootmark\strut {\foottextfont #1}\penalty-10}} -\newcommand{\@mpparafootnotetext}[1]{% +\bidi@ensure@newcommand{\@paraLTRfootfmt}[1]{% + \parindent=\z@ + \parfillskip=0pt \@plus 1fil + {\footfootmark\strut {\LTRfoottextfont #1}\penalty-10}} +\bidi@ensure@newcommand{\@paraRTLfootfmt}[1]{% + \parindent=\z@ + \parfillskip=0pt \@plus 1fil + {\footfootmark\strut {\RTLfoottextfont #1}\penalty-10}} +\bidi@ensure@newcommand{\@mpparafootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% @@ -1489,42 +1651,42 @@ \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@mpparaLTRfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpparaLTRfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{\beginL#1\endL}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\@mpparaRTLfootnotetext}[1]{% +\bidi@ensure@newcommand{\@mpparaRTLfootnotetext}[1]{% \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% \unvbox\@mpfootinsv@r \def\baselinestretch{\m@m@footnote@spacing}% - \reset@font\foottextfont + \reset@font\RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{\beginR#1\endR}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\newcommand{\paragraphfootstyle}[1]{% +\bidi@ensure@newcommand{\paragraphfootstyle}[1]{% \m@make@parafootnotetext{#1}% \m@make@mpparafootnotetext{#1}% \m@make@parafootfmt{#1}% \m@make@para@footgroup{#1}% \m@make@mppara@footgroup{#1}% \m@make@para@footstart{#1}% - \@namelongdef{@footnotetext#1}##1{% + \bidi@namelongdef{@footnotetext#1}##1{% \@nameuse{@parafootnotetext#1}{##1}}% - \@namelongdef{@mpfootnotetext#1}##1{% + \bidi@namelongdef{@mpfootnotetext#1}##1{% \@nameuse{@mpparafootnotetext#1}{##1}}% \@namedef{@footgroup#1}{\@nameuse{@para@footgroup#1}}% \@namedef{mp@footgroup#1}{\@nameuse{@mppara@footgroup#1}}% @@ -1536,8 +1698,8 @@ \multiply\dimen0 by 1024 \divide\dimen0 by \hsize \multiply\dimen0 by 64 \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}} -\newcommand{\m@make@parafootnotetext}[1]{% -\@namelongdef{@parafootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@parafootnotetext}[1]{% +\bidi@namelongdef{@parafootnotetext#1}##1{% \insert\@nameuse{footins#1}{ \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\@nameuse{foottextfont#1}% @@ -1549,8 +1711,8 @@ \noindent \@nameuse{@parafootfmt#1}{##1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare}} -\newcommand{\m@make@mpparafootnotetext}[1]{% -\@namelongdef{@mpparafootnotetext#1}##1{% +\bidi@ensure@newcommand{\m@make@mpparafootnotetext}[1]{% +\bidi@namelongdef{@mpparafootnotetext#1}##1{% \global\setbox\@nameuse{@mpfootins#1}\vbox{% \unvbox\@nameuse{@mpfootins#1} \def\baselinestretch{\m@m@footnote@spacing}% @@ -1563,27 +1725,27 @@ \noindent \@nameuse{@parafootfmt#1}{##1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare}} -\newcommand{\m@make@parafootfmt}[1]{% -\@namelongdef{@parafootfmt#1}##1{% +\bidi@ensure@newcommand{\m@make@parafootfmt}[1]{% +\bidi@namelongdef{@parafootfmt#1}##1{% \parindent=\z@ \parfillskip=0pt \@plus 1fil {\@nameuse{footfootmark#1}\strut {\@nameuse{foottextfont#1}##1}\penalty-10}}} -\newcommand{\m@make@para@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@para@footgroup}[1]{% \@namedef{@para@footgroup#1}{% \unvbox\@nameuse{footins#1} \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \@nameuse{foottextfont#1}% \noindent\unhbox0\par}} -\newcommand{\m@make@mppara@footgroup}[1]{% +\bidi@ensure@newcommand{\m@make@mppara@footgroup}[1]{% \@namedef{@mppara@footgroup#1}{% \unvbox\@nameuse{@mpfootins#1} \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \@nameuse{foottextfont#1}% \noindent\unhbox0\par}} -\newcommand{\m@make@para@footstart}[1]{% +\bidi@ensure@newcommand{\m@make@para@footstart}[1]{% \@namedef{@para@footstart#1}{% \vskip\bigskipamount \leftskip=\z@ @@ -1591,11 +1753,11 @@ \parindent=\z@ \vskip\skip\@nameuse{footins#1}% \footnoterule}} -\newcommand*{\m@m@makecolfloats}{% +\bidi@ensure@newcommand*{\m@m@makecolfloats}{% \xdef\@freelist{\@freelist\@midlist}% \global\let\@midlist\@empty \@combinefloats} -\newcommand*{\m@m@makecoltext}{% +\bidi@ensure@newcommand*{\m@m@makecoltext}{% \ifvbox\@kludgeins \@makespecialcolbox \else @@ -1606,8 +1768,8 @@ \vskip -\dimen@ \@textbottom}% \fi} -\newcommand*{\m@m@makecolintro}{} -\newcommand*{\m@mopfootnote}{\setbox\@outputbox \vbox{% +\bidi@ensure@newcommand*{\m@m@makecolintro}{} +\bidi@ensure@newcommand*{\m@mopfootnote}{\setbox\@outputbox \vbox{% \boxmaxdepth\@maxdepth \@tempdima\dp\@cclv \unvbox\@cclv @@ -1618,7 +1780,7 @@ \footnoterule \unvbox \footins \color@endgroup}} -\newcommand*{\m@mopsidebar}{% +\bidi@ensure@newcommand*{\m@mopsidebar}{% \ifvoid\sideins\else \setbox\@outputbox \vbox{% \sidecontents @@ -1636,17 +1798,17 @@ \m@mopsidebar \m@m@makecoltext \global \maxdepth \@maxdepth} -\newcommand{\feetabovefloat}{\gdef\@makecol{\mem@makecol}} +\bidi@ensure@newcommand{\feetabovefloat}{\gdef\@makecol{\mem@makecol}} \feetabovefloat% %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 8f12524d089..c0a41f659af 100644 --- a/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/extreport-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `extreport-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -190,14 +190,14 @@ \renewcommand\thetable{% \ifnum \c@chapter>\z@\thechapter\@SepMark\fi\@arabic\c@table} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 9925c058ec6..c01c185548f 100644 --- a/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `fancyhdr-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -25,14 +25,14 @@ \parbox[t]{\headwidth}{\centering\if@RTLmain\beginR\else\beginL\fi#3\if@RTLmain\endR\else\endL\fi}\hfill \llap{\parbox[t]{\headwidth}{\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–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 accd95bc67a..2f3cfce1110 100644 --- a/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/fleqn-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `fleqn-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -43,14 +43,14 @@ \endL\egroup \endtrivlist} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 65b1cadb391..d8c01b48bfb 100644 --- a/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/float-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `float-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -17,14 +17,14 @@ \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–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 48ec59156db..a3a0e43ffc6 100644 --- a/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/flowfram-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `flowfram-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -146,14 +146,14 @@ #2\relax \fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 e66442f9ebe..484ffc68df9 100644 --- a/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/footnote-luatex-bidi.def @@ -7,21 +7,21 @@ %% bidi.dtx (with options: `footnote-luatex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% \ProvidesFile{footnote-luatex-bidi.def}[2010/07/25 v0.1 bidi footnote macros for LuaTeX engine] %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 11cb5a31348..cdbb0bd1605 100644 --- a/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/footnote-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `footnote-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -245,14 +245,14 @@ \@RTLfootnotetext} \leftfootnoterule %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 f14d1702813..de4dc376bdc 100644 --- a/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/framed-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `framed-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -159,14 +159,14 @@ \sloppy } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 a99ecde1b31..8bc6e0dfd66 100644 --- a/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/graphicx-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `graphicx-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -118,14 +118,14 @@ \Gscale@box\@tempa[\@tempb]{\box\@tempboxa}% \@end@tempboxa} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 c4463735ab3..411018332e5 100644 --- a/Master/texmf-dist/tex/latex/bidi/hvfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/hvfloat-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `hvfloat-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -391,14 +391,14 @@ \fi } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 68c638b008f..bc1ed7b683a 100644 --- a/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/hyperref-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `hyperref-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -240,14 +240,14 @@ }% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 34e6d7002ae..32b0f2b40b9 100644 --- a/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/leqno-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `leqno-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -17,14 +17,14 @@ \rlap{ \hskip -\displaywidth{\normalfont\normalcolor\if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 0c85823511c..ea1a66bf8a5 100644 --- a/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/letter-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `letter-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -37,14 +37,14 @@ \hrule \@width .4\columnwidth \kern .6\p@}\hfil\endR}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 ea03703ab10..6871f0e54d6 100644 --- a/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `lettrine-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -103,14 +103,14 @@ \hskip \the\L@Findent}\fi}$% \usebox{\L@tbox}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 44dd4e6b2b3..ffb242d1ef3 100644 --- a/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/listings-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `listings-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -22,14 +22,14 @@ \gdef\thelstlisting{\@arabic\c@lstlisting} \fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def index 9381553429e..99045775490 100644 --- a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `loadingorder-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -220,14 +220,14 @@ \fi% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 4c6951ab982..c363436ab05 100644 --- a/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/longtable-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `longtable-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -24,14 +24,14 @@ \endgraf\vskip\baselineskip}% \hss}}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def index 51fe90318f4..db980f7ce47 100644 --- a/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `luatex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -16,14 +16,14 @@ \directlua { tex.enableprimitives('',{'pagedir','bodydir','pardir','textdir','mathdir'}) } \input{footnote-luatex-bidi.def} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 3f9305ef944..07328a30494 100644 --- a/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/memoir-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `memoir-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -169,14 +169,14 @@ \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi \begin{bibitemlist}{#1}}{\end{bibitemlist}\postbibhook} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 4fe4bfa9491..44eddb5ca38 100644 --- a/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/minitoc-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `minitoc-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -51,14 +51,14 @@ \par}% \fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 a34f06cc7c2..ab9b5daf6a2 100644 --- a/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/multicol-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `multicol-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -159,14 +159,14 @@ \rule\z@\footnotesep\ignorespaces\if@RTL@footnote#1\else\rmfamily#1\fi\@finalstrut\strutbox}% \color@endgroup}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 670e34751b8..3b4e2e2673d 100644 --- a/Master/texmf-dist/tex/latex/bidi/multienum-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/multienum-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `multienum-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -80,14 +80,14 @@ \parbox[t]{\labelwidth}{\hfill{\labelname}}\hskip\labelsep \parbox[t]{\remainxoxx}{\bidi@raggedright #3}\smallskip} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 c69127a8823..856309f0668 100644 --- a/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/natbib-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `natbib-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -60,14 +60,14 @@ \bibcleanup }% %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 beec3734573..4f6d1d07ea2 100644 --- a/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/pdfpages-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `pdfpages-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -61,14 +61,14 @@ \AM@ClearShipoutPicture } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 98dd3251764..2afc5ab1eea 100644 --- a/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/pgf-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `pgf-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -22,14 +22,14 @@ }% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 d07bb6d7657..d9ff9457a94 100644 --- a/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/plain-luatex-bidi.def @@ -7,21 +7,21 @@ %% bidi.dtx (with options: `plain-luatex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% \directlua { tex.enableprimitives('',tex.extraprimitives()) } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 839ac292df6..cfc3847217a 100644 --- a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `plain-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -93,14 +93,14 @@ \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–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 d3ea0dc9abb..528e2871cc0 100644 --- a/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/pstricks-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `pstricks-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -18,14 +18,14 @@ \def\pspicture{\ifmmode\else\LTR\beginL\fi\origin@pspicture} \def\endpspicture{\origin@endpspicture\ifmmode\else\endL\endLTR\fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 87e9fe25245..673ede0a06c 100644 --- a/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/quotchap-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `quotchap-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -29,14 +29,14 @@ \vbox to\z@{\leavevmode\copy\@quotebox\vss} \global\let\@printcites\relax} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 9a68e884a6e..5531445ec4f 100644 --- a/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/ragged2e-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `ragged2e-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -99,14 +99,14 @@ \def\RaggedLeft{\if@RTL\origin@RaggedRight\else\origin@RaggedLeft\fi} \def\RaggedRight{\if@RTL\origin@RaggedLeft\else\origin@RaggedRight\fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 9ebacc0cfab..94d6b431953 100644 --- a/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/rapport1-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `rapport1-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -270,14 +270,14 @@ \vskip 1.5em} \fi %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 4a1eecdcd3f..c0f0f91567b 100644 --- a/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/rapport3-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `rapport3-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -292,14 +292,14 @@ \hyphenpenalty=\@M \exhyphenpenalty=\@M \if@RTL\leftskip\else\rightskip\fi=0cm plus .7\hsize\relax} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 307ceb17859..15c00d9183e 100644 --- a/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/refrep-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `refrep-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -196,14 +196,14 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 2154c8146c5..e758f575f77 100644 --- a/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/report-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `report-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -217,14 +217,14 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 aa5e0618f15..ec89ad8d773 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def @@ -7,12 +7,29 @@ %% bidi.dtx (with options: `scrartcl-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% -\ProvidesFile{scrartcl-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrartcl class for XeTeX engine] +\ProvidesFile{scrartcl-xetex-bidi.def}[2012/01/01 v0.6 bidi adaptations for scrartcl class for XeTeX engine] +\newcommand{\scr@saved@LTRfootnotetext}{} +\newcommand{\scr@saved@RTLfootnotetext}{} +\let\scr@saved@footnotetext\@footnotetext +\let\scr@saved@LTRfootnotetext\@LTRfootnotetext +\let\scr@saved@RTLfootnotetext\@RTLfootnotetext +\renewcommand{\@footnotetext}[1]{% + \scr@saved@footnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@LTRfootnotetext}[1]{% + \scr@saved@LTRfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@RTLfootnotetext}[1]{% + \scr@saved@RTLfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} \renewcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -383,6 +400,10 @@ \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}% \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble + \let\scr@tmp@LTRfootnotetext=\@LTRfootnotetext + \let\@LTRfootnotetext=\@gobble + \let\scr@tmp@RTLfootnotetext=\@RTLfootnotetext + \let\@RTLfootnotetext=\@gobble \sbox\@tempboxa{% {\capfont{\strut\ignorespaces #1{{\caplabelfont{#2\captionformat}}}% @@ -390,6 +411,10 @@ }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined + \let\@LTRfootnotetext=\scr@tmp@LTRfootnotetext + \let\scr@tmp@LTRfootnotetext=\undefined + \let\@RTLfootnotetext=\scr@tmp@RTLfootnotetext + \let\scr@tmp@RTLfootnotetext=\undefined \setcounter{footnote}{\@tempcntb}% \setcounter{mpfootnote}{\@tempcnta}% \else @@ -456,14 +481,14 @@ \fi } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 a31ac0b2a3b..29e950f917c 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def @@ -7,12 +7,29 @@ %% bidi.dtx (with options: `scrbook-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% -\ProvidesFile{scrbook-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrbook class for XeTeX engine] +\ProvidesFile{scrbook-xetex-bidi.def}[2012/01/01 v0.6 bidi adaptations for scrbook class for XeTeX engine] +\newcommand{\scr@saved@LTRfootnotetext}{} +\newcommand{\scr@saved@RTLfootnotetext}{} +\let\scr@saved@footnotetext\@footnotetext +\let\scr@saved@LTRfootnotetext\@LTRfootnotetext +\let\scr@saved@RTLfootnotetext\@RTLfootnotetext +\renewcommand{\@footnotetext}[1]{% + \scr@saved@footnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@LTRfootnotetext}[1]{% + \scr@saved@LTRfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@RTLfootnotetext}[1]{% + \scr@saved@RTLfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} \renewcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -439,6 +456,10 @@ \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}% \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble + \let\scr@tmp@LTRfootnotetext=\@LTRfootnotetext + \let\@LTRfootnotetext=\@gobble + \let\scr@tmp@RTLfootnotetext=\@RTLfootnotetext + \let\@RTLfootnotetext=\@gobble \sbox\@tempboxa{% {\capfont{\strut\ignorespaces #1{{\caplabelfont{#2\captionformat}}}% @@ -446,6 +467,10 @@ }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined + \let\@LTRfootnotetext=\scr@tmp@LTRfootnotetext + \let\scr@tmp@LTRfootnotetext=\undefined + \let\@RTLfootnotetext=\scr@tmp@RTLfootnotetext + \let\scr@tmp@RTLfootnotetext=\undefined \setcounter{footnote}{\@tempcntb}% \setcounter{mpfootnote}{\@tempcnta}% \else @@ -512,14 +537,14 @@ \fi } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 13ee4ee867b..69c52f03198 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `scrlettr-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -123,14 +123,14 @@ \fromsig\strut}\par \vspace{1.5\baselineskip}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 db865f4844e..5054356cd1c 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def @@ -7,12 +7,29 @@ %% bidi.dtx (with options: `scrreprt-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% %% -\ProvidesFile{scrreprt-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrreprt class for XeTeX engine] +\ProvidesFile{scrreprt-xetex-bidi.def}[2012/01/01 v0.6 bidi adaptations for scrreprt class for XeTeX engine] +\newcommand{\scr@saved@LTRfootnotetext}{} +\newcommand{\scr@saved@RTLfootnotetext}{} +\let\scr@saved@footnotetext\@footnotetext +\let\scr@saved@LTRfootnotetext\@LTRfootnotetext +\let\scr@saved@RTLfootnotetext\@RTLfootnotetext +\renewcommand{\@footnotetext}[1]{% + \scr@saved@footnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@LTRfootnotetext}[1]{% + \scr@saved@LTRfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} +\renewcommand{\@RTLfootnotetext}[1]{% + \scr@saved@RTLfootnotetext{#1}% + \csname FN@mf@prepare\endcsname +} \renewcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -396,6 +413,10 @@ \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}% \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble + \let\scr@tmp@LTRfootnotetext=\@LTRfootnotetext + \let\@LTRfootnotetext=\@gobble + \let\scr@tmp@RTLfootnotetext=\@RTLfootnotetext + \let\@RTLfootnotetext=\@gobble \sbox\@tempboxa{% {\capfont{\strut\ignorespaces #1{{\caplabelfont{#2\captionformat}}}% @@ -403,6 +424,10 @@ }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined + \let\@LTRfootnotetext=\scr@tmp@LTRfootnotetext + \let\scr@tmp@LTRfootnotetext=\undefined + \let\@RTLfootnotetext=\scr@tmp@RTLfootnotetext + \let\scr@tmp@RTLfootnotetext=\undefined \setcounter{footnote}{\@tempcntb}% \setcounter{mpfootnote}{\@tempcnta}% \else @@ -469,14 +494,14 @@ \fi } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 b6f7f25cddc..cca1f3d6beb 100644 --- a/Master/texmf-dist/tex/latex/bidi/sidecap-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/sidecap-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `sidecap-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -20,14 +20,14 @@ \isSC@ODD{\RaggedLeft}{\RaggedRight}\else% \isSC@ODD{\RaggedRight}{\RaggedLeft}\fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 f2d57a898c4..284dae30fae 100644 --- a/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `stabular-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -40,14 +40,14 @@ \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi \@preamble} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 4a392ddb2bc..e12191e7b67 100644 --- a/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/subfigure-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `subfigure-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -18,14 +18,14 @@ \let\p@subtable=\thetable% } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 1f28065cb41..7034610e2a4 100644 --- a/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `tabls-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -48,14 +48,14 @@ \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi \@preamble} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 780d0e5d529..4b838ed1347 100644 --- a/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tabulary-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `tabulary-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -43,14 +43,14 @@ \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–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def index 21593388aef..91b1f667703 100644 --- a/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tikz-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `tikz-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -20,14 +20,14 @@ \def\tikzpicture{\ifmmode\else\LTR\beginL\fi\origin@tikzpicture} \def\endtikzpicture{\origin@endtikzpicture\ifmmode\else\endL\endLTR\fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 391e67e9aab..9c525daafec 100644 --- a/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/titlesec-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `titlesec-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -42,14 +42,14 @@ \nobreak\ttl@midlongest#5\@@par}% \ttl@endlongest} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 a49c36af829..56ac5e737d0 100644 --- a/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/titletoc-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `titletoc-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -57,14 +57,14 @@ \advance\if@RTL\leftskip\else\rightskip\fi#2\relax \def\@pnumwidth{#2}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 79f470aa086..6af2431ccd7 100644 --- a/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tocbibind-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `tocbibind-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -44,14 +44,14 @@ \fi %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 03810aef517..ebfbb83fe18 100644 --- a/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tocloft-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `tocloft-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -321,14 +321,14 @@ \if@RTL\leftskip\else\rightskip\fi \@tocrmarg\relax \textit{#1}\protect\par}}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 30dca099513..93e1c1a4791 100644 --- a/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tocstyle-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `tocstyle-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -259,14 +259,14 @@ \@tempa } %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 b18fe03cb4e..4794e3f9157 100644 --- a/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `wrapfig-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -89,14 +89,14 @@ \aftergroup\WF@startwrapping % after the \endgroup which immediately follows \fi} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 84530ca81e2..a96f7db4de8 100644 --- a/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xcolor-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `xcolor-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -117,14 +117,14 @@ {\@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–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def index e2fc168d530..e6d682ff7ef 100644 --- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -630,14 +630,14 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xetex-bidi.def}}}{} \DeclareOption{extrafootnotefeatures}{\input{extrafootnotefeatures.def}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% 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 572cbc756ca..d44922eb679 100644 --- a/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xltxtra-xetex-bidi.def @@ -7,7 +7,7 @@ %% bidi.dtx (with options: `xltxtra-xetex-bidi.def') %% %% ______________________________________ -%% Copyright © 2009–2011 VAFA KHALIGHI +%% Copyright © 2009–2012 Vafa Khalighi %% %% License information appended. %% @@ -18,14 +18,14 @@ \let\@@XeLaTeX\XeLaTeX \def\XeLaTeX{\@ensure@LTR{\@@XeLaTeX}} %% -%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com> +%% Copyright © 2009–2012 Vafa Khalighi <vafaklg@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. +%% by Vafa Khalighi. %% %% %% |