diff options
Diffstat (limited to 'macros/xetex/latex/bidi')
| -rw-r--r-- | macros/xetex/latex/bidi/README | 4 | ||||
| -rw-r--r-- | macros/xetex/latex/bidi/bidi-doc-intro.ltx | 2 | ||||
| -rw-r--r-- | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx | 7 | ||||
| -rw-r--r-- | macros/xetex/latex/bidi/bidi-doc-title.ltx | 4 | ||||
| -rw-r--r-- | macros/xetex/latex/bidi/bidi-doc.ltx | 2 | ||||
| -rw-r--r-- | macros/xetex/latex/bidi/bidi-doc.pdf | bin | 177705 -> 176645 bytes | |||
| -rw-r--r-- | macros/xetex/latex/bidi/bidi.dtx | 524 | ||||
| -rw-r--r-- | macros/xetex/latex/bidi/bidi.pdf | bin | 3446026 -> 3475585 bytes |
8 files changed, 426 insertions, 117 deletions
diff --git a/macros/xetex/latex/bidi/README b/macros/xetex/latex/bidi/README index 835199bf5e..47e8a4e1d6 100644 --- a/macros/xetex/latex/bidi/README +++ b/macros/xetex/latex/bidi/README @@ -1,6 +1,6 @@ ___________________ The bidi package -v38.5 +v38.6 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -25,7 +25,7 @@ The announcements for the new releases of the package will also appear in the Discussions space under the Announcements category. -Current version release date: 2022/07/01 +Current version release date: 2022/07/02 ___________________________________________ Vafa Khalighi diff --git a/macros/xetex/latex/bidi/bidi-doc-intro.ltx b/macros/xetex/latex/bidi/bidi-doc-intro.ltx index 6dd4917c93..ef1beb386e 100644 --- a/macros/xetex/latex/bidi/bidi-doc-intro.ltx +++ b/macros/xetex/latex/bidi/bidi-doc-intro.ltx @@ -20,7 +20,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run * Copyright (c) 2007--2022 Vafa Khalighi * Copyright (c) 2018--2020 bidi-tex GitHub Organization * -* v38.5, 2022/07/01 +* v38.6, 2022/07/02 * * License: LaTeX Project Public License, version * 1.3c or higher (your choice) diff --git a/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx b/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx index 09d98a40b1..0b9517d600 100644 --- a/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx +++ b/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx @@ -76,17 +76,12 @@ There is also \texttt{extrafootnotefeatures} option that allows footnotes to be \Lcs{twocolumnfootnotes}\quad\Lcs{threecolumnfootnotes}\quad\Lcs{fourcolumnfootnotes}\\ \Lcs{fivecolumnfootnotes}\quad\Lcs{sixcolumnfootnotes}\quad\Lcs{sevencolumnfootnotes}\\ \Lcs{eightcolumnfootnotes}\quad\Lcs{ninecolumnfootnotes}\quad\Lcs{tencolumnfootnotes}\\ -\Lcs{RTLcolumnfootnotes}\quad\Lcs{LTRcolumnfootnotes}\\ -\Lcs{paragraphfootnotes}\\ -\Lcs{setLTRparagraphfootnotes}\quad\Lcs{setRTLparagraphfootnotes} +\Lcs{paragraphfootnotes} \end{BDef} \begin{itemize} \item \Lcs{normalfootnotes} typesets footnotes in Standard \LaTeX{} format. \item \Lcs{twocolumnfootnotes} to \Lcs{tencolumnfootnotes}, typeset footnotes in two-columns to ten-columns, respectively. -\item \Lcs{RTLcolumnfootnotes} typesets footnotes columns RTL (first column on the RHS and each next column to the left of the previous column) and \Lcs{LTRcolumnfootnotes} typesets footnotes columns LTR (first column on the LHS and each next column to the right of the previous column). \Lcs{LTRcolumnfootnotes} is active by default. \item \Lcs{paragraphfootnotes} typesets footnotes in paragraph format. -\item \Lcs{setLTRparagraphfootnotes} makes footnotes run from left to right. This comand is active by default. -\item \Lcs{setRTLparagraphfootnotes} makes footnotes run from right to left. \end{itemize} Please note that when using \texttt{extrafootnotefeatures} option, the footnote rule will be as wide as the text width and \Lcs{autofootnoterule}, \Lcs{rightfootnoterule}, \Lcs{leftfootnoterule}, and \Lcs{textwidthfootnoterule} commands have no effects. diff --git a/macros/xetex/latex/bidi/bidi-doc-title.ltx b/macros/xetex/latex/bidi/bidi-doc-title.ltx index 75b5036eb8..a281b4102e 100644 --- a/macros/xetex/latex/bidi/bidi-doc-title.ltx +++ b/macros/xetex/latex/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 38.5}} +\large User documentation for \textcolor{blue!65!black}{version 38.6}} \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}} \setcounter{page}{0} \thispagestyle{empty} @@ -13,7 +13,7 @@ \textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} \Large -User documentation for \textcolor{blue!65!black}{version 38.5}} +User documentation for \textcolor{blue!65!black}{version 38.6}} \vskip 0pt plus 3fill \textit{\large to my Master, \textbf{Ferdowsi The Great}} diff --git a/macros/xetex/latex/bidi/bidi-doc.ltx b/macros/xetex/latex/bidi/bidi-doc.ltx index bb54c006f1..3c473fc57a 100644 --- a/macros/xetex/latex/bidi/bidi-doc.ltx +++ b/macros/xetex/latex/bidi/bidi-doc.ltx @@ -1,7 +1,7 @@ \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={User documentation for version 38.5 of the bidi + pdftitle={User documentation for version 38.6 of the bidi package}% } \begin{document} diff --git a/macros/xetex/latex/bidi/bidi-doc.pdf b/macros/xetex/latex/bidi/bidi-doc.pdf Binary files differindex ea09a335e4..8b57609f3d 100644 --- a/macros/xetex/latex/bidi/bidi-doc.pdf +++ b/macros/xetex/latex/bidi/bidi-doc.pdf diff --git a/macros/xetex/latex/bidi/bidi.dtx b/macros/xetex/latex/bidi/bidi.dtx index 7e007d81a8..e331a19ec2 100644 --- a/macros/xetex/latex/bidi/bidi.dtx +++ b/macros/xetex/latex/bidi/bidi.dtx @@ -5,7 +5,7 @@ %<*readme> ___________________ The bidi package -v38.5 +v38.6 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -30,7 +30,7 @@ The announcements for the new releases of the package will also appear in the Discussions space under the Announcements category. -Current version release date: 2022/07/01 +Current version release date: 2022/07/02 ___________________________________________ Vafa Khalighi @@ -266,7 +266,7 @@ by Vafa Khalighi. \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={Source documentation for version 38.5 of the bidi + pdftitle={Source documentation for version 38.6 of the bidi package}% } \EnableCrossrefs @@ -285,7 +285,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 38.5}} +%\large Source documentation for \textcolor{blue!65!black}{version 38.6}} % \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}} %\setcounter{page}{0} %\thispagestyle{empty} @@ -295,7 +295,7 @@ by Vafa Khalighi. %\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} % %\Large -%Source documentation for \textcolor{blue!65!black}{version 38.5}} +%Source documentation for \textcolor{blue!65!black}{version 38.6}} % %\vskip 0pt plus 3fill %\textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -344,7 +344,7 @@ by Vafa Khalighi. %\iffalse %<*table> %\fi -%% \CheckSum{55066} +%% \CheckSum{55521} %% \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 @@ -4588,8 +4588,8 @@ by Vafa Khalighi. % \section{File \texttt{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2022/07/01} -\def\bidi@version{38.5} +\def\bididate{2022/07/02} +\def\bidi@version{38.6} \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space Bidirectional typesetting in plain TeX and LaTeX] \edef\@bidi@info{****************************************************^^J% @@ -4665,7 +4665,6 @@ Bidirectional typesetting in plain TeX and LaTeX] \newif\if@LTRbibitems \newif\if@RTLbibitems \newif\if@extrafootnotefeatures -\newif\if@RTLcolumnfootnotes \eqnewif{\if@RTL@footnote}{\if@rl@footnote} \newif\if@bidi@list@minipage@parbox \newif\if@bidi@list@minipage@parbox@not@nob @@ -4677,7 +4676,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \newcommand*{\@bidi@pdfcustomproperties}{% This is the bidi package, Version \bidi@version, - Released July 1, 2022. + Released July 2, 2022. } \newcommand*{\bidi@beamer@ragged}{} \@RTLmainfalse @@ -4921,9 +4920,9 @@ Bidirectional typesetting in plain TeX and LaTeX] %\fi % \section{File \texttt{bidi.tex}} % \begin{macrocode} -\def\bididate{2022/07/01} +\def\bididate{2022/07/02} \catcode`@=11 -\def\bidi@version{38.5} +\def\bidi@version{38.6} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -5025,7 +5024,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \def\@bidi@pdfcustomproperties{% This is the bidi package, Version \bidi@version, - Released July 1, 2022. + Released July 2, 2022. } \def\bidi@pdfm@mark{% \special{pdf:% @@ -12541,7 +12540,7 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{extrafootnotefeatures-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2022/07/01 v1.8 bidi extra footnote features for XeTeX engine] +\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2022/07/02 v1.9 bidi extra footnote features for XeTeX engine] \newif\if@bidi@void@footins \newif\if@bidi@void@@mpfootins \newcommand*{\@bidi@before@Hy@hyperfootnotes}{% @@ -12700,8 +12699,6 @@ bidi implementation of tufte title] \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } \@ifclassloaded{memoir}{\let\plainfootnotes\normalfootnotes}{} -\bidi@ensure@newcommand*{\RTLcolumnfootnotes}{\@RTLcolumnfootnotestrue} -\bidi@ensure@newcommand*{\LTRcolumnfootnotes}{\@RTLcolumnfootnotesfalse} \bidi@ensure@newcommand*{\setSingleSpace}[1]{% \def\m@m@singlespace{#1}% \def\m@m@footnote@spacing{#1}% @@ -12851,12 +12848,22 @@ bidi implementation of tufte title] \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}} \bidi@ensure@newcommand{\m@make@footstart}[1]{% \@namedef{@footstart#1}{% - \bidi@mopfn@bottom + \if@bidi@void@footins + \bidi@mopfn@bottom + \fi \leftskip=\z@ \rightskip=\z@ \parindent=\z@ \vskip\skip\footins - \footnoterule}} + \if@bidi@void@footins + \footnoterule + \fi}} +\newcommand{\bidi@make@footstart@@}[1]{% + \@namedef{@@footstart@@#1}{% + \leftskip=\z@ + \rightskip=\z@ + \parindent=\z@ + \vskip\skip\footins}} \newinsert\footinsv@r \skip\footinsv@r\bigskipamount \count\footinsv@r=1000 % no magnifcation @@ -12864,6 +12871,10 @@ bidi implementation of tufte title] \m@make@footstart{v@r} \newinsert\footinsv@l \skip\footinsv@l\bigskipamount +\count\footinsv@l=1000 % no magnifcation +\dimen\footinsv@l=\footinsdim +\m@make@footstart{v@l} +\bidi@make@footstart@@{v@l} \bidi@ensure@newcommand{\@footgroupv@r}{} \newinsert\@mpfootinsv@r \newinsert\@mpfootinsv@l @@ -12872,22 +12883,29 @@ bidi implementation of tufte title] \@ifpackageloaded{multicol}{% \bidi@ensure@newcommand*{\m@mrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 \hsize\textwidth - \@@line{\if@RTLcolumnfootnotes\beginR\fi\splittopskip=\m@m@h \vbadness=\@M \hfilneg - \valign{##\vfill\cr\m@mdosplits}\if@RTLcolumnfootnotes\endR\fi}} + \@@line{\beginR\splittopskip=\m@m@h \vbadness=\@M \hfilneg + \valign{##\vfill\cr\m@mdosplits}\endR}} +\newcommand*{\bidi@LTRrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 + \hsize\textwidth + \@@line{\splittopskip=\m@m@h \vbadness=\@M \hfilneg + \valign{##\vfill\cr\m@mdosplits}}} }{% \bidi@ensure@newcommand*{\m@mrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 - \@@line{\if@RTLcolumnfootnotes\beginR\fi\splittopskip=\m@m@h \vbadness=\@M \hfilneg - \valign{##\vfill\cr\m@mdosplits}\if@RTLcolumnfootnotes\endR\fi}}} + \@@line{\beginR\splittopskip=\m@m@h \vbadness=\@M \hfilneg + \valign{##\vfill\cr\m@mdosplits}\endR}} +\newcommand*{\bidi@LTRrigidbalance}[3]{\setbox0=\box#1 \m@m@k=#2 \m@m@h=#3 + \@@line{\splittopskip=\m@m@h \vbadness=\@M \hfilneg + \valign{##\vfill\cr\m@mdosplits}}} +} \bidi@ensure@newcommand*{\m@mdosplits}{\ifnum\m@m@k>0 \noalign{\hfil}\m@msplitoff \global\advance\m@m@k-1\cr\m@mdosplits\fi} \bidi@ensure@newcommand*{\m@msplitoff}{\dimen0=\ht0 \divide\dimen0 by\m@m@k \advance\dimen0 by\m@m@h \setbox2 \vsplit0 to \dimen0 \unvbox2 } -\newdimen\columnfootnoterulesep -\columnfootnoterulesep\footnotesep \bidi@ensure@newcommand{\twocolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@twocolfootnotetext \let\@LTRfootnotetext\@twocolLTRfootnotetext @@ -12896,15 +12914,27 @@ bidi implementation of tufte title] \count\footinsv@r=500\relax \m@make@twocol@footgroup{v@r}% \let\@footgroupv@r\@twocol@footgroupv@r + \dimen\footinsv@l=2\footinsdim + \count\footinsv@l=500\relax + \bidi@make@twocol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@twocol@LTRfootgroupv@l \let\@mpfootnotetext\@mptwocolfootnotetext \let\@mpLTRfootnotetext\@mptwocolLTRfootnotetext \let\@mpRTLfootnotetext\@mptwocolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mptwocol@footgroup{v@r}% \let\mp@footgroupv@r\@mptwocol@footgroupv@r + \bidi@make@mptwocol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mptwocol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@twocolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -12914,7 +12944,7 @@ bidi implementation of tufte title] \@twocolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@twocolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -12949,8 +12979,19 @@ bidi implementation of tufte title] \@preamtwofmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mptwocolfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -12961,12 +13002,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mptwocolLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -12988,15 +13028,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@twocol@footgroup}[1]{% \@namedef{@twocol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{\tw@}{\splittopskip}}}} +\newcommand{\bidi@make@twocol@LTRfootgroup}[1]{% + \@namedef{@twocol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{\tw@}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mptwocol@footgroup}[1]{% \@namedef{@mptwocol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\tw@}{\splittopskip}}}} +\newcommand{\bidi@make@mptwocol@LTRfootgroup}[1]{% +\@namedef{@mptwocol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{\tw@}{\splittopskip}}}} \bidi@ensure@newcommand{\threecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@threecolfootnotetext \let\@LTRfootnotetext\@threecolLTRfootnotetext @@ -13005,15 +13056,27 @@ bidi implementation of tufte title] \count\footinsv@r=333\relax \m@make@threecol@footgroup{v@r}% \let\@footgroupv@r\@threecol@footgroupv@r + \dimen\footinsv@l=3\footinsdim + \count\footinsv@l=333\relax + \bidi@make@threecol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@threecol@LTRfootgroupv@l \let\@mpfootnotetext\@mpthreecolfootnotetext \let\@mpLTRfootnotetext\@mpthreecolLTRfootnotetext \let\@mpRTLfootnotetext\@mpthreecolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mpthreecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpthreecol@footgroupv@r + \bidi@make@mpthreecol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mpthreecol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@threecolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13022,7 +13085,7 @@ bidi implementation of tufte title] \color@begingroup \@threecolfootfmt{#1}% \color@endgroup}\m@mmf@prepare} -\bidi@ensure@newcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@threecolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13055,8 +13118,19 @@ bidi implementation of tufte title] \@preamthreefmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mpthreecolfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13066,12 +13140,11 @@ bidi implementation of tufte title] \@threecolfootfmt{#1}% \color@endgroup}\m@mmf@prepare} \bidi@ensure@newcommand{\@mpthreecolLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13091,15 +13164,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@threecol@footgroup}[1]{% \@namedef{@threecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{\thr@@}{\splittopskip}}}} +\newcommand{\bidi@make@threecol@LTRfootgroup}[1]{% +\@namedef{@threecol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{\thr@@}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mpthreecol@footgroup}[1]{% \@namedef{@mpthreecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{\thr@@}{\splittopskip}}}} +\newcommand{\bidi@make@mpthreecol@LTRfootgroup}[1]{% +\@namedef{@mpthreecol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{\thr@@}{\splittopskip}}}} \bidi@ensure@newcommand{\fourcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@fourcolfootnotetext \let\@LTRfootnotetext\@fourcolLTRfootnotetext @@ -13108,15 +13192,27 @@ bidi implementation of tufte title] \count\footinsv@r=250\relax \m@make@fourcol@footgroup{v@r}% \let\@footgroupv@r\@fourcol@footgroupv@r + \dimen\footinsv@l=4\footinsdim + \count\footinsv@l=250\relax + \bidi@make@fourcol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@fourcol@LTRfootgroupv@l \let\@mpfootnotetext\@mpfourcolfootnotetext \let\@mpLTRfootnotetext\@mpfourcolLTRfootnotetext \let\@mpRTLfootnotetext\@mpfourcolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mpfourcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpfourcol@footgroupv@r + \bidi@make@mpfourcol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mpfourcol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@fourcolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13126,7 +13222,7 @@ bidi implementation of tufte title] \@fourcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@fourcolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13161,8 +13257,19 @@ bidi implementation of tufte title] \@preamfourfmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mpfourcolfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13173,12 +13280,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mpfourcolLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13200,15 +13306,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@fourcol@footgroup}[1]{% \@namedef{@fourcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{4}{\splittopskip}}}} +\newcommand{\bidi@make@fourcol@LTRfootgroup}[1]{% + \@namedef{@fourcol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{4}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mpfourcol@footgroup}[1]{% \@namedef{@mpfourcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{4}{\splittopskip}}}} +\newcommand{\bidi@make@mpfourcol@LTRfootgroup}[1]{% +\@namedef{@mpfourcol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{4}{\splittopskip}}}} \bidi@ensure@newcommand{\fivecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@fivecolfootnotetext \let\@LTRfootnotetext\@fivecolLTRfootnotetext @@ -13217,15 +13334,27 @@ bidi implementation of tufte title] \count\footinsv@r=200\relax \m@make@fivecol@footgroup{v@r}% \let\@footgroupv@r\@fivecol@footgroupv@r + \dimen\footinsv@l=5\footinsdim + \count\footinsv@l=200\relax + \bidi@make@fivecol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@fivecol@LTRfootgroupv@l \let\@mpfootnotetext\@mpfivecolfootnotetext \let\@mpLTRfootnotetext\@mpfivecolLTRfootnotetext \let\@mpRTLfootnotetext\@mpfivecolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mpfivecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpfivecol@footgroupv@r + \bidi@make@mpfivecol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mpfivecol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@fivecolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13235,7 +13364,7 @@ bidi implementation of tufte title] \@fivecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@fivecolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13270,8 +13399,19 @@ bidi implementation of tufte title] \@preamfivefmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mpfivecolfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13282,12 +13422,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mpfivecolLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13309,15 +13448,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@fivecol@footgroup}[1]{% \@namedef{@fivecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{5}{\splittopskip}}}} +\newcommand{\bidi@make@fivecol@LTRfootgroup}[1]{% + \@namedef{@fivecol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{5}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mpfivecol@footgroup}[1]{% \@namedef{@mpfivecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{5}{\splittopskip}}}} +\newcommand{\bidi@make@mpfivecol@LTRfootgroup}[1]{% +\@namedef{@mpfivecol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{5}{\splittopskip}}}} \bidi@ensure@newcommand{\sixcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@sixcolfootnotetext \let\@LTRfootnotetext\@sixcolLTRfootnotetext @@ -13326,15 +13476,27 @@ bidi implementation of tufte title] \count\footinsv@r=166\relax \m@make@sixcol@footgroup{v@r}% \let\@footgroupv@r\@sixcol@footgroupv@r + \dimen\footinsv@l=6\footinsdim + \count\footinsv@l=166\relax + \bidi@make@sixcol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@sixcol@LTRfootgroupv@l \let\@mpfootnotetext\@mpsixcolfootnotetext \let\@mpLTRfootnotetext\@mpsixcolLTRfootnotetext \let\@mpRTLfootnotetext\@mpsixcolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mpsixcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpsixcol@footgroupv@r + \bidi@make@mpsixcol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mpsixcol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sixcolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13344,7 +13506,7 @@ bidi implementation of tufte title] \@sixcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@sixcolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13379,8 +13541,19 @@ bidi implementation of tufte title] \@preamsixfmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mpsixcolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \global\setbox\@mpfootinsv@r\vbox{% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13391,12 +13564,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mpsixcolLTRfootnotetext}[1]{\@RTLfalse% - \global\setbox\@mpfootinsv@r\vbox{% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13418,15 +13590,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@sixcol@footgroup}[1]{% \@namedef{@sixcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{6}{\splittopskip}}}} +\newcommand{\bidi@make@sixcol@LTRfootgroup}[1]{% + \@namedef{@sixcol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{6}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mpsixcol@footgroup}[1]{% \@namedef{@mpsixcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{6}{\splittopskip}}}} +\newcommand{\bidi@make@mpsixcol@LTRfootgroup}[1]{% +\@namedef{@mpsixcol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{6}{\splittopskip}}}} \bidi@ensure@newcommand{\sevencolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@sevencolfootnotetext \let\@LTRfootnotetext\@sevencolLTRfootnotetext @@ -13435,15 +13618,27 @@ bidi implementation of tufte title] \count\footinsv@r=142\relax \m@make@sevencol@footgroup{v@r}% \let\@footgroupv@r\@sevencol@footgroupv@r + \dimen\footinsv@l=7\footinsdim + \count\footinsv@l=142\relax + \bidi@make@sevencol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@sevencol@LTRfootgroupv@l \let\@mpfootnotetext\@mpsevencolfootnotetext \let\@mpLTRfootnotetext\@mpsevencolLTRfootnotetext \let\@mpRTLfootnotetext\@mpsevencolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mpsevencol@footgroup{v@r}% \let\mp@footgroupv@r\@mpsevencol@footgroupv@r + \bidi@make@mpsevencol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mpsevencol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@sevencolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13453,7 +13648,7 @@ bidi implementation of tufte title] \@sevencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@sevencolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13488,8 +13683,19 @@ bidi implementation of tufte title] \@preamsevenfmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mpsevencolfootnotetext}[1]{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \global\setbox\@mpfootinsv@r\vbox{% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13500,12 +13706,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mpsevencolLTRfootnotetext}[1]{\@RTLfalse% - \global\setbox\@mpfootinsv@r\vbox{% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13527,15 +13732,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@sevencol@footgroup}[1]{% \@namedef{@sevencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{7}{\splittopskip}}}} +\newcommand{\bidi@make@sevencol@LTRfootgroup}[1]{% + \@namedef{@sevencol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{7}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mpsevencol@footgroup}[1]{% \@namedef{@mpsevencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{7}{\splittopskip}}}} +\newcommand{\bidi@make@mpsevencol@LTRfootgroup}[1]{% +\@namedef{@mpsevencol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{7}{\splittopskip}}}} \bidi@ensure@newcommand{\eightcolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@eightcolfootnotetext \let\@LTRfootnotetext\@eightcolLTRfootnotetext @@ -13544,15 +13760,27 @@ bidi implementation of tufte title] \count\footinsv@r=125\relax \m@make@eightcol@footgroup{v@r}% \let\@footgroupv@r\@eightcol@footgroupv@r + \dimen\footinsv@l=8\footinsdim + \count\footinsv@l=125\relax + \bidi@make@eightcol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@eightcol@LTRfootgroupv@l \let\@mpfootnotetext\@mpeightcolfootnotetext \let\@mpLTRfootnotetext\@mpeightcolLTRfootnotetext \let\@mpRTLfootnotetext\@mpeightcolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mpeightcol@footgroup{v@r}% \let\mp@footgroupv@r\@mpeightcol@footgroupv@r + \bidi@make@mpeightcol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mpeightcol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@eightcolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13562,7 +13790,7 @@ bidi implementation of tufte title] \@eightcolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@eightcolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13597,8 +13825,19 @@ bidi implementation of tufte title] \@preameightfmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mpeightcolfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13609,12 +13848,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mpeightcolLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13636,15 +13874,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@eightcol@footgroup}[1]{% \@namedef{@eightcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{8}{\splittopskip}}}} +\newcommand{\bidi@make@eightcol@LTRfootgroup}[1]{% + \@namedef{@eightcol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{8}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mpeightcol@footgroup}[1]{% \@namedef{@mpeightcol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{8}{\splittopskip}}}} +\newcommand{\bidi@make@mpeightcol@LTRfootgroup}[1]{% +\@namedef{@mpeightcol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{8}{\splittopskip}}}} \bidi@ensure@newcommand{\ninecolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@ninecolfootnotetext \let\@LTRfootnotetext\@ninecolLTRfootnotetext @@ -13653,15 +13902,27 @@ bidi implementation of tufte title] \count\footinsv@r=111\relax \m@make@ninecol@footgroup{v@r}% \let\@footgroupv@r\@ninecol@footgroupv@r + \dimen\footinsv@l=9\footinsdim + \count\footinsv@l=111\relax + \bidi@make@ninecol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@ninecol@LTRfootgroupv@l \let\@mpfootnotetext\@mpninecolfootnotetext \let\@mpLTRfootnotetext\@mpninecolLTRfootnotetext \let\@mpRTLfootnotetext\@mpninecolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mpninecol@footgroup{v@r}% \let\mp@footgroupv@r\@mpninecol@footgroupv@r + \bidi@make@mpninecol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mpninecol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@ninecolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13671,7 +13932,7 @@ bidi implementation of tufte title] \@ninecolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@ninecolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13706,8 +13967,19 @@ bidi implementation of tufte title] \@preamninefmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mpninecolfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13718,12 +13990,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mpninecolLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13745,15 +14016,26 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@ninecol@footgroup}[1]{% \@namedef{@ninecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{9}{\splittopskip}}}} +\newcommand{\bidi@make@ninecol@LTRfootgroup}[1]{% + \@namedef{@ninecol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{9}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mpninecol@footgroup}[1]{% \@namedef{@mpninecol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{9}{\splittopskip}}}} +\newcommand{\bidi@make@mpninecol@LTRfootgroup}[1]{% +\@namedef{@mpninecol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{9}{\splittopskip}}}} \bidi@ensure@newcommand{\tencolumnfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \let\@footnotetext\@tencolfootnotetext \let\@LTRfootnotetext\@tencolLTRfootnotetext @@ -13762,15 +14044,27 @@ bidi implementation of tufte title] \count\footinsv@r=100\relax \m@make@tencol@footgroup{v@r}% \let\@footgroupv@r\@tencol@footgroupv@r + \dimen\footinsv@l=10\footinsdim + \count\footinsv@l=100\relax + \bidi@make@tencol@LTRfootgroup{v@l}% + \let\@LTRfootgroupv@l\@tencol@LTRfootgroupv@l \let\@mpfootnotetext\@mptencolfootnotetext \let\@mpLTRfootnotetext\@mptencolLTRfootnotetext \let\@mpRTLfootnotetext\@mptencolRTLfootnotetext \@bidi@after@Hy@hyperfootnotes \m@make@mptencol@footgroup{v@r}% \let\mp@footgroupv@r\@mptencol@footgroupv@r + \bidi@make@mptencol@LTRfootgroup{v@l}% + \let\mp@LTRfootgroupv@l\@mptencol@LTRfootgroupv@l \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\bidi@ensure@newcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% +\bidi@ensure@newcommand{\@tencolfootnotetext}[1]{\insert + \if@RTL@footnote + \footinsv@r + \else + \footinsv@l + \fi +{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \@preamfntext @@ -13780,7 +14074,7 @@ bidi implementation of tufte title] \@tencolfootfmt{#1}% \color@endgroup}% \m@mmf@prepare} -\bidi@ensure@newcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@r{\if@RTLcolumnfootnotes\beginL\fi\@RTLfalse% +\bidi@ensure@newcommand{\@tencolLTRfootnotetext}[1]{\insert\footinsv@l{\@RTLfalse% \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \@preamfntext @@ -13815,8 +14109,19 @@ bidi implementation of tufte title] \@preamtenfmt {\RTLfootfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak} \bidi@ensure@newcommand{\@mptencolfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% - \unvbox\@mpfootinsv@r + \global\setbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi + \vbox{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi% + \unvbox + \if@RTL@footnote + \@mpfootinsv@r + \else + \@mpfootinsv@l + \fi \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\foottextfont \hsize\columnwidth \@parboxrestore @@ -13827,12 +14132,11 @@ bidi implementation of tufte title] \color@endgroup}% \m@mmf@prepare} \bidi@ensure@newcommand{\@mptencolLTRfootnotetext}[1]{% - \global\setbox\@mpfootinsv@r\vbox{\@RTLfalse% - \unvbox\@mpfootinsv@r + \global\setbox\@mpfootinsv@l\vbox{\@RTLfalse% + \unvbox\@mpfootinsv@l \def\baselinestretch{\m@m@footnote@spacing}% \reset@font\LTRfoottextfont \hsize\columnwidth \@parboxrestore - \if@RTLcolumnfootnotes\beginL\fi \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup @@ -13854,13 +14158,23 @@ bidi implementation of tufte title] \bidi@ensure@newcommand{\m@make@tencol@footgroup}[1]{% \@namedef{@tencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{footins#1}}{10}{\splittopskip}}}} +\newcommand{\bidi@make@tencol@LTRfootgroup}[1]{% + \@namedef{@tencol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{footins#1}}{10}{\splittopskip}}}} \bidi@ensure@newcommand{\m@make@mptencol@footgroup}[1]{% \@namedef{@mptencol@footgroup#1}{{% \def\baselinestretch{\m@m@footnote@spacing}% - \@nameuse{foottextfont#1} \splittopskip=\columnfootnoterulesep%\ht\strutbox + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox \m@mrigidbalance{\@nameuse{@mpfootins#1}}{10}{\splittopskip}}}} +\newcommand{\bidi@make@mptencol@LTRfootgroup}[1]{% +\@namedef{@mptencol@LTRfootgroup#1}{{% + \def\baselinestretch{\m@m@footnote@spacing}% + \@nameuse{foottextfont#1} \splittopskip=\ht\strutbox + \bidi@LTRrigidbalance{\@nameuse{@mpfootins#1}}{10}{\splittopskip}}}} \bidi@ensure@newcommand{\m@munvxh}[1]{% \setbox0=\vbox{\unvbox#1% \global\setbox1=\lastbox}% diff --git a/macros/xetex/latex/bidi/bidi.pdf b/macros/xetex/latex/bidi/bidi.pdf Binary files differindex b78d1c7b23..47aaa31a41 100644 --- a/macros/xetex/latex/bidi/bidi.pdf +++ b/macros/xetex/latex/bidi/bidi.pdf |