1 files changed, 69 insertions, 28 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 c6b0f984cb3..5faa2c6a46b 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{50128}
+%% \CheckSum{50190}
 %% \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}[2018/09/26 v1.3 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/09/27 v1.4 bidi extra footnote features for XeTeX engine]
 \newcommand*{\@bidi@before@Hy@hyperfootnotes}{%
 \if@bidi@csundef{ifHy@hyperfootnotes}{}{%
 \if@bidi@csundef{HLTR@@LTRfootnotetext}{}{%
@@ -194,8 +194,6 @@
   \kern-\multiplefootnotemarker
   \kern\multiplefootnotemarker\relax}
 \bidi@ensure@newlength{\footmarkwidth}
-\bidi@ensure@newlength{\footmarksep}
-\bidi@ensure@newlength{\footparindent}
 \bidi@ensure@newcommand*{\footmarkstyle}[1]{\def\footscript##1{#1}}
 \bidi@ensure@newcommand*{\LTRfootmarkstyle}[1]{\def\LTRfootscript##1{#1}}
 \bidi@ensure@newcommand*{\RTLfootmarkstyle}[1]{\def\RTLfootscript##1{#1}}
@@ -238,8 +236,12 @@
 \footmarkstyle{\textsuperscript{#1}}
 \LTRfootmarkstyle{\textsuperscript{#1}}
 \RTLfootmarkstyle{\textsuperscript{#1}}
-\setlength{\footmarkwidth}{1em plus.4em minus.4em}
-\setlength{\footparindent}{1em}
+\newcommand*{\bidi@normal@footmarkwidth}{%
+  \setlength{\footmarkwidth}{1em plus.4em minus.4em}%
+}
+\newcommand*{\bidi@star@footmarkwidth}{%
+  \setlength{\footmarkwidth}{0em plus.4em minus.4em}%
+}
 \bidi@ensure@newcommand{\m@mdoextrafeet}{\extrafeetins}
 \bidi@ensure@newcommand*{\extrafeetins}{%
   \setbox\@outputbox \vbox{%
@@ -294,9 +296,10 @@
 \bidi@ensure@newcommand{\m@make@footstart}[1]{%
   \@namedef{@footstart#1}{%
    \bidi@mopfn@bottom
-    \vskip\bigskipamount
     \leftskip=\z@
     \rightskip=\z@
+    \parindent=\z@
+    \vskip\skip\footins
     \footnoterule}}
 \newinsert\footinsv@r
 \skip\footinsv@r\bigskipamount
@@ -337,7 +340,9 @@
   \let\@mpRTLfootnotetext\@mptwocolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mptwocol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mptwocol@footgroupv@r}
+  \let\mp@footgroupv@r\@mptwocol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -433,7 +438,9 @@
   \@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}
+  \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}{%
@@ -488,7 +495,9 @@
   \let\@mpRTLfootnotetext\@mpthreecolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mpthreecol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mpthreecol@footgroupv@r}
+  \let\mp@footgroupv@r\@mpthreecol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -578,7 +587,9 @@
   \@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}
+  \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}{%
@@ -632,7 +643,9 @@
   \let\@mpRTLfootnotetext\@mpfourcolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mpfourcol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mpfourcol@footgroupv@r}
+  \let\mp@footgroupv@r\@mpfourcol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@fourcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -728,7 +741,9 @@
   \@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}
+  \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}{%
@@ -783,7 +798,9 @@
   \let\@mpRTLfootnotetext\@mpfivecolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mpfivecol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mpfivecol@footgroupv@r}
+  \let\mp@footgroupv@r\@mpfivecol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@fivecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -879,7 +896,9 @@
   \@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}
+  \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}{%
@@ -934,7 +953,9 @@
   \let\@mpRTLfootnotetext\@mpsixcolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mpsixcol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mpsixcol@footgroupv@r}
+  \let\mp@footgroupv@r\@mpsixcol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@sixcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -1030,7 +1051,9 @@
   \@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}
+  \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}{%
@@ -1085,7 +1108,9 @@
   \let\@mpRTLfootnotetext\@mpsevencolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mpsevencol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mpsevencol@footgroupv@r}
+  \let\mp@footgroupv@r\@mpsevencol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@sevencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -1181,7 +1206,9 @@
   \@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}
+  \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}{%
@@ -1236,7 +1263,9 @@
   \let\@mpRTLfootnotetext\@mpeightcolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mpeightcol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mpeightcol@footgroupv@r}
+  \let\mp@footgroupv@r\@mpeightcol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@eightcolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -1332,7 +1361,9 @@
   \@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}
+  \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}{%
@@ -1387,7 +1418,9 @@
   \let\@mpRTLfootnotetext\@mpninecolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mpninecol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mpninecol@footgroupv@r}
+  \let\mp@footgroupv@r\@mpninecol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@ninecolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -1483,7 +1516,9 @@
   \@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}
+  \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}{%
@@ -1538,7 +1573,9 @@
   \let\@mpRTLfootnotetext\@mptencolRTLfootnotetext
   \@bidi@after@Hy@hyperfootnotes
   \m@make@mptencol@footgroup{v@r}%
-  \let\mp@footgroupv@r\@mptencol@footgroupv@r}
+  \let\mp@footgroupv@r\@mptencol@footgroupv@r
+  \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \bidi@ensure@newcommand{\@tencolfootnotetext}[1]{\insert\footinsv@r{\if@RTL@footnote\@RTLtrue\else\@RTLfalse\fi%
   \def\baselinestretch{\m@m@footnote@spacing}%
   \reset@font\foottextfont
@@ -1634,7 +1671,9 @@
   \@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}
+  \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}{%
@@ -1764,7 +1803,8 @@
    \divide \@tempdima \@tempdimb
    \xdef\footfudgefactor{\strip@pt\@tempdima}%
    \endgroup
-  }
+   \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth
+}
 \let\bidi@xparaskip\relax
 \@onlypreamble\AddExtraParaSkip
 \bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{%
@@ -1893,7 +1933,8 @@
    \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}{
@@ -1946,7 +1987,7 @@
   \noindent\unhbox0\par}}
 \bidi@ensure@newcommand{\m@make@para@footstart}[1]{%
 \@namedef{@para@footstart#1}{%
-  \vskip\bigskipamount
+  \bidi@mopfn@bottom
   \leftskip=\z@
   \rightskip=\z@
   \parindent=\z@