diff options
135 files changed, 706 insertions, 1364 deletions
diff --git a/Master/texmf-dist/doc/xelatex/bidi/README b/Master/texmf-dist/doc/xelatex/bidi/README index a84eba773cd..ebe2d341737 100644 --- a/Master/texmf-dist/doc/xelatex/bidi/README +++ b/Master/texmf-dist/doc/xelatex/bidi/README @@ -1,6 +1,6 @@ ___________________ The bidi package -v34.4 +v34.6 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -38,7 +38,7 @@ mailing list whenever I have time. You can subscribe to the mailing list at <http://tug.org/mailman/listinfo/persiantex> -Current version release date: 2018/10/04 +Current version release date: 2018/10/08 ___________________ Vafa Khalighi diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf Binary files differindex c368bb92b51..4fc993ddb39 100644 --- a/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf +++ b/Master/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf Binary files differindex 64b71adea21..268d012c9ed 100644 --- a/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf +++ b/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx index d750b72e360..859936cd78b 100644 --- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx +++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx @@ -19,7 +19,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run * * Copyright (c) 2009--2018 Vafa Khalighi * -* v34.4, 2018/10/04 +* v34.6, 2018/10/08 * * License: LaTeX Project Public License, version * 1.3c or higher (your choice) diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx index 20b8cb2dc38..951f1075422 100644 --- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx +++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx @@ -3,7 +3,7 @@ \begin{document} \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\ \LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt] -\large User documentation for \textcolor{blue!65!black}{version 34.4}} +\large User documentation for \textcolor{blue!65!black}{version 34.6}} \author{Vafa Khalighi\\ \url{persian-tex@tug.org}} \setcounter{page}{0} @@ -14,7 +14,7 @@ \textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} \Large -User documentation for \textcolor{blue!65!black}{version 34.4}} +User documentation for \textcolor{blue!65!black}{version 34.6}} \vskip 0pt plus 3fill \textit{\large to my Master, \textbf{Ferdowsi The Great}} diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx index a2d2880e482..304988433ad 100644 --- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx +++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx @@ -1,7 +1,7 @@ \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={User documentation for version 34.4 of the bidi + pdftitle={User documentation for version 34.6 of the bidi package}% } \begin{document} diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx index ceee92003db..78a15bfd96e 100644 --- a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx +++ b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx @@ -5,7 +5,7 @@ %<*readme> ___________________ The bidi package -v34.4 +v34.6 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -44,7 +44,7 @@ mailing list whenever I have time. You can subscribe to the mailing list at <http://tug.org/mailman/listinfo/persiantex> -Current version release date: 2018/10/04 +Current version release date: 2018/10/08 ___________________ Vafa Khalighi @@ -242,7 +242,7 @@ by Vafa Khalighi. \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={Source documentation for version 34.4 of the bidi + pdftitle={Source documentation for version 34.6 of the bidi package}% } \EnableCrossrefs @@ -261,7 +261,7 @@ by Vafa Khalighi. % \GetFileInfo{\jobname.dtx} % \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\ %\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt] -%\large Source documentation for \textcolor{blue!65!black}{version 34.4}} +%\large Source documentation for \textcolor{blue!65!black}{version 34.6}} % \author{Vafa Khalighi\\ % \url{persian-tex@tug.org}} %\setcounter{page}{0} @@ -272,7 +272,7 @@ by Vafa Khalighi. %\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} % %\Large -%Source documentation for \textcolor{blue!65!black}{version 34.4}} +%Source documentation for \textcolor{blue!65!black}{version 34.6}} % %\vskip 0pt plus 3fill %\textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -338,7 +338,7 @@ by Vafa Khalighi. %\iffalse %<*table> %\fi -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -1951,8 +1951,8 @@ by Vafa Khalighi. % \section{File \texttt{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2018/10/04} -\def\bidi@version{34.4} +\def\bididate{2018/10/08} +\def\bidi@version{34.6} \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space Bidirectional typesetting in plain TeX and LaTeX] \edef\@bidi@info{****************************************************^^J% @@ -2016,6 +2016,7 @@ Bidirectional typesetting in plain TeX and LaTeX] \newcommand*{\setnonlatin}{\@nonlatintrue} \eqnewif{\if@RTLtab}{\if@tab@rl} \newif\if@hboxRconstruct +\newif\if@bidi@pdfencrypt \newcommand*{\setRTLtable}{\@RTLtabtrue} \newcommand*{\setLTRtable}{\@RTLtabfalse} \newif\if@bidi@pdfm@mark @@ -2024,7 +2025,6 @@ Bidirectional typesetting in plain TeX and LaTeX] \newif\if@LTRbibitems \newif\if@RTLbibitems \newif\if@extrafootnotefeatures -\newif\if@parafootRTL \newif\if@RTLcolumnfootnotes \eqnewif{\if@RTL@footnote}{\if@rl@footnote} \newif\if@bidi@list@minipage@parbox @@ -2037,7 +2037,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \newcommand*{\@bidi@pdfcustomproperties}{% This is the bidi package, Version \bidi@version, - Released October 1, 2018. + Released October 8, 2018. } \@RTLmainfalse \AtBeginDocument{% @@ -2237,12 +2237,23 @@ Bidirectional typesetting in plain TeX and LaTeX] \RequirePackage{bidi-perpage}% \ResetCounterPerPage{footnote}% \fi - \special{pdf:encrypt - userpw (\bidi@pdfencrypt@userpassword) - ownerpw (\bidi@pdfencrypt@ownerpassword) - length \bidi@pdfencrypt@keylength - perm \bidi@pdfencrypt@permissionflags - }% + \ifx\bidi@pdfencrypt@ownerpassword\bidi@empty + \ifx\bidi@pdfencrypt@userpassword\bidi@empty + \@bidi@pdfencryptfalse + \else + \@bidi@pdfencrypttrue + \fi + \else + \@bidi@pdfencrypttrue + \fi + \if@bidi@pdfencrypt + \special{pdf:encrypt + userpw (\bidi@pdfencrypt@userpassword) + ownerpw (\bidi@pdfencrypt@ownerpassword) + length \bidi@pdfencrypt@keylength + perm \bidi@pdfencrypt@permissionflags + }% + \fi } \AtEndDocument{% \special{pdf:% @@ -2265,9 +2276,9 @@ Bidirectional typesetting in plain TeX and LaTeX] %\fi % \section{File \texttt{bidi.tex}} % \begin{macrocode} -\def\bididate{2018/10/04} +\def\bididate{2018/10/08} \catcode`@=11 -\def\bidi@version{34.4} +\def\bidi@version{34.6} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -2366,7 +2377,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \def\@bidi@pdfcustomproperties{% This is the bidi package, Version \bidi@version, - Released October 1, 2018. + Released October 8, 2018. } \def\bidi@pdfm@mark{% \special{pdf:% @@ -9534,7 +9545,9 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{extrafootnotefeatures-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/09/27 v1.4 bidi extra footnote features for XeTeX engine] +\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/10/08 v1.6 bidi extra footnote features for XeTeX engine] +\newif\if@bidi@void@footins +\newif\if@bidi@void@@mpfootins \newcommand*{\@bidi@before@Hy@hyperfootnotes}{% \if@bidi@csundef{ifHy@hyperfootnotes}{}{% \if@bidi@csundef{HLTR@@LTRfootnotetext}{}{% @@ -9576,8 +9589,28 @@ bidi implementation of tufte title] \let\LRfootnoterule\relax \def\footnoterule{\kern-3\p@ \hrule \@width \columnwidth \kern 2.6\p@} -\bidi@ensure@newcommand{\setRTLparagraphfootnotes}{\@parafootRTLtrue} -\bidi@ensure@newcommand{\setLTRparagraphfootnotes}{\@parafootRTLfalse} +\newcommand{\@preamnormalfmt}{% + \parindent 1em% + \noindent +} +\newcommand{\@normalfootfmt}[1]{% + \@preamnormalfmt + \footfootmark + \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% + \@finalstrut\strutbox +} +\newcommand{\@normalRTLfootfmt}[1]{% + \@preamnormalfmt + \RTLfootfootmark + \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% + \@finalstrut\strutbox +} +\newcommand{\@normalLTRfootfmt}[1]{% + \@preamnormalfmt + \LTRfootfootmark + \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% + \@finalstrut\strutbox +} \renewcommand{\@footnotetext}[1]{% \insert\footins{% \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% @@ -9589,9 +9622,7 @@ bidi implementation of tufte title] \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% - \@finalstrut\strutbox}% + \@normalfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} \renewcommand{\@RTLfootnotetext}[1]{% @@ -9605,9 +9636,7 @@ bidi implementation of tufte title] \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} \renewcommand{\@LTRfootnotetext}[1]{% @@ -9621,49 +9650,41 @@ bidi implementation of tufte title] \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalLTRfootfmt{#1}% \color@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}% + \reset@font% \foottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \reset@font% - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% - \@finalstrut\strutbox}% + \@normalfootfmt{#1}% \color@endgroup}} \renewcommand{\@mpLTRfootnotetext}[1]{% \global\setbox\@mpfootins\vbox{\@RTLfalse% \unvbox\@mpfootins \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font% \LTRfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \reset@font% - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalLTRfootfmt{#1}% \color@endgroup}} \renewcommand{\@mpRTLfootnotetext}[1]{% \global\setbox\@mpfootins\vbox{\@RTLtrue% \unvbox\@mpfootins \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font% \RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \reset@font% - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalRTLfootfmt{#1}% \color@endgroup}} \let\m@mold@footnotetext\@footnotetext \let\m@mold@LTRfootnotetext\@LTRfootnotetext @@ -9679,7 +9700,9 @@ bidi implementation of tufte title] \let\@mpfootnotetext\m@mold@mpfootnotetext \let\@mpLTRfootnotetext\m@mold@mpLTRfootnotetext \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext - \@bidi@after@Hy@hyperfootnotes} + \@bidi@after@Hy@hyperfootnotes + \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth +} \@ifclassloaded{memoir}{\let\plainfootnotes\normalfootnotes}{} \bidi@ensure@newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue} \bidi@ensure@newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse} @@ -9742,12 +9765,27 @@ bidi implementation of tufte title] \newcommand*{\bidi@star@footmarkwidth}{% \setlength{\footmarkwidth}{0em plus.4em minus.4em}% } +\bidi@normal@footmarkwidth \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 + \ifvoid\footinsv@r + \ifvoid\footinsv@l + \else + \@footstartv@l + \@LTRfootgroupv@l + \fi + \else + \@footstartv@r + \@footgroupv@r + \ifvoid\footinsv@l + \else + \@@footstart@@v@l + \@LTRfootgroupv@l + \fi + \fi \ifvoid\@bidi@copyins@ \else \vskip \skip\@bidi@copyins@ @@ -9772,9 +9810,28 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@mdoextrafeetmini}{% \extrafeetminihook} \bidi@ensure@newcommand{\extrafeetendmini}{% - \ifvoid\@mpfootinsv@r\else + \ifvoid\@mpfootinsv@r + \ifvoid\@mpfootinsv@l + \else + \vskip\skip\@mpfootins + \normalcolor + \if@bidi@void@@mpfootins + \footnoterule + \fi + \mp@LTRfootgroupv@l + \fi + \else \vskip\skip\@mpfootins - \normalcolor\footnoterule\mp@footgroupv@r + \normalcolor + \if@bidi@void@@mpfootins + \footnoterule + \fi + \mp@footgroupv@r + \ifvoid\@mpfootinsv@l + \else + \vskip\skip\@mpfootins + \normalcolor\mp@LTRfootgroupv@l + \fi \fi \extrafeetendminihook} \bidi@ensure@newcommand{\extrafeetendminihook}{} @@ -9782,7 +9839,10 @@ bidi implementation of tufte title] \def\endminipage{% \par \unskip - \ifvoid\@mpfootins\else + \ifvoid\@mpfootins + \global\@bidi@void@@mpfootinstrue + \else + \global\@bidi@void@@mpfootinsfalse \vskip\skip\@mpfootins \normalcolor \footnoterule @@ -9806,8 +9866,11 @@ bidi implementation of tufte title] \count\footinsv@r=1000 % no magnifcation \dimen\footinsv@r=\footinsdim \m@make@footstart{v@r} +\newinsert\footinsv@l +\skip\footinsv@l\bigskipamount \bidi@ensure@newcommand{\@footgroupv@r}{} \newinsert\@mpfootinsv@r +\newinsert\@mpfootinsv@l \bidi@ensure@newcommand{\mp@footgroupv@r}{} \newcount\m@m@k \newdimen\m@m@h \@ifpackageloaded{multicol}{% @@ -9924,52 +9987,6 @@ bidi implementation of tufte title] \@twocolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@twocolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@twocolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@twocolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@twocolfootfmt}[1]{% - \@namedef{@twocolfootfmt#1}##1{% - \@preamtwofmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@twocol@footgroup}[1]{% \@namedef{@twocol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -10073,51 +10090,6 @@ bidi implementation of tufte title] \color@begingroup \@threecolRTLfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@threecolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@threecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@threecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@threecolfootfmt}[1]{% -\bidi@namelongdef{@threecolfootfmt#1}##1{% - \@preamthreefmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@threecol@footgroup}[1]{% \@namedef{@threecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -10227,52 +10199,6 @@ bidi implementation of tufte title] \@fourcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@fourcolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fourcolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fourcolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@fourcolfootfmt}[1]{% - \@namedef{@fourcolfootfmt#1}##1{% - \@preamfourfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@fourcol@footgroup}[1]{% \@namedef{@fourcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -10382,52 +10308,6 @@ bidi implementation of tufte title] \@fivecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@fivecolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fivecolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fivecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@fivecolfootfmt}[1]{% - \@namedef{@fivecolfootfmt#1}##1{% - \@preamfivefmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@fivecol@footgroup}[1]{% \@namedef{@fivecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -10537,52 +10417,6 @@ bidi implementation of tufte title] \@sixcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@sixcolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sixcolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sixcolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@sixcolfootfmt}[1]{% - \@namedef{@sixcolfootfmt#1}##1{% - \@preamsixfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@sixcol@footgroup}[1]{% \@namedef{@sixcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -10692,52 +10526,6 @@ bidi implementation of tufte title] \@sevencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@sevencolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sevencolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sevencolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@sevencolfootfmt}[1]{% - \@namedef{@sevencolfootfmt#1}##1{% - \@preamsevenfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@sevencol@footgroup}[1]{% \@namedef{@sevencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -10847,52 +10635,6 @@ bidi implementation of tufte title] \@eightcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@eightcolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@eightcolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@eightcolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@eightcolfootfmt}[1]{% - \@namedef{@eightcolfootfmt#1}##1{% - \@preameightfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@eightcol@footgroup}[1]{% \@namedef{@eightcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -11002,52 +10744,6 @@ bidi implementation of tufte title] \@ninecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@ninecolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@ninecolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@ninecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@ninecolfootfmt}[1]{% - \@namedef{@ninecolfootfmt#1}##1{% - \@preamninefmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@ninecol@footgroup}[1]{% \@namedef{@ninecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -11157,52 +10853,6 @@ bidi implementation of tufte title] \@tencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@tencolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@tencolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@tencolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@tencolfootfmt}[1]{% - \@namedef{@tencolfootfmt#1}##1{% - \@preamtenfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@tencol@footgroup}[1]{% \@namedef{@tencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -11233,7 +10883,6 @@ bidi implementation of tufte title] \m@minterparanoteglue{1em plus.4em minus.4em} \@ifpackageloaded{multicol}{% \bidi@ensure@newcommand*{\m@mmakehboxofhboxes}{% - \if@parafootRTL\@RTLtrue\else\@RTLfalse\fi% \hsize\textwidth% \setbox0=\hbox{}% \loop @@ -11244,7 +10893,6 @@ bidi implementation of tufte title] \repeat} }{% \bidi@ensure@newcommand*{\m@mmakehboxofhboxes}{% - \if@parafootRTL\@RTLtrue\else\@RTLfalse\fi% \setbox0=\hbox{}% \loop \unpenalty @@ -11277,12 +10925,84 @@ bidi implementation of tufte title] \m@make@para@footstart{v@r}% \let\@footgroupv@r\@para@footgroupv@r \let\@footstartv@r\@para@footstartv@r + \dimen\footinsv@l=\footinsdim + \count\footinsv@l=1000\relax + \bidi@make@para@LTRfootgroup{v@l}% + \m@make@para@footstart{v@l}% + \bidi@make@para@footstart@@{v@l}% + \let\@LTRfootgroupv@l\@para@LTRfootgroupv@l + \let\@footstartv@l\@para@footstartv@l + \let\@@footstart@@v@l\@@para@footstart@@v@l \let\@mpfootnotetext\@mpparafootnotetext \let\@mpLTRfootnotetext\@mpparaLTRfootnotetext \let\@mpRTLfootnotetext\@mpparaRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mppara@footgroup{v@r}% + \bidi@make@mppara@LTRfootgroup{v@l}% + \let\mp@footgroupv@r\@mppara@footgroupv@r + \let\mp@LTRfootgroupv@l\@mppara@LTRfootgroupv@l + \begingroup + \def\baselinestretch{\m@m@footnote@spacing}% + \foottextfont + \@tempdima\footnotesep + \advance\@tempdima -\ht\strutbox + \ifdim\@tempdima<\z@ \@tempdima\z@ \fi + \advance\@tempdima.5\normalbaselineskip + \bidi@xparaskip + \xdef\bidi@paraskip{\the\@tempdima\relax}% + \ifdim\skip\footinsv@r>\bigskipamount + \else + \global\advance\skip\footinsv@r\bidi@paraskip + \fi + \ifdim\skip\footinsv@l>\bigskipamount + \else + \global\advance\skip\footinsv@l\bidi@paraskip + \fi + \@tempdima\normalbaselineskip + \multiply \@tempdima \@cclvi + \@tempdimb \columnwidth + \divide \@tempdimb \@cclvi + \divide \@tempdima \@tempdimb + \xdef\footfudgefactor{\strip@pt\@tempdima}% + \endgroup + \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth +} +\newcommand{\normalRTLparaLTRfootnotes}{% + \@namedef{foottextfontv@r}{\foottextfont}% + \@bidi@before@Hy@hyperfootnotes + \if@RTL@footnote + \let\@footnotetext\m@mold@footnotetext + \else + \let\@footnotetext\@parafootnotetext + \fi + \let\@LTRfootnotetext\@paraLTRfootnotetext + \let\@RTLfootnotetext\m@mold@RTLfootnotetext + \dimen\footinsv@r=\footinsdim + \count\footinsv@r=1000\relax + \m@make@para@footgroup{v@r}% + \m@make@para@footstart{v@r}% + \let\@footgroupv@r\@para@footgroupv@r + \let\@footstartv@r\@para@footstartv@r + \dimen\footinsv@l=\footinsdim + \count\footinsv@l=1000\relax + \bidi@make@para@LTRfootgroup{v@l}% + \m@make@para@footstart{v@l}% + \bidi@make@para@footstart@@{v@l}% + \let\@LTRfootgroupv@l\@para@LTRfootgroupv@l + \let\@footstartv@l\@para@footstartv@l + \let\@@footstart@@v@l\@@para@footstart@@v@l + \if@RTL@footnote + \let\@mpfootnotetext\m@mold@mpfootnotetext + \else + \let\@mpfootnotetext\@mpparafootnotetext + \fi + \let\@mpLTRfootnotetext\@mpparaLTRfootnotetext + \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext + \@bidi@after@Hy@hyperfootnotes + \m@make@mppara@footgroup{v@r}% + \bidi@make@mppara@LTRfootgroup{v@l}% \let\mp@footgroupv@r\@mppara@footgroupv@r + \let\mp@LTRfootgroupv@l\@mppara@LTRfootgroupv@l \begingroup \def\baselinestretch{\m@m@footnote@spacing}% \foottextfont @@ -11296,6 +11016,10 @@ bidi implementation of tufte title] \else \global\advance\skip\footinsv@r\bidi@paraskip \fi + \ifdim\skip\footinsv@l>\bigskipamount + \else + \global\advance\skip\footinsv@l\bidi@paraskip + \fi \@tempdima\normalbaselineskip \multiply \@tempdima \@cclvi \@tempdimb \columnwidth @@ -11307,7 +11031,13 @@ bidi implementation of tufte title] } \let\bidi@xparaskip\relax \@onlypreamble\AddExtraParaSkip -\bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{% +\bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi + {% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont @@ -11316,10 +11046,10 @@ bidi implementation of tufte title] \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% + \noindent \@parafootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\bidi@ensure@newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@r{% +\bidi@ensure@newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@l{% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont @@ -11328,7 +11058,7 @@ bidi implementation of tufte title] \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraLTRfootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@paraRTLfootnotetext}[1]{\insert\footinsv@r{% @@ -11340,7 +11070,7 @@ bidi implementation of tufte title] \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraRTLfootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@parafootfmt}[1]{% @@ -11356,31 +11086,42 @@ bidi implementation of tufte title] \parfillskip=0pt \@plus 1fil {\RTLfootfootmark\strut {\RTLfoottextfont #1}\penalty-10}} \bidi@ensure@newcommand{\@mpparafootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{% + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% - \unvbox\@mpfootinsv@r + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \reset@font\foottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% + \noindent \@parafootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@mpparaLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{% + \global\setbox\@mpfootinsv@l\vbox{% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% - \unvbox\@mpfootinsv@r + \unvbox\@mpfootinsv@l \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraLTRfootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@mpparaRTLfootnotetext}[1]{% @@ -11394,83 +11135,23 @@ bidi implementation of tufte title] \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraRTLfootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@parafootnotetext#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}}% - \@namedef{@footstart#1}{\@nameuse{@para@footstart#1}}% - \expandafter\dimen\csname footins#1\endcsname=\footinsdim - \expandafter\count\csname footins#1\endcsname=1000\relax - \begingroup - \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1}% - \@tempdima\footnotesep - \advance\@tempdima -\ht\strutbox - \ifdim\@tempdima<\z@ \@tempdima\z@ \fi - \advance\@tempdima.5\normalbaselineskip - \bidi@xparaskip - \xdef\bidi@paraskip{\the\@tempdima\relax}% - \ifdim\skip\@nameuse{footins#1}>\bigskipamount - \else - \global\advance\skip\@nameuse{footins#1}\bidi@paraskip - \fi - \@tempdima\normalbaselineskip - \multiply \@tempdima \@cclvi - \@tempdimb \columnwidth - \divide \@tempdimb \@cclvi - \divide \@tempdima \@tempdimb - \xdef\footfudgefactor{\strip@pt\@tempdima}% - \endgroup - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \setbox0=\vbox{\hsize=\maxdimen - \color@begingroup - \noindent \@nameuse{@parafootfmt#1}{##1}% - \color@endgroup}% - \m@mungebox}\m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \setbox0=\vbox{\hsize=\maxdimen - \color@begingroup - \noindent \@nameuse{@parafootfmt#1}{##1}% - \color@endgroup}% - \m@mungebox}\m@mmf@prepare}} -\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}}} \bidi@ensure@newcommand{\m@make@para@footgroup}[1]{% \@namedef{@para@footgroup#1}{% \unvbox\@nameuse{footins#1} + \@RTLtrue + \m@mmakehboxofhboxes + \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% + \@parboxrestore% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1}% + \noindent\unhbox0\par}} +\bidi@ensure@newcommand{\bidi@make@para@LTRfootgroup}[1]{% +\@namedef{@para@LTRfootgroup#1}{% + \unvbox\@nameuse{footins#1} + \@RTLfalse \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \@parboxrestore% @@ -11480,6 +11161,16 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@mppara@footgroup}[1]{% \@namedef{@mppara@footgroup#1}{% \unvbox\@nameuse{@mpfootins#1} + \@RTLtrue + \m@mmakehboxofhboxes + \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1}% + \noindent\unhbox0\par}} +\bidi@ensure@newcommand{\bidi@make@mppara@LTRfootgroup}[1]{% +\@namedef{@mppara@LTRfootgroup#1}{% + \unvbox\@nameuse{@mpfootins#1} + \@RTLfalse \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \def\baselinestretch{\m@m@footnote@spacing}% @@ -11492,7 +11183,16 @@ bidi implementation of tufte title] \rightskip=\z@ \parindent=\z@ \vskip\skip\footins - \footnoterule}} + \if@bidi@void@footins + \footnoterule + \fi}} +\bidi@ensure@newcommand{\bidi@make@para@footstart@@}[1]{% +\@namedef{@@para@footstart@@#1}{% + \bidi@mopfn@bottom + \leftskip=\z@ + \rightskip=\z@ + \parindent=\z@ + \vskip\skip\footins}} \bidi@ensure@newcommand*{\m@m@makecolfloats}{% \xdef\@freelist{\@freelist\@midlist}% \global\let\@midlist\@empty @@ -11521,32 +11221,8 @@ bidi implementation of tufte title] \footnoterule \unvbox \footins \color@endgroup - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - \fi - }} -\newcommand*{\bidi@mopcopyins}{\setbox\@outputbox \vbox{% - \boxmaxdepth\@maxdepth - \@tempdima\dp\@cclv - \unvbox\@cclv - \vskip-\@tempdima - \bidi@mopfn@bottom - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - }} + }% +} \newcommand*{\bidi@mopfootnotebf}{% \setbox\@outputbox \vbox{% \boxmaxdepth\@maxdepth @@ -11558,44 +11234,15 @@ bidi implementation of tufte title] \footnoterule \unvbox \footins \color@endgroup - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - \fi - }} -\newcommand*{\bidi@mopcopyinsbf}{% - \setbox\@outputbox \vbox{% - \boxmaxdepth\@maxdepth - \unvbox\@outputbox - \bidi@mopfn@bottom - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - }} + }% +} \gdef\mem@makecol{% \m@m@makecolintro \ifvoid\footins - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \setbox\@outputbox \box\@cclv - \else - \bidi@mopcopyins - \fi - \else - \setbox\@outputbox \box\@cclv - \fi + \global\@bidi@void@footinstrue + \setbox\@outputbox \box\@cclv \else + \global\@bidi@void@footinsfalse \m@mopfootnote \fi \m@mdoextrafeet @@ -11607,13 +11254,9 @@ bidi implementation of tufte title] \setbox\@outputbox \box\@cclv \m@m@makecolfloats \ifvoid\footins - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \else - \bidi@mopcopyinsbf - \fi - \fi + \global\@bidi@void@footinstrue \else + \global\@bidi@void@footinsfalse \bidi@mopfootnotebf \fi \m@mdoextrafeet @@ -16048,7 +15691,7 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{multicol-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{multicol-xetex-bidi.def}[2018/09/26 v1.0 bidi adaptations for multicol package for XeTeX engine] +\ProvidesFile{multicol-xetex-bidi.def}[2018/10/07 v1.1 bidi adaptations for multicol package for XeTeX engine] \def\page@sofar{% \process@cols\mult@rightbox {\ifvoid\count@ @@ -16133,7 +15776,7 @@ bidi implementation of tufte title] \newcommand\bidi@multicol@align@columns {\if@RTLmain\RTL@column@boxes\else\LTR@column@boxes\fi} \bidi@AtEndPreamble{% - \if@bidi@csdef{footinsv@r}{% + \if@bidi@csdef{footinsv@l}{% \def\footnoterule{\kern-3\p@ \hrule \@width \textwidth \kern 2.6\p@}% }{}% @@ -16189,28 +15832,49 @@ bidi implementation of tufte title] \advance\dimen@-\ht\@bidi@copyins@ } \bidi@AtEndPreamble{% - \if@bidi@csdef{footinsv@r}{% + \if@bidi@csdef{footinsv@l}{% \def\bidi@leave@mult@footins@vr{% \advance\dimen@-\skip\footinsv@r \advance\dimen@-\ht\footinsv@r }% + \def\bidi@leave@mult@footins@vl{% + \advance\dimen@-\skip\footinsv@l + \advance\dimen@-\ht\footinsv@l + }% \def\bidi@init@mult@footinsv@r{% \multiply\count\footinsv@r\col@number \multiply\skip \footinsv@r\col@number }% + \def\bidi@init@mult@footinsv@l{% + \multiply\count\footinsv@l\col@number + \multiply\skip \footinsv@l\col@number + }% \def\bidi@reinsert@footnotesv@r{\ifvoid\footinsv@r\else \insert\footinsv@r{}\fi}% + \def\bidi@reinsert@footnotesv@l{\ifvoid\footinsv@l\else + \insert\footinsv@l{}\fi}% \bidi@patchcmd{\prepare@multicols}{% \reinsert@footnotes }{% \reinsert@footnotes \bidi@init@mult@footinsv@r \bidi@reinsert@footnotesv@r + \bidi@init@mult@footinsv@l + \bidi@reinsert@footnotesv@l }{}{}% \bidi@patchcmd{\multi@column@out}{% \ifnum \c@tracingmulticols>\thr@@ }{% - \ifvoid\footinsv@r\else + \ifvoid\footinsv@r + \ifvoid\footinsv@l + \else + \PackageWarning{multicol}% + {I moved some lines to + the next page.\MessageBreak + Footnotes on page + \thepage\space might be wrong}% + \fi + \else \PackageWarning{multicol}% {I moved some lines to the next page.\MessageBreak @@ -16224,28 +15888,35 @@ bidi implementation of tufte title] }{% \reinsert@footnotes \bidi@reinsert@footnotesv@r + \bidi@reinsert@footnotesv@l }{}{}% \bidi@patchcmd{\speci@ls}{% \reinsert@footnotes }{% \reinsert@footnotes \bidi@reinsert@footnotesv@r + \bidi@reinsert@footnotesv@l }{}{}% \bidi@patchcmd{\speci@ls}{% \reinsert@footnotes }{% \reinsert@footnotes \bidi@reinsert@footnotesv@r + \bidi@reinsert@footnotesv@l }{}{}% }{}% \bidi@patchcmd{\multi@column@out}{% \let\ifshr@kingsaved\ifshr@king }{% - \if@bidi@csdef{footinsv@r}{% + \if@bidi@csdef{footinsv@l}{% \divide\skip\footinsv@r\col@number \ifvoid\footinsv@r \else \bidi@leave@mult@footins@vr \fi + \divide\skip\footinsv@l\col@number + \ifvoid\footinsv@l \else + \bidi@leave@mult@footins@vl + \fi }{}% \ifvoid\@bidi@copyins@ \else \bidi@leave@mult@copyins diff --git a/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def index b74d1468eb1..63304290a99 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def index f8d224084d4..7e0b64477ab 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def index c6c843c3d2c..76eaf57238c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def index c2195bdbc66..a5bebb47bcb 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def index 307d35f2b7a..e33d96b7199 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def index 9845e777442..8ad2e482300 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def index bbf3723e5bb..69bdc5655b5 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def index 87167b4d617..0879cd413dd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def index 623b6c8db47..19e02641b87 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def index 06a5f9e7799..829e57c706a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def index 6d4ea99c966..2fc9171a511 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def index 938880d37bc..9bce99f1d7f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def index 4e922ce7c60..d448d739c02 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty index 360bbf7b6f9..f5569efad82 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty index a32588a6666..8e0a43675e8 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty index 56de61fe27b..b9f3d695d1f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -35,8 +35,8 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\def\bididate{2018/10/04} -\def\bidi@version{34.4} +\def\bididate{2018/10/08} +\def\bidi@version{34.6} \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space Bidirectional typesetting in plain TeX and LaTeX] \edef\@bidi@info{****************************************************^^J% @@ -100,6 +100,7 @@ Bidirectional typesetting in plain TeX and LaTeX] \newcommand*{\setnonlatin}{\@nonlatintrue} \eqnewif{\if@RTLtab}{\if@tab@rl} \newif\if@hboxRconstruct +\newif\if@bidi@pdfencrypt \newcommand*{\setRTLtable}{\@RTLtabtrue} \newcommand*{\setLTRtable}{\@RTLtabfalse} \newif\if@bidi@pdfm@mark @@ -108,7 +109,6 @@ Bidirectional typesetting in plain TeX and LaTeX] \newif\if@LTRbibitems \newif\if@RTLbibitems \newif\if@extrafootnotefeatures -\newif\if@parafootRTL \newif\if@RTLcolumnfootnotes \eqnewif{\if@RTL@footnote}{\if@rl@footnote} \newif\if@bidi@list@minipage@parbox @@ -121,7 +121,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \newcommand*{\@bidi@pdfcustomproperties}{% This is the bidi package, Version \bidi@version, - Released October 1, 2018. + Released October 8, 2018. } \@RTLmainfalse \AtBeginDocument{% @@ -321,12 +321,23 @@ Bidirectional typesetting in plain TeX and LaTeX] \RequirePackage{bidi-perpage}% \ResetCounterPerPage{footnote}% \fi - \special{pdf:encrypt - userpw (\bidi@pdfencrypt@userpassword) - ownerpw (\bidi@pdfencrypt@ownerpassword) - length \bidi@pdfencrypt@keylength - perm \bidi@pdfencrypt@permissionflags - }% + \ifx\bidi@pdfencrypt@ownerpassword\bidi@empty + \ifx\bidi@pdfencrypt@userpassword\bidi@empty + \@bidi@pdfencryptfalse + \else + \@bidi@pdfencrypttrue + \fi + \else + \@bidi@pdfencrypttrue + \fi + \if@bidi@pdfencrypt + \special{pdf:encrypt + userpw (\bidi@pdfencrypt@userpassword) + ownerpw (\bidi@pdfencrypt@ownerpassword) + length \bidi@pdfencrypt@keylength + perm \bidi@pdfencrypt@permissionflags + }% + \fi } \AtEndDocument{% \special{pdf:% diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.tex b/Master/texmf-dist/tex/xelatex/bidi/bidi.tex index 341a71a4637..27123bd3c15 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi.tex +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.tex @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -34,9 +34,9 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\def\bididate{2018/10/04} +\def\bididate{2018/10/08} \catcode`@=11 -\def\bidi@version{34.4} +\def\bidi@version{34.6} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -135,7 +135,7 @@ } \def\@bidi@pdfcustomproperties{% This is the bidi package, Version \bidi@version, - Released October 1, 2018. + Released October 8, 2018. } \def\bidi@pdfm@mark{% \special{pdf:% diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty index 59d91a75657..4af9e39809a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty index 38cfbbc2f4b..6bb55295018 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty index 8ba2086a572..72e2256553f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls index 7b997797239..6eb3a637201 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls +++ b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty index 03591632c14..87d0a21e879 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditools.sty b/Master/texmf-dist/tex/xelatex/bidi/biditools.sty index a6e8554854a..f1fca65ee94 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/biditools.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/biditools.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls b/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls index 1684abf8f9c..34140386e19 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls +++ b/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls b/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls index 516013df370..fbe772ff60f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls +++ b/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty index 84d67eae629..06ae9740cba 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty index 08acd872bee..e2468692857 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty index 2b868004a88..07f69e7c984 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty index 87e9dbaa935..4e272098519 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty index b92f0a8e2b3..2ac7ac8a14d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty index f1478acd640..ef5b4bf4cf2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def index f64427c41cd..ee16687cebf 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def index 514e2b5c435..1dcb2e428a6 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def index 36f6f365002..7bf6c64dac9 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def index 2d44356907f..c718a241077 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def index 5911dcdcdf7..a092bf1f8e4 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def index 509e1952428..bee72f18037 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def index 23b88b4894f..03fb3ce9192 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def index 8cc964f7ddb..2f8b661751a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def index 247706cd597..858ab7f5a30 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def index 4c7f8ef4c34..0259091d308 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def index 2a53e6e9d98..b6155821471 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def index d206772d3ad..858ad918438 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def index 90d3f529383..1cbe5883b9e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def index a03e93a32b9..6bb796d7526 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty index 27d1387c4b0..f858174692c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty index 3d811cdb1c4..a7c16687529 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def index 3303f13eac3..3e4e27a18e4 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def index 6dc4b96e512..0ecf9c225ff 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def index 9cedc5403ee..4258f0e34cd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def index a1225ffc321..f8c7f557ff0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def index f78ede41f11..29ccbe31da8 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def index 2cdb6794971..cda1d21c6b9 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def index 0df5a8180a6..b0ecf9b66e2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def index fb47f42eded..b0ce807f353 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def index 2ef105719e2..b5f9c883bd4 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -34,7 +34,9 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/09/27 v1.4 bidi extra footnote features for XeTeX engine] +\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/10/08 v1.6 bidi extra footnote features for XeTeX engine] +\newif\if@bidi@void@footins +\newif\if@bidi@void@@mpfootins \newcommand*{\@bidi@before@Hy@hyperfootnotes}{% \if@bidi@csundef{ifHy@hyperfootnotes}{}{% \if@bidi@csundef{HLTR@@LTRfootnotetext}{}{% @@ -76,8 +78,28 @@ \let\LRfootnoterule\relax \def\footnoterule{\kern-3\p@ \hrule \@width \columnwidth \kern 2.6\p@} -\bidi@ensure@newcommand{\setRTLparagraphfootnotes}{\@parafootRTLtrue} -\bidi@ensure@newcommand{\setLTRparagraphfootnotes}{\@parafootRTLfalse} +\newcommand{\@preamnormalfmt}{% + \parindent 1em% + \noindent +} +\newcommand{\@normalfootfmt}[1]{% + \@preamnormalfmt + \footfootmark + \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% + \@finalstrut\strutbox +} +\newcommand{\@normalRTLfootfmt}[1]{% + \@preamnormalfmt + \RTLfootfootmark + \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% + \@finalstrut\strutbox +} +\newcommand{\@normalLTRfootfmt}[1]{% + \@preamnormalfmt + \LTRfootfootmark + \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% + \@finalstrut\strutbox +} \renewcommand{\@footnotetext}[1]{% \insert\footins{% \if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% @@ -89,9 +111,7 @@ \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% - \@finalstrut\strutbox}% + \@normalfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} \renewcommand{\@RTLfootnotetext}[1]{% @@ -105,9 +125,7 @@ \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} \renewcommand{\@LTRfootnotetext}[1]{% @@ -121,49 +139,41 @@ \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark}% \color@begingroup - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalLTRfootfmt{#1}% \color@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}% + \reset@font% \foottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \reset@font% - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% - \@finalstrut\strutbox}% + \@normalfootfmt{#1}% \color@endgroup}} \renewcommand{\@mpLTRfootnotetext}[1]{% \global\setbox\@mpfootins\vbox{\@RTLfalse% \unvbox\@mpfootins \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font% \LTRfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \reset@font% - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\LTRfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalLTRfootfmt{#1}% \color@endgroup}} \renewcommand{\@mpRTLfootnotetext}[1]{% \global\setbox\@mpfootins\vbox{\@RTLtrue% \unvbox\@mpfootins \def\baselinestretch{\m@m@footnote@spacing}% + \reset@font% \RTLfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup - \reset@font% - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\RTLfoottextfont #1}% - \@finalstrut\strutbox}% + \@normalRTLfootfmt{#1}% \color@endgroup}} \let\m@mold@footnotetext\@footnotetext \let\m@mold@LTRfootnotetext\@LTRfootnotetext @@ -179,7 +189,9 @@ \let\@mpfootnotetext\m@mold@mpfootnotetext \let\@mpLTRfootnotetext\m@mold@mpLTRfootnotetext \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext - \@bidi@after@Hy@hyperfootnotes} + \@bidi@after@Hy@hyperfootnotes + \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth +} \@ifclassloaded{memoir}{\let\plainfootnotes\normalfootnotes}{} \bidi@ensure@newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue} \bidi@ensure@newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse} @@ -242,12 +254,27 @@ \newcommand*{\bidi@star@footmarkwidth}{% \setlength{\footmarkwidth}{0em plus.4em minus.4em}% } +\bidi@normal@footmarkwidth \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 + \ifvoid\footinsv@r + \ifvoid\footinsv@l + \else + \@footstartv@l + \@LTRfootgroupv@l + \fi + \else + \@footstartv@r + \@footgroupv@r + \ifvoid\footinsv@l + \else + \@@footstart@@v@l + \@LTRfootgroupv@l + \fi + \fi \ifvoid\@bidi@copyins@ \else \vskip \skip\@bidi@copyins@ @@ -272,9 +299,28 @@ \bidi@ensure@newcommand{\m@mdoextrafeetmini}{% \extrafeetminihook} \bidi@ensure@newcommand{\extrafeetendmini}{% - \ifvoid\@mpfootinsv@r\else + \ifvoid\@mpfootinsv@r + \ifvoid\@mpfootinsv@l + \else + \vskip\skip\@mpfootins + \normalcolor + \if@bidi@void@@mpfootins + \footnoterule + \fi + \mp@LTRfootgroupv@l + \fi + \else \vskip\skip\@mpfootins - \normalcolor\footnoterule\mp@footgroupv@r + \normalcolor + \if@bidi@void@@mpfootins + \footnoterule + \fi + \mp@footgroupv@r + \ifvoid\@mpfootinsv@l + \else + \vskip\skip\@mpfootins + \normalcolor\mp@LTRfootgroupv@l + \fi \fi \extrafeetendminihook} \bidi@ensure@newcommand{\extrafeetendminihook}{} @@ -282,7 +328,10 @@ \def\endminipage{% \par \unskip - \ifvoid\@mpfootins\else + \ifvoid\@mpfootins + \global\@bidi@void@@mpfootinstrue + \else + \global\@bidi@void@@mpfootinsfalse \vskip\skip\@mpfootins \normalcolor \footnoterule @@ -306,8 +355,11 @@ \count\footinsv@r=1000 % no magnifcation \dimen\footinsv@r=\footinsdim \m@make@footstart{v@r} +\newinsert\footinsv@l +\skip\footinsv@l\bigskipamount \bidi@ensure@newcommand{\@footgroupv@r}{} \newinsert\@mpfootinsv@r +\newinsert\@mpfootinsv@l \bidi@ensure@newcommand{\mp@footgroupv@r}{} \newcount\m@m@k \newdimen\m@m@h \@ifpackageloaded{multicol}{% @@ -424,52 +476,6 @@ \@twocolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@twocolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@twocolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@twocolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@twocolfootfmt}[1]{% - \@namedef{@twocolfootfmt#1}##1{% - \@preamtwofmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@twocol@footgroup}[1]{% \@namedef{@twocol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -573,51 +579,6 @@ \color@begingroup \@threecolRTLfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@threecolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@threecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@threecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@threecolfootfmt}[1]{% -\bidi@namelongdef{@threecolfootfmt#1}##1{% - \@preamthreefmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@threecol@footgroup}[1]{% \@namedef{@threecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -727,52 +688,6 @@ \@fourcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@fourcolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fourcolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fourcolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@fourcolfootfmt}[1]{% - \@namedef{@fourcolfootfmt#1}##1{% - \@preamfourfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@fourcol@footgroup}[1]{% \@namedef{@fourcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -882,52 +797,6 @@ \@fivecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@fivecolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fivecolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@fivecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@fivecolfootfmt}[1]{% - \@namedef{@fivecolfootfmt#1}##1{% - \@preamfivefmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@fivecol@footgroup}[1]{% \@namedef{@fivecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -1037,52 +906,6 @@ \@sixcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@sixcolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sixcolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sixcolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@sixcolfootfmt}[1]{% - \@namedef{@sixcolfootfmt#1}##1{% - \@preamsixfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@sixcol@footgroup}[1]{% \@namedef{@sixcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -1192,52 +1015,6 @@ \@sevencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@sevencolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sevencolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@sevencolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@sevencolfootfmt}[1]{% - \@namedef{@sevencolfootfmt#1}##1{% - \@preamsevenfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@sevencol@footgroup}[1]{% \@namedef{@sevencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -1347,52 +1124,6 @@ \@eightcolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@eightcolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@eightcolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@eightcolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@eightcolfootfmt}[1]{% - \@namedef{@eightcolfootfmt#1}##1{% - \@preameightfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@eightcol@footgroup}[1]{% \@namedef{@eightcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -1502,52 +1233,6 @@ \@ninecolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@ninecolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@ninecolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@ninecolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@ninecolfootfmt}[1]{% - \@namedef{@ninecolfootfmt#1}##1{% - \@preamninefmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@ninecol@footgroup}[1]{% \@namedef{@ninecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -1657,52 +1342,6 @@ \@tencolRTLfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@tencolfootnotetext#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 - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@tencolfootfmt#1}{##1}% - \color@endgroup}% - \m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \color@begingroup - \@nameuse{@tencolfootfmt#1}{##1}% - \color@endgroup}\m@mmf@prepare}} -\bidi@ensure@newcommand{\m@make@tencolfootfmt}[1]{% - \@namedef{@tencolfootfmt#1}##1{% - \@preamtenfmt - {\@nameuse{footfootmark#1}\strut - {\@nameuse{foottextfont#1}##1}\strut\par}\allowbreak}} \bidi@ensure@newcommand{\m@make@tencol@footgroup}[1]{% \@namedef{@tencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% @@ -1733,7 +1372,6 @@ \m@minterparanoteglue{1em plus.4em minus.4em} \@ifpackageloaded{multicol}{% \bidi@ensure@newcommand*{\m@mmakehboxofhboxes}{% - \if@parafootRTL\@RTLtrue\else\@RTLfalse\fi% \hsize\textwidth% \setbox0=\hbox{}% \loop @@ -1744,7 +1382,6 @@ \repeat} }{% \bidi@ensure@newcommand*{\m@mmakehboxofhboxes}{% - \if@parafootRTL\@RTLtrue\else\@RTLfalse\fi% \setbox0=\hbox{}% \loop \unpenalty @@ -1777,12 +1414,84 @@ \m@make@para@footstart{v@r}% \let\@footgroupv@r\@para@footgroupv@r \let\@footstartv@r\@para@footstartv@r + \dimen\footinsv@l=\footinsdim + \count\footinsv@l=1000\relax + \bidi@make@para@LTRfootgroup{v@l}% + \m@make@para@footstart{v@l}% + \bidi@make@para@footstart@@{v@l}% + \let\@LTRfootgroupv@l\@para@LTRfootgroupv@l + \let\@footstartv@l\@para@footstartv@l + \let\@@footstart@@v@l\@@para@footstart@@v@l \let\@mpfootnotetext\@mpparafootnotetext \let\@mpLTRfootnotetext\@mpparaLTRfootnotetext \let\@mpRTLfootnotetext\@mpparaRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mppara@footgroup{v@r}% + \bidi@make@mppara@LTRfootgroup{v@l}% + \let\mp@footgroupv@r\@mppara@footgroupv@r + \let\mp@LTRfootgroupv@l\@mppara@LTRfootgroupv@l + \begingroup + \def\baselinestretch{\m@m@footnote@spacing}% + \foottextfont + \@tempdima\footnotesep + \advance\@tempdima -\ht\strutbox + \ifdim\@tempdima<\z@ \@tempdima\z@ \fi + \advance\@tempdima.5\normalbaselineskip + \bidi@xparaskip + \xdef\bidi@paraskip{\the\@tempdima\relax}% + \ifdim\skip\footinsv@r>\bigskipamount + \else + \global\advance\skip\footinsv@r\bidi@paraskip + \fi + \ifdim\skip\footinsv@l>\bigskipamount + \else + \global\advance\skip\footinsv@l\bidi@paraskip + \fi + \@tempdima\normalbaselineskip + \multiply \@tempdima \@cclvi + \@tempdimb \columnwidth + \divide \@tempdimb \@cclvi + \divide \@tempdima \@tempdimb + \xdef\footfudgefactor{\strip@pt\@tempdima}% + \endgroup + \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth +} +\newcommand{\normalRTLparaLTRfootnotes}{% + \@namedef{foottextfontv@r}{\foottextfont}% + \@bidi@before@Hy@hyperfootnotes + \if@RTL@footnote + \let\@footnotetext\m@mold@footnotetext + \else + \let\@footnotetext\@parafootnotetext + \fi + \let\@LTRfootnotetext\@paraLTRfootnotetext + \let\@RTLfootnotetext\m@mold@RTLfootnotetext + \dimen\footinsv@r=\footinsdim + \count\footinsv@r=1000\relax + \m@make@para@footgroup{v@r}% + \m@make@para@footstart{v@r}% + \let\@footgroupv@r\@para@footgroupv@r + \let\@footstartv@r\@para@footstartv@r + \dimen\footinsv@l=\footinsdim + \count\footinsv@l=1000\relax + \bidi@make@para@LTRfootgroup{v@l}% + \m@make@para@footstart{v@l}% + \bidi@make@para@footstart@@{v@l}% + \let\@LTRfootgroupv@l\@para@LTRfootgroupv@l + \let\@footstartv@l\@para@footstartv@l + \let\@@footstart@@v@l\@@para@footstart@@v@l + \if@RTL@footnote + \let\@mpfootnotetext\m@mold@mpfootnotetext + \else + \let\@mpfootnotetext\@mpparafootnotetext + \fi + \let\@mpLTRfootnotetext\@mpparaLTRfootnotetext + \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext + \@bidi@after@Hy@hyperfootnotes + \m@make@mppara@footgroup{v@r}% + \bidi@make@mppara@LTRfootgroup{v@l}% \let\mp@footgroupv@r\@mppara@footgroupv@r + \let\mp@LTRfootgroupv@l\@mppara@LTRfootgroupv@l \begingroup \def\baselinestretch{\m@m@footnote@spacing}% \foottextfont @@ -1796,6 +1505,10 @@ \else \global\advance\skip\footinsv@r\bidi@paraskip \fi + \ifdim\skip\footinsv@l>\bigskipamount + \else + \global\advance\skip\footinsv@l\bidi@paraskip + \fi \@tempdima\normalbaselineskip \multiply \@tempdima \@cclvi \@tempdimb \columnwidth @@ -1807,7 +1520,13 @@ } \let\bidi@xparaskip\relax \@onlypreamble\AddExtraParaSkip -\bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{% +\bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi + {% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont @@ -1816,10 +1535,10 @@ \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% + \noindent \@parafootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\bidi@ensure@newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@r{% +\bidi@ensure@newcommand{\@paraLTRfootnotetext}[1]{\insert\footinsv@l{% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont @@ -1828,7 +1547,7 @@ \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraLTRfootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@paraRTLfootnotetext}[1]{\insert\footinsv@r{% @@ -1840,7 +1559,7 @@ \csname p@footnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraRTLfootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@parafootfmt}[1]{% @@ -1856,31 +1575,42 @@ \parfillskip=0pt \@plus 1fil {\RTLfootfootmark\strut {\RTLfoottextfont #1}\penalty-10}} \bidi@ensure@newcommand{\@mpparafootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{% + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% - \unvbox\@mpfootinsv@r + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \reset@font\foottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@parafootfmt{\if@RTL@footnote\beginR\else\beginL\fi#1\if@RTL@footnote\endR\else\endL\fi}% + \noindent \@parafootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@mpparaLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{% + \global\setbox\@mpfootinsv@l\vbox{% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% - \unvbox\@mpfootinsv@r + \unvbox\@mpfootinsv@l \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraLTRfootfmt{\beginL#1\endL}% + \noindent \@paraLTRfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\@mpparaRTLfootnotetext}[1]{% @@ -1894,83 +1624,23 @@ \csname p@mpfootnote\endcsname\@thefnmark}% \setbox0=\vbox{\hsize=\maxdimen \color@begingroup - \noindent \@paraRTLfootfmt{\beginR#1\endR}% + \noindent \@paraRTLfootfmt{#1}% \color@endgroup}% \m@mungebox}\m@mmf@prepare} -\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}% - \bidi@namelongdef{@footnotetext#1}##1{% - \@nameuse{@parafootnotetext#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}}% - \@namedef{@footstart#1}{\@nameuse{@para@footstart#1}}% - \expandafter\dimen\csname footins#1\endcsname=\footinsdim - \expandafter\count\csname footins#1\endcsname=1000\relax - \begingroup - \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1}% - \@tempdima\footnotesep - \advance\@tempdima -\ht\strutbox - \ifdim\@tempdima<\z@ \@tempdima\z@ \fi - \advance\@tempdima.5\normalbaselineskip - \bidi@xparaskip - \xdef\bidi@paraskip{\the\@tempdima\relax}% - \ifdim\skip\@nameuse{footins#1}>\bigskipamount - \else - \global\advance\skip\@nameuse{footins#1}\bidi@paraskip - \fi - \@tempdima\normalbaselineskip - \multiply \@tempdima \@cclvi - \@tempdimb \columnwidth - \divide \@tempdimb \@cclvi - \divide \@tempdima \@tempdimb - \xdef\footfudgefactor{\strip@pt\@tempdima}% - \endgroup - \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth -} -\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}% - \@preamfntext - \protected@edef\@currentlabel{% - \csname p@footnote#1\endcsname \@nameuse{@thefnmark#1}}% - \setbox0=\vbox{\hsize=\maxdimen - \color@begingroup - \noindent \@nameuse{@parafootfmt#1}{##1}% - \color@endgroup}% - \m@mungebox}\m@mmf@prepare}} -\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}% - \reset@font\@nameuse{foottextfont#1}% - \hsize\columnwidth \@parboxrestore - \protected@edef\@currentlabel{% - \csname p@mpfootnote#1\endcsname\@nameuse{@thefnmark#1}}% - \setbox0=\vbox{\hsize=\maxdimen - \color@begingroup - \noindent \@nameuse{@parafootfmt#1}{##1}% - \color@endgroup}% - \m@mungebox}\m@mmf@prepare}} -\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}}} \bidi@ensure@newcommand{\m@make@para@footgroup}[1]{% \@namedef{@para@footgroup#1}{% \unvbox\@nameuse{footins#1} + \@RTLtrue + \m@mmakehboxofhboxes + \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% + \@parboxrestore% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1}% + \noindent\unhbox0\par}} +\bidi@ensure@newcommand{\bidi@make@para@LTRfootgroup}[1]{% +\@namedef{@para@LTRfootgroup#1}{% + \unvbox\@nameuse{footins#1} + \@RTLfalse \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \@parboxrestore% @@ -1980,6 +1650,16 @@ \bidi@ensure@newcommand{\m@make@mppara@footgroup}[1]{% \@namedef{@mppara@footgroup#1}{% \unvbox\@nameuse{@mpfootins#1} + \@RTLtrue + \m@mmakehboxofhboxes + \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1}% + \noindent\unhbox0\par}} +\bidi@ensure@newcommand{\bidi@make@mppara@LTRfootgroup}[1]{% +\@namedef{@mppara@LTRfootgroup#1}{% + \unvbox\@nameuse{@mpfootins#1} + \@RTLfalse \m@mmakehboxofhboxes \setbox0=\hbox{\unhbox0 \m@mremovehboxes}% \def\baselinestretch{\m@m@footnote@spacing}% @@ -1992,7 +1672,16 @@ \rightskip=\z@ \parindent=\z@ \vskip\skip\footins - \footnoterule}} + \if@bidi@void@footins + \footnoterule + \fi}} +\bidi@ensure@newcommand{\bidi@make@para@footstart@@}[1]{% +\@namedef{@@para@footstart@@#1}{% + \bidi@mopfn@bottom + \leftskip=\z@ + \rightskip=\z@ + \parindent=\z@ + \vskip\skip\footins}} \bidi@ensure@newcommand*{\m@m@makecolfloats}{% \xdef\@freelist{\@freelist\@midlist}% \global\let\@midlist\@empty @@ -2021,32 +1710,8 @@ \footnoterule \unvbox \footins \color@endgroup - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - \fi - }} -\newcommand*{\bidi@mopcopyins}{\setbox\@outputbox \vbox{% - \boxmaxdepth\@maxdepth - \@tempdima\dp\@cclv - \unvbox\@cclv - \vskip-\@tempdima - \bidi@mopfn@bottom - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - }} + }% +} \newcommand*{\bidi@mopfootnotebf}{% \setbox\@outputbox \vbox{% \boxmaxdepth\@maxdepth @@ -2058,44 +1723,15 @@ \footnoterule \unvbox \footins \color@endgroup - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - \fi - }} -\newcommand*{\bidi@mopcopyinsbf}{% - \setbox\@outputbox \vbox{% - \boxmaxdepth\@maxdepth - \unvbox\@outputbox - \bidi@mopfn@bottom - \ifvoid\@bidi@copyins@ - \else - \vskip \skip\@bidi@copyins@ - \color@begingroup - \normalcolor - \unvbox \@bidi@copyins@ - \color@endgroup - \fi - }} + }% +} \gdef\mem@makecol{% \m@m@makecolintro \ifvoid\footins - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \setbox\@outputbox \box\@cclv - \else - \bidi@mopcopyins - \fi - \else - \setbox\@outputbox \box\@cclv - \fi + \global\@bidi@void@footinstrue + \setbox\@outputbox \box\@cclv \else + \global\@bidi@void@footinsfalse \m@mopfootnote \fi \m@mdoextrafeet @@ -2107,13 +1743,9 @@ \setbox\@outputbox \box\@cclv \m@m@makecolfloats \ifvoid\footins - \ifvoid\footinsv@r - \ifvoid\@bidi@copyins@ - \else - \bidi@mopcopyinsbf - \fi - \fi + \global\@bidi@void@footinstrue \else + \global\@bidi@void@footinsfalse \bidi@mopfootnotebf \fi \m@mdoextrafeet diff --git a/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def index 7a3e7b70b7f..2711b808e3e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def index 9f9f59a8d80..0394da2714e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def index e427c5291d2..218fb4bd13d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def index 8ebc58685d2..f31ef929e49 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def index b8576af4157..cb3b16f3815 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def index b0f4280e331..40e7bde39f2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def index 0c46125c300..2ed878e1e79 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def index 2658ec83bb7..c963997da81 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def index b796115f555..d4dcf2ea798 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def index 612ab25e989..8fb345775c1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def index bd25692bf5b..44bd3709c21 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def index dba949fb8f4..b760e1ddd01 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def index 70370240f26..2c1c52980cd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def index d84a1c53b76..7e9ad397967 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def index 53e868d378f..a40a1200533 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def index fd4439e7c76..88a314cd771 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def index 44346318c06..47d4ca60026 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def index 9bf01c77f4d..b50ce442cae 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def index b24e3c1443e..f41e9fefccb 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def index d629f6a7ea9..d61668bc4e1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def index ab449e1d3f5..d3658fb7573 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def index bcb12debd74..0837abf99ce 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def index 1a30ceb6847..56db08fb3f3 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def index a72f6e512cf..2de47844246 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def index 929e8096734..ead83dc72c2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def index cf9bbc5cc65..d85bb392d80 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def index fcf773f878f..5fc94a0a3c0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def index 5073896fb31..6c26e2f07ea 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def index 05db67f74fd..b6ded54429a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def index d8d6635be92..cbaa1e965ba 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -34,7 +34,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{multicol-xetex-bidi.def}[2018/09/26 v1.0 bidi adaptations for multicol package for XeTeX engine] +\ProvidesFile{multicol-xetex-bidi.def}[2018/10/07 v1.1 bidi adaptations for multicol package for XeTeX engine] \def\page@sofar{% \process@cols\mult@rightbox {\ifvoid\count@ @@ -119,7 +119,7 @@ \newcommand\bidi@multicol@align@columns {\if@RTLmain\RTL@column@boxes\else\LTR@column@boxes\fi} \bidi@AtEndPreamble{% - \if@bidi@csdef{footinsv@r}{% + \if@bidi@csdef{footinsv@l}{% \def\footnoterule{\kern-3\p@ \hrule \@width \textwidth \kern 2.6\p@}% }{}% @@ -175,28 +175,49 @@ \advance\dimen@-\ht\@bidi@copyins@ } \bidi@AtEndPreamble{% - \if@bidi@csdef{footinsv@r}{% + \if@bidi@csdef{footinsv@l}{% \def\bidi@leave@mult@footins@vr{% \advance\dimen@-\skip\footinsv@r \advance\dimen@-\ht\footinsv@r }% + \def\bidi@leave@mult@footins@vl{% + \advance\dimen@-\skip\footinsv@l + \advance\dimen@-\ht\footinsv@l + }% \def\bidi@init@mult@footinsv@r{% \multiply\count\footinsv@r\col@number \multiply\skip \footinsv@r\col@number }% + \def\bidi@init@mult@footinsv@l{% + \multiply\count\footinsv@l\col@number + \multiply\skip \footinsv@l\col@number + }% \def\bidi@reinsert@footnotesv@r{\ifvoid\footinsv@r\else \insert\footinsv@r{}\fi}% + \def\bidi@reinsert@footnotesv@l{\ifvoid\footinsv@l\else + \insert\footinsv@l{}\fi}% \bidi@patchcmd{\prepare@multicols}{% \reinsert@footnotes }{% \reinsert@footnotes \bidi@init@mult@footinsv@r \bidi@reinsert@footnotesv@r + \bidi@init@mult@footinsv@l + \bidi@reinsert@footnotesv@l }{}{}% \bidi@patchcmd{\multi@column@out}{% \ifnum \c@tracingmulticols>\thr@@ }{% - \ifvoid\footinsv@r\else + \ifvoid\footinsv@r + \ifvoid\footinsv@l + \else + \PackageWarning{multicol}% + {I moved some lines to + the next page.\MessageBreak + Footnotes on page + \thepage\space might be wrong}% + \fi + \else \PackageWarning{multicol}% {I moved some lines to the next page.\MessageBreak @@ -210,28 +231,35 @@ }{% \reinsert@footnotes \bidi@reinsert@footnotesv@r + \bidi@reinsert@footnotesv@l }{}{}% \bidi@patchcmd{\speci@ls}{% \reinsert@footnotes }{% \reinsert@footnotes \bidi@reinsert@footnotesv@r + \bidi@reinsert@footnotesv@l }{}{}% \bidi@patchcmd{\speci@ls}{% \reinsert@footnotes }{% \reinsert@footnotes \bidi@reinsert@footnotesv@r + \bidi@reinsert@footnotesv@l }{}{}% }{}% \bidi@patchcmd{\multi@column@out}{% \let\ifshr@kingsaved\ifshr@king }{% - \if@bidi@csdef{footinsv@r}{% + \if@bidi@csdef{footinsv@l}{% \divide\skip\footinsv@r\col@number \ifvoid\footinsv@r \else \bidi@leave@mult@footins@vr \fi + \divide\skip\footinsv@l\col@number + \ifvoid\footinsv@l \else + \bidi@leave@mult@footins@vl + \fi }{}% \ifvoid\@bidi@copyins@ \else \bidi@leave@mult@copyins diff --git a/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def index 476d1a4ca64..8e09c5fcced 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def index 828e1c5793a..8f97b26093b 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def index 7e7883238a2..c60dff4ecdc 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def index 68a3b7fc794..e04c7032d87 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def index f3d27971c6c..8082225893b 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def index 7a3fa9b282a..e14e6a691b8 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def index 5b714e6e1b9..47d1f168aad 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def index ead76f92ea5..86d1bc10bd3 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def index 80e9ba30481..a1f36a1bbb1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def index c83f9b8c789..56a0712713d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def index 1ecb0d90a13..20412313e0d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def index 26a9b1d6e66..a408ed9b199 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def index 477a341ca76..6e40508f9cc 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def index ee308db22b9..e48018d1485 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def index b5a38697d9e..3d33b007e78 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def index b2efe74a277..f1f4bc2a3a7 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def index 68677746ecb..38b5abb7e17 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def index 76d9d8ab068..8e2f61d3806 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def index a30045f6089..d4d318d5ac6 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def index 25fca7948e8..3311a8cf231 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def index fb76dc0d6e7..27a904d1dad 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def index a83ae3933c7..d76481ecdf8 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def index ba67ac5ac6c..9d1bb02182d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def index 60b525bb91f..f41c19090bf 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def index 48ac3e2baad..03d8a27b1c0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def index 5abbd0d09c1..43b3f2c4ef3 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def index 8a11b60a99a..b1155332241 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def index af75d0b6d6f..aefdeb49178 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def index a9cd900cd07..13ccde4aa27 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def index b58b15e2e3d..a17b37c02dd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def index 0ba25062aac..9f3f86f1084 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def index 46089098ed6..b23371583dd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def index 956da9fe471..c8854911d48 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def index 465e94e0073..dfdf8220ffe 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def index d76649e8f7f..cea1f01ae37 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def index b85c3ffb690..bbf2b9e776d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def index 5fd356ce8b7..fb0c65f2ecf 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def index 776b85958b1..beeed8eb4c1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def index 634c329a3af..28549d7bdf0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def index c2dc189b7fc..d23560d43da 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def index e3745749b83..54a71968582 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def index 5754d5b6645..edad5b44cc7 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{50675} +%% \CheckSum{49977} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z |