From e746dae5fade789c4be1073331a088f8ed9fe05d Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 8 May 2016 22:29:38 +0000
Subject: bidi (8may16)

git-svn-id: svn://tug.org/texlive/trunk@40957 c570f23f-e606-0410-a88d-b1316a301751
---
 .../bidi/extrafootnotefeatures-xetex-bidi.def      | 44 ++++++++++++++++------
 1 file changed, 32 insertions(+), 12 deletions(-)

(limited to 'Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def')

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 1cac65df9a9..c2d6f521c8d 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{46416}
+%% \CheckSum{46457}
 %% \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{extrafootnotefeatures-xetex-bidi.def}[2016/05/07 v0.8 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2016/05/09 v0.9 bidi extra footnote features for XeTeX engine]
 \let\autofootnoterule\relax
 \let\rightfootnoterule\relax
 \let\leftfootnoterule\relax
@@ -153,7 +153,6 @@
   \def\m@m@float@spacing{#1} %
 }
 \setSingleSpace{1}
-\newinsert\sideins
 \bidi@ensure@newcommand*{\multiplefootnotemarker}{3sp}
 \bidi@ensure@newcommand*{\m@mmf@prepare}{%
   \kern-\multiplefootnotemarker
@@ -222,6 +221,7 @@
   \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
 \bidi@ensure@newcommand{\m@make@footstart}[1]{%
   \@namedef{@footstart#1}{%
+   \bidi@mopfn@bottom
     \vskip\bigskipamount
     \leftskip=\z@
     \rightskip=\z@
@@ -1837,18 +1837,24 @@
   \@tempdima\dp\@cclv
   \unvbox\@cclv
   \vskip-\@tempdima
+  \bidi@mopfn@bottom
   \vskip \skip\footins
   \color@begingroup
     \normalcolor
     \footnoterule
     \unvbox \footins
   \color@endgroup}}
-\bidi@ensure@newcommand*{\m@mopsidebar}{%
-  \ifvoid\sideins\else
-    \setbox\@outputbox \vbox{%
-      \sidecontents
-      \unvbox\@outputbox}
-  \fi}
+\newcommand*{\bidi@mopfootnotebf}{%
+  \setbox\@outputbox \vbox{%
+  \boxmaxdepth\@maxdepth
+  \unvbox\@outputbox
+  \bidi@mopfn@bottom
+  \vskip\skip\footins
+  \color@begingroup
+    \normalcolor
+    \footnoterule
+    \unvbox \footins
+  \color@endgroup}}
 \gdef\mem@makecol{%
   \m@m@makecolintro
   \ifvoid\footins
@@ -1858,11 +1864,25 @@
   \fi
   \m@mdoextrafeet
   \m@m@makecolfloats
-  \m@mopsidebar
   \m@m@makecoltext
   \global \maxdepth \@maxdepth}
-\bidi@ensure@newcommand{\feetabovefloat}{\gdef\@makecol{\mem@makecol}}
-\feetabovefloat%
+\gdef\bidi@makecolbf{%
+  \m@m@makecolintro
+  \setbox\@outputbox \box\@cclv
+  \m@m@makecolfloats
+  \ifvoid\footins
+  \else
+    \bidi@mopfootnotebf
+  \fi
+  \m@mdoextrafeet
+  \m@m@makecoltext
+  \global \maxdepth \@maxdepth}
+\newcommand{\FeetAboveFloat}{\gdef\@makecol{\mem@makecol}}
+\newcommand{\FeetBelowFloat}{\gdef\@makecol{\bidi@makecolbf}}
+\newcommand\FeetAtBottom{\def\bidi@mopfn@bottom{\vfill\relax}}
+\newcommand\FeetBelowRagged{\let\bidi@mopfn@bottom\relax}
+\FeetAboveFloat
+\FeetBelowRagged
 \endinput
 %%
 %% End of file `extrafootnotefeatures-xetex-bidi.def'.
-- 
cgit v1.2.3

