bidi (13nov11)

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

5 files changed, 74 insertions, 1 deletions

diff --git a/Master/texmf-dist/tex/latex/bidi/bidi-logo.pdf b/Master/texmf-dist/tex/latex/bidi/bidi-logo.pdf
new file mode 100644
index 00000000000..700321cee9a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/bidi-logo.pdf
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index 6757f7ec781..51421af11b6 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2012/01/01}
-\def\bidiversion{v1.4.6}
+\def\bidiversion{v11.147}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -29,6 +29,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \typeout{\bidiinfo}
 \edef\bidi@everyjob{\the\everyjob}
 \everyjob{\bidi@everyjob\typeout{\bidiinfo}}
+\RequirePackage{graphicx}
 \RequirePackage{iftex}
 \RequirePackage{biditools}
 \eqnewif{\if@RTLmain}{\if@rlmain}
@@ -72,6 +73,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \fi
 \input{loadingorder-bidi.def}
 \ProcessOptions
+\newcommand{\bidilogo}[1][]{\includegraphics[#1]{bidi-logo}}
 %% 
 %% Copyright © 2009–2012  Vafa Khalighi <vafaklg@gmail.com>
 %% 
diff --git a/Master/texmf-dist/tex/latex/bidi/cutwin-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/cutwin-xetex-bidi.def
new file mode 100644
index 00000000000..a85c6e582cc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/cutwin-xetex-bidi.def
@@ -0,0 +1,66 @@
+%%
+%% This is file `cutwin-xetex-bidi.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bidi.dtx  (with options: `cutwin-xetex-bidi.def')
+%% 
+%%   ______________________________________
+%%   Copyright © 2009–2012  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\ProvidesFile{cutwin-xetex-bidi.def}[2011/11/12 v0.1 bidi adaptations for cutwin package for XeTeX engine]
+\renewcommand*{\c@twcompctr}[2]{%
+  \def\c@twfirst{1}
+  \loop\advance\c@twwinlines\m@ne
+  \setbox\c@twslicea=\vsplit#1 to\baselineskip
+  \setbox\c@twsliceb=\vsplit#1 to\baselineskip
+  \c@twprune{\c@twslicea}{\c@twlftside}%
+  \c@twprune{\c@twsliceb}{\c@twrtside}%
+  \ifnum\c@twfirst=\@ne
+    \setbox#2=\vbox{\unvbox#2\hbox
+    to\hsize{\if@RTL\box\c@twsliceb\else\box\c@twslicea\fi\pageinwindow\hfil\if@RTL\box\c@twslicea\else\box\c@twsliceb\fi}}%
+  \else
+    \setbox#2=\vbox{\unvbox#2\hbox
+    to\hsize{\if@RTL\box\c@twsliceb\else\box\c@twslicea\fi\hfil\if@RTL\box\c@twslicea\else\box\c@twsliceb\fi}}%
+  \fi
+  \def\c@twfirst{2}
+  \ifnum\c@twwinlines>\z@\repeat}
+\renewcommand*{\c@twcompoddctr}[2]{%
+  \def\c@twrounds{1}
+  \def\c@twfirst{1}
+  \@for\c@twlspec:=\c@twb\do{%
+    \ifnum\c@twrounds=1
+      \setbox\c@twslicea=\vsplit#1 to\baselineskip % first of pair
+      \c@twprune{\c@twslicea}{\c@twlspec}%
+      \def\c@twrounds{2}
+    \else
+      \setbox\c@twsliceb=\vsplit#1 to\baselineskip % second of pair
+      \c@twprune{\c@twsliceb}{\c@twlspec}%
+      \ifnum\c@twfirst=1
+        \setbox#2=\vbox{\unvbox#2\hbox
+        to\hsize{\if@RTL\box\c@twsliceb\else\box\c@twslicea\fi\hfil\picinwindow\hfil\if@RTL\box\c@twslicea\else\box\c@twsliceb\fi}}%
+        \def\c@twfirst{2}
+      \else
+        \setbox#2=\vbox{\unvbox#2\hbox
+        to\hsize{\if@RTL\box\c@twsliceb\else\box\c@twslicea\fi\hfil\if@RTL\box\c@twslicea\else\box\c@twsliceb\fi}}%
+      \fi
+      \def\c@twrounds{1}
+    \fi}}
+%% 
+%% Copyright © 2009–2012  Vafa Khalighi <vafaklg@gmail.com>
+%% 
+%% It may be distributed and/or modified under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is “author-maintained” (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% 
+%% 
+%%
+%% End of file `cutwin-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
index a18f3f25280..2fc7867d129 100644
--- a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def
@@ -18,6 +18,7 @@
 \bidi@isloaded{breqn}
 \bidi@isloaded{caption}
 \bidi@isloaded{crop}
+\bidi@isloaded{cutwin}
 \bidi@isloaded{color}
 \bidi@isloaded{dblfnote}
 \bidi@isloaded{xcolor}
@@ -84,6 +85,9 @@
   \@ifpackageloaded{hyperref}{}{%
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package color after bidi package. Please load package color before bidi package, and then try to run xelatex on your document again}{}]{color}}
   \fi%
+  \if@bidi@cutwinloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package cutwin after bidi package. Please load package cutwin before bidi package, and then try to run xelatex on your document again}{}]{cutwin}
+  \fi%
   \if@bidi@dblfnoteloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package dblfnote after bidi package. Please load package dblfnote before bidi package, and then try to run xelatex on your document again}{}]{dblfnote}
   \fi%
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index 1b28fee55d9..01c45a539d6 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -688,6 +688,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{}
 \@ifpackageloaded{crop}{\@ifclassloaded{memoir}{}{\input{crop-xetex-bidi.def}}}{}
 \@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{}
+\@ifpackageloaded{cutwin}{\input{cutwin-xetex-bidi.def}}{}
 \@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{}
 \@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{}
 \@ifpackageloaded{float}{\input{float-xetex-bidi.def}}{}