bidi (11oct18)

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

4 files changed, 38 insertions, 38 deletions

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 859936cd78b..9e1661d7fc1 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.6, 2018/10/08
+* v34.8, 2018/10/11
 * 
 * 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 951f1075422..bb57709f8a4 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.6}}
+\large User documentation for \textcolor{blue!65!black}{version 34.8}}
  \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.6}}
+User documentation for \textcolor{blue!65!black}{version 34.8}}
 
 \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 304988433ad..2458ef85bb5 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.6 of the bidi
+  pdftitle={User documentation for version 34.8 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 78a15bfd96e..ebe8556d75b 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.6
+v34.8
 
 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/08
+Current version release date: 2018/10/11
 
 ___________________
 Vafa Khalighi
@@ -242,7 +242,7 @@ by Vafa Khalighi.
 \documentclass{ltxdoc}
 \input{bidi-doc-preamble.ltx}
 \hypersetup{%
-  pdftitle={Source documentation for version 34.6 of the bidi
+  pdftitle={Source documentation for version 34.8 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.6}}
+%\large Source documentation for \textcolor{blue!65!black}{version 34.8}}
 % \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.6}}
+%Source documentation for \textcolor{blue!65!black}{version 34.8}}
 %
 %\vskip 0pt plus 3fill
 %\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -338,7 +338,7 @@ by Vafa Khalighi.
 %\iffalse
 %<*table>
 %\fi
-%% \CheckSum{49977}
+%% \CheckSum{49969}
 %% \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/08}
-\def\bidi@version{34.6}
+\def\bididate{2018/10/11}
+\def\bidi@version{34.8}
 \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\@bidi@info{****************************************************^^J%
@@ -2037,7 +2037,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 }
 \newcommand*{\@bidi@pdfcustomproperties}{%
   This is the bidi package, Version \bidi@version,
-  Released October 8, 2018. 
+  Released October 11, 2018. 
 }
 \@RTLmainfalse
 \AtBeginDocument{%
@@ -2276,9 +2276,9 @@ Bidirectional typesetting in plain TeX and LaTeX]
 %\fi
 % \section{File \texttt{bidi.tex}}
 %    \begin{macrocode}
-\def\bididate{2018/10/08}
+\def\bididate{2018/10/11}
 \catcode`@=11
-\def\bidi@version{34.6}
+\def\bidi@version{34.8}
 \let \protect \relax
 \newlinechar`\^^J
 \edef\@bidi@info{****************************************************^^J%
@@ -2377,7 +2377,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 }
 \def\@bidi@pdfcustomproperties{%
   This is the bidi package, Version \bidi@version,
-  Released October 8, 2018. 
+  Released October 11, 2018. 
 }
 \def\bidi@pdfm@mark{%
   \special{pdf:%
@@ -9545,7 +9545,7 @@ bidi implementation of tufte title]
 %\fi
 % \section{File \texttt{extrafootnotefeatures-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/10/08 v1.6 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/10/11 v1.7 bidi extra footnote features for XeTeX engine]
 \newif\if@bidi@void@footins
 \newif\if@bidi@void@@mpfootins
 \newcommand*{\@bidi@before@Hy@hyperfootnotes}{%
@@ -11178,7 +11178,9 @@ bidi implementation of tufte title]
   \noindent\unhbox0\par}}
 \bidi@ensure@newcommand{\m@make@para@footstart}[1]{%
 \@namedef{@para@footstart#1}{%
-  \bidi@mopfn@bottom
+  \if@bidi@void@footins
+    \bidi@mopfn@bottom
+  \fi
   \leftskip=\z@
   \rightskip=\z@
   \parindent=\z@
@@ -11188,7 +11190,6 @@ bidi implementation of tufte title]
   \fi}}
 \bidi@ensure@newcommand{\bidi@make@para@footstart@@}[1]{%
 \@namedef{@@para@footstart@@#1}{%
-  \bidi@mopfn@bottom
   \leftskip=\z@
   \rightskip=\z@
   \parindent=\z@
@@ -21754,7 +21755,7 @@ to\rtside{\box\bslice\hfil}}
 %\fi
 % \section{File \texttt{latex-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{latex-xetex-bidi.def}[2018/09/23 v1.3.5 bidi adaptations  for `latex.ltx' for XeTeX engine]
+\ProvidesFile{latex-xetex-bidi.def}[2018/10/11 v1.3.6 bidi adaptations  for `latex.ltx' for XeTeX engine]
 \newcommand{\TeXXeTOn}{\TeXXeTstate\@ne}
 \newcommand{\TeXXeTOff}{\TeXXeTstate\z@}
 \TeXXeTOn
@@ -22236,7 +22237,22 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \newcommand{\RTLdblcol}{\renewcommand{\@outputdblcol}{\RTL@outputdblcol}}
 \newcommand{\LTRdblcol}{\renewcommand{\@outputdblcol}{\LTR@outputdblcol}}
 
-\gdef \@makecol {%
+\bidi@patchcmd\@makecol{%
+   \ifvoid\footins
+     \setbox\@outputbox \box\@cclv
+   \else
+     \setbox\@outputbox \vbox {%
+       \boxmaxdepth \@maxdepth
+       \unvbox \@cclv
+       \vskip \skip\footins
+       \color@begingroup
+         \normalcolor
+         \footnoterule
+         \unvbox \footins
+       \color@endgroup
+       }%
+   \fi
+}{%
    \ifvoid\footins
      \ifvoid\@bidi@copyins@
        \setbox\@outputbox \box\@cclv
@@ -22271,23 +22287,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
        \fi
        }%
    \fi
-   \let\@elt\relax
-   \xdef\@freelist{\@freelist\@midlist}%
-   \global \let \@midlist \@empty
-   \@combinefloats
-   \ifvbox\@kludgeins
-     \@makespecialcolbox
-   \else
-     \setbox\@outputbox \vbox to\@colht {%
-       \@texttop
-       \dimen@ \dp\@outputbox
-       \unvbox \@outputbox
-       \vskip -\dimen@
-       \@textbottom
-       }%
-   \fi
-   \global \maxdepth \@maxdepth
-}
+}{}{}
 
 \def\LTRmarginpar{%
   \ifhmode