bidi (22sep18)

git-svn-id: svn://tug.org/texlive/trunk@48737 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 78 insertions, 5 deletions

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 9714ef41bde..32131c975fe 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{49745}
+%% \CheckSum{50014}
 %% \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}[2017/05/19 v1.1 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/09/23 v1.2 bidi extra footnote features for XeTeX engine]
 \newcommand*{\@bidi@before@Hy@hyperfootnotes}{%
 \if@bidi@csundef{ifHy@hyperfootnotes}{}{%
 \if@bidi@csundef{HLTR@@LTRfootnotetext}{}{%
@@ -246,6 +246,14 @@
     \boxmaxdepth \@maxdepth
     \unvbox\@outputbox
     \ifvoid\footinsv@r\else\@footstartv@r\@footgroupv@r\fi
+    \ifvoid\@bidi@copyins@
+    \else
+      \vskip \skip\@bidi@copyins@
+      \color@begingroup
+        \normalcolor
+        \unvbox \@bidi@copyins@
+      \color@endgroup
+    \fi
     \extrafeetinshook}}
 \bidi@ensure@newcommand{\extrafeetinshook}{}
 \bidi@ensure@newcommand{\foottextfont}{\footnotesize}
@@ -1937,7 +1945,33 @@
     \normalcolor
     \footnoterule
     \unvbox \footins
-  \color@endgroup}}
+  \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
@@ -1948,11 +1982,44 @@
     \normalcolor
     \footnoterule
     \unvbox \footins
-  \color@endgroup}}
+  \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
-    \setbox\@outputbox \box\@cclv
+    \ifvoid\footinsv@r
+      \ifvoid\@bidi@copyins@
+        \setbox\@outputbox \box\@cclv
+      \else
+        \bidi@mopcopyins
+      \fi
+    \else
+      \setbox\@outputbox \box\@cclv
+    \fi
   \else
     \m@mopfootnote
   \fi
@@ -1965,6 +2032,12 @@
   \setbox\@outputbox \box\@cclv
   \m@m@makecolfloats
   \ifvoid\footins
+    \ifvoid\footinsv@r
+      \ifvoid\@bidi@copyins@
+      \else
+        \bidi@mopcopyinsbf
+      \fi
+    \fi
   \else
     \bidi@mopfootnotebf
   \fi