bidi (12nov13)

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

1 files changed, 41 insertions, 33 deletions

diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
index c369ebbdf80..165ef3fc453 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
-v14.1
+v14.2
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -24,7 +24,7 @@ a minimal working examples 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: 2013/10/10
+Current version release date: 2013/11/11
 
 ___________________
 Vafa Khalighi
@@ -211,8 +211,6 @@ by Vafa Khalighi.
 \usepackage{pifont}
 \usepackage{bbding}
 \usepackage{bidicode}
-\usepackage{fontspec}
-\setmainfont[Mapping=tex-text,Numbers=OldStyle]{Iwona}
 \definecolor{bidiblue}{rgb}{0.1,0.2,0.8}
 \usepackage[numbered]{hypdoc}
 \hypersetup{pdftitle={The \textsf{bidi} Package (Bidirectional typesetting in plain \TeX{} and \LaTeX, using Xe\TeX{} engine)},pdfauthor={Vafa Khalighi <persian-tex@tug.org>},linkcolor=bidiblue,urlcolor=bidiblue,citecolor=bidiblue}
@@ -258,7 +256,7 @@ by Vafa Khalighi.
 % Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine}
 % \author{Vafa Khalighi\\
 %  \url{persian-tex@tug.org}}
-% \date{\today\qquad Version 14.1}
+% \date{\today\qquad Version 14.2}
 %\maketitle
 %\vskip 0pt plus 3fill
 %\fbox{%
@@ -271,6 +269,7 @@ by Vafa Khalighi.
 %\medskip
 %  \centerline{\url{https://github.com/vafa/bidi/issues}}
 %
+%\medskip
 %In doing so, please always explain your issue well enough, always include
 %a minimal working examples showing the issue, and always choose the appropriate
 %label for your query (i.e. if you are reporting any bugs, choose `Bug' label). 
@@ -297,7 +296,7 @@ by Vafa Khalighi.
 %* 
 %* Copyright © 2009–2013 Vafa Khalighi
 %* 
-%* 2013/10/10, v14.1
+%* 2013/11/11, v14.2
 %* 
 %* License: LaTeX Project Public License, version
 %* 1.3c or higher (your choice)
@@ -1115,7 +1114,7 @@ by Vafa Khalighi.
 %\iffalse
 %<*table>
 %\fi
-%% \CheckSum{41975}
+%% \CheckSum{41974}
 %% \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
@@ -2646,8 +2645,8 @@ by Vafa Khalighi.
 % \subsection{\textsf{bidi.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2013/10/10}
-\def\bidiversion{v14.1}
+\def\bididate{2013/11/11}
+\def\bidiversion{v14.2}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\@bidi@info{****************************************************^^J%
@@ -2728,7 +2727,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 %\fi
 % \subsection{\textsf{bidi.tex}}
 %    \begin{macrocode}
-\def\bididate{2013/10/10}
+\def\bididate{2013/11/11}
 \def\bidiversion{v0.2}
 \catcode`@=11
 \let \protect \relax
@@ -13118,13 +13117,10 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{multicol-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{multicol-xetex-bidi.def}[2011/11/18 v0.2 bidi adaptations for multicol package for XeTeX engine]
-\def\revprocess@cols#1#2{\count@\doublecol@number\relax
-\advance\count@ by -2
-     \loop #2%
-     \ifnum\count@>#1\relax
-     \advance\count@-\tw@
-   \repeat}
+\ProvidesFile{multicol-xetex-bidi.def}[2013/11/11 v0.3 bidi adaptations for multicol package for XeTeX engine]
+%    \end{macrocode}
+%\changes{v14.2}{2013/11/11}{Fixed the wrong order of toc, lot, lof, etc with \textsf{multicol} package.}
+%    \begin{macrocode}
 \def\page@sofar{%
    \process@cols\mult@rightbox
        {\ifvoid\count@
@@ -13146,29 +13142,41 @@ bidi implementation of tufte title]
    \nointerlineskip
    \setbox\z@\hbox{p}\global\dimen\tw@\dp\z@
    \moveright\multicol@leftmargin
-   \if@RTL\hbox to\full@width{%
-    \ifdim\dp\mult@rightbox>\dimen\tw@
-       \global\dimen\tw@\dp\mult@rightbox \fi
-    \box\mult@rightbox
-    \llap{\phantom p}%
-     \revprocess@cols\mult@gfirstbox{%
-       \ifdim\dp\count@>\dimen\tw@
-         \global\dimen\tw@\dp\count@ \fi
-       \hss{\columnseprulecolor\vrule
-              \@width\columnseprule}\hss\box\count@}%
-}\else%
     \hbox to\full@width{%
-     \process@cols\mult@gfirstbox{%
+       \if@RTL
+         \process@cols\mult@gfirstbox{%
+         \hskip\hsize
+         \hss{\columnseprulecolor\vrule
+              \@width\columnseprule}\hss
+          }%
+       \hskip\hsize
+       \process@cols\mult@gfirstbox{%
        \ifdim\dp\count@>\dimen\tw@
          \global\dimen\tw@\dp\count@ \fi
+       \hskip-\hsize
        \box\count@
-       \hss{\columnseprulecolor\vrule
-              \@width\columnseprule}\hss}%
+       \hskip-\hsize
+       \hskip-\columnsep
+     }%
      \ifdim\dp\mult@rightbox>\dimen\tw@
        \global\dimen\tw@\dp\mult@rightbox \fi
+     \hskip-\hsize
      \box\mult@rightbox
-     \rlap{\phantom p}%
-    }\fi%
+     \hskip-\hsize
+     \hskip\full@width
+       \else
+         \process@cols\mult@gfirstbox{%
+         \ifdim\dp\count@>\dimen\tw@
+           \global\dimen\tw@\dp\count@ \fi
+         \box\count@
+         \hss{\columnseprulecolor\vrule
+              \@width\columnseprule}\hss}%
+         \ifdim\dp\mult@rightbox>\dimen\tw@
+           \global\dimen\tw@\dp\mult@rightbox \fi
+         \box\mult@rightbox
+       \fi
+       \rlap{\phantom p}%
+    }%
  \kern-\dimen\tw@
  \ifdim\dimen\tw@ = \mc@gridwarn
    \PackageWarning{multicol}%