summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-10 21:32:55 +0000
committerKarl Berry <karl@freefriends.org>2016-05-10 21:32:55 +0000
commit2bdc503b5e600981a5e34b591b90015d7485d086 (patch)
treeacca040d207ffcf1cace1db445b04bf9e365a33d /Master
parent54f636c57e0099a927e9c6093e67c97562a011a7 (diff)
bidi (10may16)
git-svn-id: svn://tug.org/texlive/trunk@41016 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/xelatex/bidi/README4
-rw-r--r--Master/texmf-dist/doc/xelatex/bidi/bidi.pdfbin3143799 -> 3170179 bytes
-rw-r--r--Master/texmf-dist/source/xelatex/bidi/bidi.dtx494
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/animate-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidi-longtable.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidi.sty6
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidi.tex2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidicode.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/biditools.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def118
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def72
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def137
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def114
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def40
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def2
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def2
125 files changed, 791 insertions, 426 deletions
diff --git a/Master/texmf-dist/doc/xelatex/bidi/README b/Master/texmf-dist/doc/xelatex/bidi/README
index 69e3de1fa09..f0d6dca522e 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/README
+++ b/Master/texmf-dist/doc/xelatex/bidi/README
@@ -1,6 +1,6 @@
___________________
The bidi package
-v19.4
+v19.5
This package provides a convenient interface for typesetting
bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -17,7 +17,7 @@ In doing so, please always explain your issue well enough, always include
a minimal working example showing the issue, and always choose the appropriate
label for your query (i.e. if you are reporting any bugs, choose `Bug' label).
-Current version release date: 2016/05/09
+Current version release date: 2016/05/10
___________________
Vafa Khalighi
diff --git a/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf b/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf
index 43de7212156..e86ebbb3ef0 100644
--- a/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf
+++ b/Master/texmf-dist/doc/xelatex/bidi/bidi.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
index 7e28f0781c9..cf614a6080a 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
-v19.4
+v19.5
This package provides a convenient interface for typesetting
bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -25,7 +25,7 @@ a minimal working example showing the issue, and always choose the appropriate
label for your query (i.e. if you are reporting any bugs, choose `Bug' label).
-Current version release date: 2016/05/09
+Current version release date: 2016/05/10
___________________
Vafa Khalighi
@@ -322,7 +322,7 @@ by Vafa Khalighi.
%\changes{v13.9}{2013/09/23}{Added implementaion of the package.}
% \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
%\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-%\large Documentation for \textcolor{blue!65!black}{version 19.4}}
+%\large Documentation for \textcolor{blue!65!black}{version 19.5}}
% \author{Vafa Khalighi\\
% \url{persian-tex@tug.org}}
%\setcounter{page}{0}
@@ -333,7 +333,7 @@ by Vafa Khalighi.
%\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
%
%\Large
-%Documentation for \textcolor{blue!65!black}{version 19.4}}
+%Documentation for \textcolor{blue!65!black}{version 19.5}}
%
%\vskip 0pt plus 3fill
%\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -384,7 +384,7 @@ by Vafa Khalighi.
%*
%* Copyright (c) 2009--2016 Vafa Khalighi
%*
-%* 2016/05/09, v19.4
+%* 2016/05/10, v19.5
%*
%* License: LaTeX Project Public License, version
%* 1.3c or higher (your choice)
@@ -1141,7 +1141,7 @@ by Vafa Khalighi.
%\iffalse
%<*table>
%\fi
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
@@ -2984,8 +2984,8 @@ by Vafa Khalighi.
% \subsection{\textsf{bidi.sty}}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\def\bididate{2016/05/09}
-\def\bidiversion{v19.4}
+\def\bididate{2016/05/10}
+\def\bidiversion{v19.5}
\ProvidesPackage{bidi}[\bididate\space \bidiversion\space
Bidirectional typesetting in plain TeX and LaTeX]
\edef\@bidi@info{****************************************************^^J%
@@ -8135,20 +8135,40 @@ bidi implementation of tufte title]
%\fi
% \subsection{\textsf{cuted-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{cuted-xetex-bidi.def}[2013/04/10 v0.3 bidi adaptations for cuted package for XeTeX engine]
+\ProvidesFile{cuted-xetex-bidi.def}[2016/05/10 v0.4 bidi adaptations for cuted package for XeTeX engine]
+
\def\RTL@outputdblcol{%
-\if@firstcolumn \global\@firstcolumnfalse
-\global\setbox\@leftcolumn \box\@outputbox
- \else
- \global\@firstcolumntrue
-\setbox\@outputbox \vbox {\hbox to\textwidth {%
-\hskip \columnwidth
-\hfil \vrule width\columnseprule \hfil
-\hbox to\columnwidth {\box\@leftcolumn \hss}%
-\hskip -\textwidth
-\hbox to\columnwidth{\box\@outputbox \hss}%
-\hskip \columnsep
-\hskip \columnwidth }}%
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hskip \columnwidth
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hskip -\textwidth
+ \hb@xt@\columnwidth{\box\@outputbox \hss}%
+ \hskip \columnsep
+ \hskip \columnwidth }}%
\ifvoid\hold@viper
\else
\setbox\@outputbox \vbox to\textheight{%
@@ -8157,10 +8177,14 @@ bidi implementation of tufte title]
\vss
}%
\fi
-\@combinedblfloats \@outputpage
-\begingroup \@dblfloatplacement \@startdblcolumn
-\@whilesw\if@fcolmade \fi
-{\@outputpage \@startdblcolumn }%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
\ifvoid\@viper
\else
\global\setbox\@viper\vbox{%
@@ -8169,25 +8193,37 @@ bidi implementation of tufte title]
}%
\@viperoutput
\fi
-\endgroup
-\fi}
+ \endgroup
+ \fi}%
+
\def\LTR@outputdblcol{%
\if@firstcolumn
- \global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
- \else
- \global\@firstcolumntrue
- \setbox\@outputbox \vbox {%
- \hb@xt@\textwidth {%
- \hb@xt@\columnwidth {%
- \box\@leftcolumn \hss}%
- \hfil
- \vrule \@width\columnseprule
- \hfil
- \hb@xt@\columnwidth {%
- \box\@outputbox \hss}%
- }%
- }%
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
\ifvoid\hold@viper
\else
\setbox\@outputbox \vbox to\textheight{%
@@ -8196,14 +8232,14 @@ bidi implementation of tufte title]
\vss
}%
\fi
- \@combinedblfloats
+ \@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
\@startdblcolumn
- \@whilesw\if@fcolmade \fi
- {\@outputpage
- \@startdblcolumn}%
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
\ifvoid\@viper
\else
\global\setbox\@viper\vbox{%
@@ -8213,8 +8249,9 @@ bidi implementation of tufte title]
\@viperoutput
\fi
\endgroup
- \fi
- }
+ \fi}%
+
+
\def \@addviper {%
\if@firstcolumn
\@insertfalse
@@ -9525,7 +9562,7 @@ bidi implementation of tufte title]
%\fi
% \subsection{\textsf{extrafootnotefeatures-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2016/05/09 v0.9 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2016/05/10 v1 bidi extra footnote features for XeTeX engine]
\let\autofootnoterule\relax
\let\rightfootnoterule\relax
\let\leftfootnoterule\relax
@@ -9652,6 +9689,8 @@ bidi implementation of tufte title]
\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}}
\bidi@ensure@newcommand{\footfootmark}{%
\ifdim\footmarkwidth < \z@
\llap{\hb@xt@ -\footmarkwidth{%
@@ -9664,7 +9703,33 @@ bidi implementation of tufte title]
\hb@xt@\footmarkwidth{\hss\normalfont\footscript{\@thefnmark}}%
\fi
\fi}
+\bidi@ensure@newcommand{\LTRfootfootmark}{%
+ \ifdim\footmarkwidth < \z@
+ \llap{\hb@xt@ -\footmarkwidth{%
+ \hss\normalfont\LTRfootscript{\@thefnmark}}%
+ \hspace*{-\footmarkwidth}}%
+ \else
+ \ifdim\footmarkwidth = \z@
+ {\normalfont\LTRfootscript{\@thefnmark}}%
+ \else
+ \hb@xt@\footmarkwidth{\hss\normalfont\LTRfootscript{\@thefnmark}}%
+ \fi
+ \fi}
+\bidi@ensure@newcommand{\RTLfootfootmark}{%
+ \ifdim\footmarkwidth < \z@
+ \llap{\hb@xt@ -\footmarkwidth{%
+ \hss\normalfont\RTLfootscript{\@thefnmark}}%
+ \hspace*{-\footmarkwidth}}%
+ \else
+ \ifdim\footmarkwidth = \z@
+ {\normalfont\RTLfootscript{\@thefnmark}}%
+ \else
+ \hb@xt@\footmarkwidth{\hss\normalfont\RTLfootscript{\@thefnmark}}%
+ \fi
+ \fi}
\footmarkstyle{\textsuperscript{#1}}
+\LTRfootmarkstyle{\textsuperscript{#1}}
+\RTLfootmarkstyle{\textsuperscript{#1}}
\setlength{\footmarkwidth}{1em plus.4em minus.4em}
\setlength{\footparindent}{1em}
\bidi@ensure@newcommand{\m@mdoextrafeet}{\extrafeetins}
@@ -9795,10 +9860,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@twocolLTRfootfmt}[1]{%
\@preamtwofmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@twocolRTLfootfmt}[1]{%
\@preamtwofmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -9941,10 +10006,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@threecolLTRfootfmt}[1]{%
\@preamthreefmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@threecolRTLfootfmt}[1]{%
\@preamthreefmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -10086,10 +10151,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fourcolLTRfootfmt}[1]{%
\@preamfourfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fourcolRTLfootfmt}[1]{%
\@preamfourfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -10235,10 +10300,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fivecolLTRfootfmt}[1]{%
\@preamfivefmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fivecolRTLfootfmt}[1]{%
\@preamfivefmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -10384,10 +10449,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sixcolLTRfootfmt}[1]{%
\@preamsixfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sixcolRTLfootfmt}[1]{%
\@preamsixfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -10533,10 +10598,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sevencolLTRfootfmt}[1]{%
\@preamsevenfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sevencolRTLfootfmt}[1]{%
\@preamsevenfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -10682,10 +10747,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@eightcolLTRfootfmt}[1]{%
\@preameightfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@eightcolRTLfootfmt}[1]{%
\@preameightfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -10831,10 +10896,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@ninecolLTRfootfmt}[1]{%
\@preamninefmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@ninecolRTLfootfmt}[1]{%
\@preamninefmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -10980,10 +11045,10 @@ bidi implementation of tufte title]
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@tencolLTRfootfmt}[1]{%
\@preamtenfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@tencolRTLfootfmt}[1]{%
\@preamtenfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -11180,11 +11245,11 @@ bidi implementation of tufte title]
\bidi@ensure@newcommand{\@paraLTRfootfmt}[1]{%
\parindent=\z@
\parfillskip=0pt \@plus 1fil
- {\footfootmark\strut {\LTRfoottextfont #1}\penalty-10}}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\penalty-10}}
\bidi@ensure@newcommand{\@paraRTLfootfmt}[1]{%
\parindent=\z@
\parfillskip=0pt \@plus 1fil
- {\footfootmark\strut {\RTLfoottextfont #1}\penalty-10}}
+ {\RTLfootfootmark\strut {\RTLfoottextfont #1}\penalty-10}}
\bidi@ensure@newcommand{\@mpparafootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\let\bidi@RTL@everypar\@empty%
@@ -12422,51 +12487,100 @@ bidi implementation of tufte title]
%\fi
% \subsection{\textsf{ftnright-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{ftnright-xetex-bidi.def}[2013/04/10 v0.3 bidi adaptations for ftnright package for XeTeX engine]
-\def\LTR@outputdblcol{\if@firstcolumn
- \global\@firstcolumnfalse
- \global\setbox\@leftcolumn\box\@outputbox
- \global\count\footins\@m
- \global\skip\footins\rcol@footinsskip
- \else \preparefootins
- \global\@firstcolumntrue
- \setbox\@outputbox\vbox{\hbox to\textwidth
- {\hbox to\columnwidth
- {\box\@leftcolumn\hss}%
- \hfil\vrule\@width\columnseprule\hfil
- \hbox to\columnwidth
- {\box\@outputbox\hss}}}%
- \@combinedblfloats\@outputpage
- \begingroup
- \@dblfloatplacement\@startdblcolumn
- \@whilesw\if@fcolmade\fi
- {\@outputpage\@startdblcolumn}%
- \endgroup
- \fi}
- \def\RTL@outputdblcol{\if@firstcolumn
- \global\@firstcolumnfalse
- \global\setbox\@leftcolumn\box\@outputbox
- \global\count\footins\@m
- \global\skip\footins\rcol@footinsskip
- \else \preparefootins
- \global\@firstcolumntrue
- \setbox\@outputbox\vbox{\hbox to\textwidth
- {\hskip \columnwidth
- \hfil \vrule width\columnseprule \hfil
- \hbox to\columnwidth
- {\box\@leftcolumn\hss}%
- \hskip -\textwidth
- \hbox to\columnwidth
- {\box\@outputbox\hss}
- \hskip \columnsep
- \hskip \columnwidth}}%
- \@combinedblfloats\@outputpage
- \begingroup
- \@dblfloatplacement\@startdblcolumn
- \@whilesw\if@fcolmade\fi
- {\@outputpage\@startdblcolumn}%
- \endgroup
- \fi}
+\ProvidesFile{ftnright-xetex-bidi.def}[2016/05/10 v0.4 bidi adaptations for ftnright package for XeTeX engine]
+
+\def\LTR@outputdblcol{%
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \global\count\footins\@m
+ \global\skip\footins\rcol@footinsskip
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \preparefootins
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
+ \endgroup
+ \fi}%
+
+
+
+\def\RTL@outputdblcol{%
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \global\count\footins\@m
+ \global\skip\footins\rcol@footinsskip
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \preparefootins
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hskip \columnwidth
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hskip -\textwidth
+ \hb@xt@\columnwidth{\box\@outputbox \hss}%
+ \hskip \columnsep
+ \hskip \columnwidth }}%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
+ \endgroup
+ \fi}%
+
+
+
\let\leftfootnoterule\@empty
\let\rightfootnoterule\@empty
\let\textwidthfootnoterule\@empty
@@ -14978,11 +15092,26 @@ bidi implementation of tufte title]
%\fi
% \subsection{\textsf{midfloat-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{midfloat-xetex-bidi.def}[2013/04/10 v0.2 bidi adaptations for midfloat package for XeTeX engine]
+\ProvidesFile{midfloat-xetex-bidi.def}[2016/05/10 v0.3 bidi adaptations for midfloat package for XeTeX engine]
\def\RTL@outputdblcol{%
\if@firstcolumn
\global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
\global\c@colht\@colht\global\c@addvipersep\z@
\ifnum\juo@sk>0
\remove@strip\juo@sar
@@ -15046,6 +15175,7 @@ bidi implementation of tufte title]
\hskip\columnsep}%
}%
\@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
@@ -15064,7 +15194,22 @@ bidi implementation of tufte title]
\def\LTR@outputdblcol{%
\if@firstcolumn
\global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
\global\c@colht\@colht\global\c@addvipersep\z@
\ifnum\juo@sk>0
\remove@strip\juo@sar
@@ -15125,6 +15270,7 @@ bidi implementation of tufte title]
}%
}%
\@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
@@ -20340,7 +20486,7 @@ to\rtside{\box\bslice\hfil}}
%\fi
% \subsection{\textsf{latex-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{latex-xetex-bidi.def}[2015/11/14 v1.2.4 bidi adaptations for `latex.ltx' for XeTeX engine]
+\ProvidesFile{latex-xetex-bidi.def}[2016/05/10 v1.2.5 bidi adaptations for `latex.ltx' for XeTeX engine]
\newcommand{\TeXXeTOn}{\TeXXeTstate=1 }
\newcommand{\TeXXeTOff}{\TeXXeTstate=0 }
\TeXXeTOn
@@ -20681,51 +20827,91 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\hb@xt@\@pnumwidth{{\hfil\normalfont \normalcolor #5}}%
\par}%
\fi}
+
+
\def\RTL@outputdblcol{%
-\if@firstcolumn \global\@firstcolumnfalse
-\global\setbox\@leftcolumn \box\@outputbox
-\else \global\@firstcolumntrue
-\setbox\@outputbox \vbox {\hbox to\textwidth {%
-\hskip \columnwidth
-\hfil \vrule width\columnseprule \hfil
-\hbox to\columnwidth {\box\@leftcolumn \hss}%
-\hskip -\textwidth
-\hbox to\columnwidth{\box\@outputbox \hss}%
-\hskip \columnsep
-\hskip \columnwidth }}%
-\@combinedblfloats \@outputpage
-\begingroup \@dblfloatplacement \@startdblcolumn
-\@whilesw\if@fcolmade \fi
-{\@outputpage \@startdblcolumn }\endgroup
-\fi}
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hskip \columnwidth
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hskip -\textwidth
+ \hb@xt@\columnwidth{\box\@outputbox \hss}%
+ \hskip \columnsep
+ \hskip \columnwidth }}%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
+ \endgroup
+ \fi}%
+
\def\LTR@outputdblcol{%
\if@firstcolumn
- \global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
\else
- \global \@firstcolumntrue
- \setbox\@outputbox \vbox {%
- \hb@xt@\textwidth {%
- \hb@xt@\columnwidth {%
- \box\@leftcolumn \hss}%
- \hfil
- {\normalcolor\vrule \@width\columnseprule}%
- \hfil
- \hb@xt@\columnwidth {%
- \box\@outputbox \hss}%
- }%
- }%
- \@combinedblfloats
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
+ \@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
\@startdblcolumn
- \@whilesw\if@fcolmade \fi
- {\@outputpage
- \@startdblcolumn}%
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
\endgroup
- \fi
-}
+ \fi}%
+
+
\renewcommand{\@outputdblcol}{\if@RTLmain\RTL@outputdblcol\else\LTR@outputdblcol\fi}
\newcommand{\RTLdblcol}{\renewcommand{\@outputdblcol}{\RTL@outputdblcol}}
\newcommand{\LTRdblcol}{\renewcommand{\@outputdblcol}{\LTR@outputdblcol}}
diff --git a/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def
index e4a9442d1b4..a6e8e46e536 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def
index 2e28664022e..6acb3875114 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def
index 33c57a64243..a428b08943b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def
index a847835db04..89aacf176c4 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def
index 28af32a5f31..3ad0929365a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def
index 0414a583f8f..c1d6334a23a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def
index a06140fd421..05a8e8a3cdc 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/animate-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/animate-xetex-bidi.def
index e4d6ffa3623..c52bb180451 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/animate-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/animate-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def
index 880581419b6..3be7968fd5c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def
index 7769de09aad..42f271008f6 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def
index 00113e0a2c3..ffc60c5e90b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def
index a91d8e0b779..1a3de4e0bb3 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def
index 04f288b6881..f84f819a629 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def
index 6ca37374728..5792bedc993 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi-longtable.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi-longtable.sty
index 4f9bccae8fe..26fb34c851e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi-longtable.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi-longtable.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty
index d39fbd27d98..69ec50955db 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
index ac199284ad6..4f81430c514 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
@@ -35,8 +35,8 @@
%% Right brace \} Tilde \~}
%%
\NeedsTeXFormat{LaTeX2e}
-\def\bididate{2016/05/09}
-\def\bidiversion{v19.4}
+\def\bididate{2016/05/10}
+\def\bidiversion{v19.5}
\ProvidesPackage{bidi}[\bididate\space \bidiversion\space
Bidirectional typesetting in plain TeX and LaTeX]
\edef\@bidi@info{****************************************************^^J%
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.tex b/Master/texmf-dist/tex/xelatex/bidi/bidi.tex
index 05309232555..2e5b31b4eac 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi.tex
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.tex
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty
index ecf26b77117..c8965bc2d98 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
index 8a49f9d56ae..ccf12d49f03 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty
index 2a38156850f..1b25dfc109a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
index 5354ac1c186..31c20602727 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
index dc86f31175c..4948985e86c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditools.sty b/Master/texmf-dist/tex/xelatex/bidi/biditools.sty
index 328b19d9a2d..bf0dbb0cda8 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/biditools.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/biditools.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls b/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls
index 3c110576c36..666a0e8dd30 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls
+++ b/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls b/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls
index e1ef44da848..f406617ee74 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls
+++ b/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty
index 92b13f61dac..39cca5268a6 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty
index 5604bd2a6b3..7425c6dcace 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty
index 5513d5483cf..13bdcfbe3cc 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty
index 4ed0f353d11..b5700732dd1 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty
index a8aab9e2736..edbd1e64e8b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty
index 1831106842e..c526654fe9f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def
index 7b7b8d6c460..46dbb95c094 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def
index d5752f320f9..7706c211cb2 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def
index e6132f60897..de85c11f59a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def
index 3296c3e988b..4ea37613a10 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def
index f910b93e375..5f45cb3b753 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def
index 2b5c0145524..d285b5b055e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def
index 26c90839152..4ddf36b2969 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def
index 71b78c42f06..0a99a8516c9 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def
index d1f242e28e8..f6f545f339a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def
index 127893f5636..b00013e8a62 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def
index 0186db90a0d..3fc15d8351c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def
index a1e3e31089b..11a25a26141 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def
index 14a12aeeaa2..d4b27ee5458 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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,20 +34,40 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-\ProvidesFile{cuted-xetex-bidi.def}[2013/04/10 v0.3 bidi adaptations for cuted package for XeTeX engine]
+\ProvidesFile{cuted-xetex-bidi.def}[2016/05/10 v0.4 bidi adaptations for cuted package for XeTeX engine]
+
\def\RTL@outputdblcol{%
-\if@firstcolumn \global\@firstcolumnfalse
-\global\setbox\@leftcolumn \box\@outputbox
- \else
- \global\@firstcolumntrue
-\setbox\@outputbox \vbox {\hbox to\textwidth {%
-\hskip \columnwidth
-\hfil \vrule width\columnseprule \hfil
-\hbox to\columnwidth {\box\@leftcolumn \hss}%
-\hskip -\textwidth
-\hbox to\columnwidth{\box\@outputbox \hss}%
-\hskip \columnsep
-\hskip \columnwidth }}%
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hskip \columnwidth
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hskip -\textwidth
+ \hb@xt@\columnwidth{\box\@outputbox \hss}%
+ \hskip \columnsep
+ \hskip \columnwidth }}%
\ifvoid\hold@viper
\else
\setbox\@outputbox \vbox to\textheight{%
@@ -56,10 +76,14 @@
\vss
}%
\fi
-\@combinedblfloats \@outputpage
-\begingroup \@dblfloatplacement \@startdblcolumn
-\@whilesw\if@fcolmade \fi
-{\@outputpage \@startdblcolumn }%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
\ifvoid\@viper
\else
\global\setbox\@viper\vbox{%
@@ -68,25 +92,37 @@
}%
\@viperoutput
\fi
-\endgroup
-\fi}
+ \endgroup
+ \fi}%
+
\def\LTR@outputdblcol{%
\if@firstcolumn
- \global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
- \else
- \global\@firstcolumntrue
- \setbox\@outputbox \vbox {%
- \hb@xt@\textwidth {%
- \hb@xt@\columnwidth {%
- \box\@leftcolumn \hss}%
- \hfil
- \vrule \@width\columnseprule
- \hfil
- \hb@xt@\columnwidth {%
- \box\@outputbox \hss}%
- }%
- }%
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
\ifvoid\hold@viper
\else
\setbox\@outputbox \vbox to\textheight{%
@@ -95,14 +131,14 @@
\vss
}%
\fi
- \@combinedblfloats
+ \@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
\@startdblcolumn
- \@whilesw\if@fcolmade \fi
- {\@outputpage
- \@startdblcolumn}%
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
\ifvoid\@viper
\else
\global\setbox\@viper\vbox{%
@@ -112,8 +148,8 @@
\@viperoutput
\fi
\endgroup
- \fi
- }
+ \fi}%
+
\def \@addviper {%
\if@firstcolumn
\@insertfalse
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def
index 9188f25a8c4..bf3dc9e0e34 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
index 4d683d924ac..091455d508c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty
index 3f47158822a..47c26fbfa06 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def
index 34bc2fb1325..c7dfc552f29 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def
index 1ca50ee239d..83494d8c900 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def
index 91816868aeb..56798632204 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def
index 44443b0e5f5..58c693d7721 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def
index cba468a735c..cbe8d14fbd5 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def
index fadec2f3374..956c50ab525 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def
index f81f9aa44f6..0b8bee0dc8b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
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 c2d6f521c8d..cb8cfc2f9d9 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{46457}
+%% \CheckSum{46913}
%% \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/09 v0.9 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2016/05/10 v1 bidi extra footnote features for XeTeX engine]
\let\autofootnoterule\relax
\let\rightfootnoterule\relax
\let\leftfootnoterule\relax
@@ -161,6 +161,8 @@
\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}}
\bidi@ensure@newcommand{\footfootmark}{%
\ifdim\footmarkwidth < \z@
\llap{\hb@xt@ -\footmarkwidth{%
@@ -173,7 +175,33 @@
\hb@xt@\footmarkwidth{\hss\normalfont\footscript{\@thefnmark}}%
\fi
\fi}
+\bidi@ensure@newcommand{\LTRfootfootmark}{%
+ \ifdim\footmarkwidth < \z@
+ \llap{\hb@xt@ -\footmarkwidth{%
+ \hss\normalfont\LTRfootscript{\@thefnmark}}%
+ \hspace*{-\footmarkwidth}}%
+ \else
+ \ifdim\footmarkwidth = \z@
+ {\normalfont\LTRfootscript{\@thefnmark}}%
+ \else
+ \hb@xt@\footmarkwidth{\hss\normalfont\LTRfootscript{\@thefnmark}}%
+ \fi
+ \fi}
+\bidi@ensure@newcommand{\RTLfootfootmark}{%
+ \ifdim\footmarkwidth < \z@
+ \llap{\hb@xt@ -\footmarkwidth{%
+ \hss\normalfont\RTLfootscript{\@thefnmark}}%
+ \hspace*{-\footmarkwidth}}%
+ \else
+ \ifdim\footmarkwidth = \z@
+ {\normalfont\RTLfootscript{\@thefnmark}}%
+ \else
+ \hb@xt@\footmarkwidth{\hss\normalfont\RTLfootscript{\@thefnmark}}%
+ \fi
+ \fi}
\footmarkstyle{\textsuperscript{#1}}
+\LTRfootmarkstyle{\textsuperscript{#1}}
+\RTLfootmarkstyle{\textsuperscript{#1}}
\setlength{\footmarkwidth}{1em plus.4em minus.4em}
\setlength{\footparindent}{1em}
\bidi@ensure@newcommand{\m@mdoextrafeet}{\extrafeetins}
@@ -304,10 +332,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@twocolLTRfootfmt}[1]{%
\@preamtwofmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@twocolRTLfootfmt}[1]{%
\@preamtwofmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -450,10 +478,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@threecolLTRfootfmt}[1]{%
\@preamthreefmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@threecolRTLfootfmt}[1]{%
\@preamthreefmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -595,10 +623,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fourcolLTRfootfmt}[1]{%
\@preamfourfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fourcolRTLfootfmt}[1]{%
\@preamfourfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -744,10 +772,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fivecolLTRfootfmt}[1]{%
\@preamfivefmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@fivecolRTLfootfmt}[1]{%
\@preamfivefmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -893,10 +921,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sixcolLTRfootfmt}[1]{%
\@preamsixfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sixcolRTLfootfmt}[1]{%
\@preamsixfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -1042,10 +1070,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sevencolLTRfootfmt}[1]{%
\@preamsevenfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@sevencolRTLfootfmt}[1]{%
\@preamsevenfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -1191,10 +1219,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@eightcolLTRfootfmt}[1]{%
\@preameightfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@eightcolRTLfootfmt}[1]{%
\@preameightfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -1340,10 +1368,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@ninecolLTRfootfmt}[1]{%
\@preamninefmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@ninecolRTLfootfmt}[1]{%
\@preamninefmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -1489,10 +1517,10 @@
{\footfootmark\strut {\foottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@tencolLTRfootfmt}[1]{%
\@preamtenfmt
- {\footfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\strut\par}\allowbreak}
\bidi@ensure@newcommand{\@tencolRTLfootfmt}[1]{%
\@preamtenfmt
- {\footfootmark\strut {\RTLfoottextfont #1}\strut\par}\allowbreak}
+ {\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
@@ -1689,11 +1717,11 @@
\bidi@ensure@newcommand{\@paraLTRfootfmt}[1]{%
\parindent=\z@
\parfillskip=0pt \@plus 1fil
- {\footfootmark\strut {\LTRfoottextfont #1}\penalty-10}}
+ {\LTRfootfootmark\strut {\LTRfoottextfont #1}\penalty-10}}
\bidi@ensure@newcommand{\@paraRTLfootfmt}[1]{%
\parindent=\z@
\parfillskip=0pt \@plus 1fil
- {\footfootmark\strut {\RTLfoottextfont #1}\penalty-10}}
+ {\RTLfootfootmark\strut {\RTLfoottextfont #1}\penalty-10}}
\bidi@ensure@newcommand{\@mpparafootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\let\bidi@RTL@everypar\@empty%
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def
index a7c6f9340fc..d5796804075 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def
index 5c95cb76a95..f69ef886f84 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def
index 5dcf7d44c2c..addc607d122 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def
index bd44822e2be..10132e200af 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def
index 620e5ce7c1f..3b7eb87df80 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def
index 8b64d5a95fc..593bd89f57e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def
index 93958d7ef1e..1df0e283a24 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def
index f7655cac789..c82810b55c7 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def
index b06a6b03922..c2f92481061 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def
index efb434e3569..6b7c92a7936 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def
index c07895b4ec3..9a10f0e645b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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,51 +34,96 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-\ProvidesFile{ftnright-xetex-bidi.def}[2013/04/10 v0.3 bidi adaptations for ftnright package for XeTeX engine]
-\def\LTR@outputdblcol{\if@firstcolumn
- \global\@firstcolumnfalse
- \global\setbox\@leftcolumn\box\@outputbox
- \global\count\footins\@m
- \global\skip\footins\rcol@footinsskip
- \else \preparefootins
- \global\@firstcolumntrue
- \setbox\@outputbox\vbox{\hbox to\textwidth
- {\hbox to\columnwidth
- {\box\@leftcolumn\hss}%
- \hfil\vrule\@width\columnseprule\hfil
- \hbox to\columnwidth
- {\box\@outputbox\hss}}}%
- \@combinedblfloats\@outputpage
- \begingroup
- \@dblfloatplacement\@startdblcolumn
- \@whilesw\if@fcolmade\fi
- {\@outputpage\@startdblcolumn}%
- \endgroup
- \fi}
- \def\RTL@outputdblcol{\if@firstcolumn
- \global\@firstcolumnfalse
- \global\setbox\@leftcolumn\box\@outputbox
- \global\count\footins\@m
- \global\skip\footins\rcol@footinsskip
- \else \preparefootins
- \global\@firstcolumntrue
- \setbox\@outputbox\vbox{\hbox to\textwidth
- {\hskip \columnwidth
- \hfil \vrule width\columnseprule \hfil
- \hbox to\columnwidth
- {\box\@leftcolumn\hss}%
- \hskip -\textwidth
- \hbox to\columnwidth
- {\box\@outputbox\hss}
- \hskip \columnsep
- \hskip \columnwidth}}%
- \@combinedblfloats\@outputpage
- \begingroup
- \@dblfloatplacement\@startdblcolumn
- \@whilesw\if@fcolmade\fi
- {\@outputpage\@startdblcolumn}%
- \endgroup
- \fi}
+\ProvidesFile{ftnright-xetex-bidi.def}[2016/05/10 v0.4 bidi adaptations for ftnright package for XeTeX engine]
+
+\def\LTR@outputdblcol{%
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \global\count\footins\@m
+ \global\skip\footins\rcol@footinsskip
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \preparefootins
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
+ \endgroup
+ \fi}%
+
+\def\RTL@outputdblcol{%
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \global\count\footins\@m
+ \global\skip\footins\rcol@footinsskip
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \preparefootins
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hskip \columnwidth
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hskip -\textwidth
+ \hb@xt@\columnwidth{\box\@outputbox \hss}%
+ \hskip \columnsep
+ \hskip \columnwidth }}%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
+ \endgroup
+ \fi}%
+
\let\leftfootnoterule\@empty
\let\rightfootnoterule\@empty
\let\textwidthfootnoterule\@empty
diff --git a/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def
index 62931aada57..b03f7a8cff2 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def
index c979d854c6c..ffc6c717009 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def
index f700eb88815..6031bb242b9 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def
index be0ec576246..d0a2f4f7c72 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def
index 471a885d902..f48f47ecbaa 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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{latex-xetex-bidi.def}[2015/11/14 v1.2.4 bidi adaptations for `latex.ltx' for XeTeX engine]
+\ProvidesFile{latex-xetex-bidi.def}[2016/05/10 v1.2.5 bidi adaptations for `latex.ltx' for XeTeX engine]
\newcommand{\TeXXeTOn}{\TeXXeTstate=1 }
\newcommand{\TeXXeTOff}{\TeXXeTstate=0 }
\TeXXeTOn
@@ -375,51 +375,89 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\hb@xt@\@pnumwidth{{\hfil\normalfont \normalcolor #5}}%
\par}%
\fi}
+
\def\RTL@outputdblcol{%
-\if@firstcolumn \global\@firstcolumnfalse
-\global\setbox\@leftcolumn \box\@outputbox
-\else \global\@firstcolumntrue
-\setbox\@outputbox \vbox {\hbox to\textwidth {%
-\hskip \columnwidth
-\hfil \vrule width\columnseprule \hfil
-\hbox to\columnwidth {\box\@leftcolumn \hss}%
-\hskip -\textwidth
-\hbox to\columnwidth{\box\@outputbox \hss}%
-\hskip \columnsep
-\hskip \columnwidth }}%
-\@combinedblfloats \@outputpage
-\begingroup \@dblfloatplacement \@startdblcolumn
-\@whilesw\if@fcolmade \fi
-{\@outputpage \@startdblcolumn }\endgroup
-\fi}
+ \if@firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hskip \columnwidth
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hskip -\textwidth
+ \hb@xt@\columnwidth{\box\@outputbox \hss}%
+ \hskip \columnsep
+ \hskip \columnwidth }}%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
+ \endgroup
+ \fi}%
+
\def\LTR@outputdblcol{%
\if@firstcolumn
- \global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
\else
- \global \@firstcolumntrue
- \setbox\@outputbox \vbox {%
- \hb@xt@\textwidth {%
- \hb@xt@\columnwidth {%
- \box\@leftcolumn \hss}%
- \hfil
- {\normalcolor\vrule \@width\columnseprule}%
- \hfil
- \hb@xt@\columnwidth {%
- \box\@outputbox \hss}%
- }%
- }%
- \@combinedblfloats
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb@xt@\textwidth{%
+ \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
+ \@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
\@startdblcolumn
- \@whilesw\if@fcolmade \fi
- {\@outputpage
- \@startdblcolumn}%
+ \@whilesw\if@fcolmade \fi{\@outputpage
+ \@startdblcolumn}%
\endgroup
- \fi
-}
+ \fi}%
+
\renewcommand{\@outputdblcol}{\if@RTLmain\RTL@outputdblcol\else\LTR@outputdblcol\fi}
\newcommand{\RTLdblcol}{\renewcommand{\@outputdblcol}{\RTL@outputdblcol}}
\newcommand{\LTRdblcol}{\renewcommand{\@outputdblcol}{\LTR@outputdblcol}}
diff --git a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def
index c6234733c0d..87fa08a3ebe 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def
index cdd5ce5f692..4181eb6c91a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def
index 702e5268694..09925f9dfd2 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def
index 74361be13a4..ba48be7e238 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def
index 9bb6a4d8db2..f2a1c4ffad0 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def
index 6035e748e38..f0758075545 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def
index 959e5038292..fdfdaa23c2f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def
index 456ad8b77f5..666e7ba91bd 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def
index a7373d91dd3..16c07ac5d05 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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,11 +34,26 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-\ProvidesFile{midfloat-xetex-bidi.def}[2013/04/10 v0.2 bidi adaptations for midfloat package for XeTeX engine]
+\ProvidesFile{midfloat-xetex-bidi.def}[2016/05/10 v0.3 bidi adaptations for midfloat package for XeTeX engine]
\def\RTL@outputdblcol{%
\if@firstcolumn
\global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
\global\c@colht\@colht\global\c@addvipersep\z@
\ifnum\juo@sk>0
\remove@strip\juo@sar
@@ -102,6 +117,7 @@
\hskip\columnsep}%
}%
\@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
@@ -119,7 +135,22 @@
\def\LTR@outputdblcol{%
\if@firstcolumn
\global \@firstcolumnfalse
- \global \setbox\@leftcolumn \box\@outputbox
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
\global\c@colht\@colht\global\c@addvipersep\z@
\ifnum\juo@sk>0
\remove@strip\juo@sar
@@ -180,6 +211,7 @@
}%
}%
\@combinedblfloats
+ \@setmarks
\@outputpage
\begingroup
\@dblfloatplacement
diff --git a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def
index bf75e676abd..f09644ec1ed 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
index afa49f4569d..4fb4d781434 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def
index 288f748a522..d26917f325f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def
index 5ea450767a9..427ee442669 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def
index 935abe43047..37b8d957289 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def
index e1efd014d46..72b04cdc839 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def
index c9d07f53392..3512116b631 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def
index 335246343bc..46cf2eb7cd1 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def
index 44885549e08..fb3ae3716bb 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def
index f332510c071..05185292ba0 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def
index ef003cc86be..181f3912b9f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def
index d073350ab09..60ec887df00 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def
index 8a0c191d144..9b7dcf931c5 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def
index d711717c02f..9b31184c638 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def
index 561588e1c20..6ed7ec03efd 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def
index 9e73738f8ea..986b305e4aa 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def
index 4a1bcef8736..3b2dedd0ef5 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def
index 7cca192a7de..d3cb24ae99f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def
index ea04f52a3cc..36a24b6620c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def
index 5d8c4f836d7..e7297116c9c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def
index 9e77f3a01da..39e7d81c0b9 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def
index 9f928aaaf4f..026afaf8bd3 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def
index 1c9a348a5a8..a66d1499fcb 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def
index d890edb4a69..b2b2572aa91 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def
index 47456ae6e39..1600814b52e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def
index 4c0d711a18a..cc7f30ab411 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def
index 38010bd689f..daea7d86431 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def
index 5497e8c6aae..ad0744e65b4 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def
index ede62131385..04ab39d88ec 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def
index 3fcd2dd621d..86d3dbc35f7 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def
index 2c4c0625dca..25e56011aa3 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def
index 8a9f967692e..7fcbda0daa4 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def
index e9431e324fa..833b9e4fa47 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def
index 7ac4d736633..3791e1054d6 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def
index cd41d153220..e04cb67743e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def
index 3d695959eb2..f20dfa5169c 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def
index 789efac43a4..5e653aa6a27 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def
index c45f639aaf5..e94645a4d2b 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def
index 437e4febdee..8423715980d 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def
index 06ed222307c..bb52d0989cc 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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
diff --git a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def
index 090bb54776a..a0b3790703f 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{46457}
+%% \CheckSum{46913}
%% \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