bidi (5nov11)

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

2 files changed, 191 insertions, 9 deletions

diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx
index 5d03beb57d6..32ed3c7e7e7 100644
--- a/Master/texmf-dist/source/latex/bidi/bidi.dtx
+++ b/Master/texmf-dist/source/latex/bidi/bidi.dtx
@@ -5,7 +5,7 @@
 %<*readme>
 ___________________
 The bidi package
-v1.4.4
+v1.4.5
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -89,6 +89,7 @@ by Vafa Khalighi.
 \generate{\file{colortbl-xetex-bidi.def}{\from{\jobname.dtx}{colortbl-xetex-bidi.def}}}
 \generate{\file{color-xetex-bidi.def}{\from{\jobname.dtx}{color-xetex-bidi.def}}}
 \generate{\file{combine-xetex-bidi.def}{\from{\jobname.dtx}{combine-xetex-bidi.def}}}
+\generate{\file{crop-xetex-bidi.def}{\from{\jobname.dtx}{crop-xetex-bidi.def}}}
 \generate{\file{cvthemebidicasual.sty}{\from{\jobname.dtx}{cvthemebidicasual.sty}}}
 \generate{\file{cvthemebidiclassic.sty}{\from{\jobname.dtx}{cvthemebidiclassic.sty}}}
 \generate{\file{dblfnote-xetex-bidi.def}{\from{\jobname.dtx}{dblfnote-xetex-bidi.def}}}
@@ -123,6 +124,7 @@ by Vafa Khalighi.
 \generate{\file{natbib-xetex-bidi.def}{\from{\jobname.dtx}{natbib-xetex-bidi.def}}}
 \generate{\file{pdfpages-xetex-bidi.def}{\from{\jobname.dtx}{pdfpages-xetex-bidi.def}}}
 \generate{\file{pgf-xetex-bidi.def}{\from{\jobname.dtx}{pgf-xetex-bidi.def}}}
+\generate{\file{picinpar-xetex-bidi.def}{\from{\jobname.dtx}{picinpar-xetex-bidi.def}}}
 \generate{\file{plain-luatex-bidi.def}{\from{\jobname.dtx}{plain-luatex-bidi.def}}}
 \generate{\file{plain-xetex-bidi.def}{\from{\jobname.dtx}{plain-xetex-bidi.def}}}
 \generate{\file{pstricks-xetex-bidi.def}{\from{\jobname.dtx}{pstricks-xetex-bidi.def}}}
@@ -231,7 +233,7 @@ by Vafa Khalighi.
 % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe}
 % \author{Vafa Khalighi\\
 %  \url{vafaklg@gmail.com}}
-% \date{\today\qquad Version 1.4.4}
+% \date{\today\qquad Version 1.4.5}
 % \maketitle
 % \tableofcontents
 %\section*{Introduction}
@@ -246,7 +248,7 @@ by Vafa Khalighi.
 %in plain TeX and LaTeX.  The package includes adaptations for use
 %with many other commonly-used packages.
 %Copyright (c) 2009-2012 Vafa Khalighi
-%v1.4.4, 2012/01/01
+%v1.4.5, 2012/01/01
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/latex/contrib/bidi
 %\end{lstlisting}
@@ -648,7 +650,7 @@ by Vafa Khalighi.
 %\subsection{Equation Numbers}
 %For \texttt{reqno}, equation numbers are on the right hand side and for \texttt{leqno}, equation numbers are on the left hand side, independent on the current mode.
 %\section{Support For Various Packages and Classes}
-%The \textsf{bidi} package supports \textsf{amsmath}, \textsf{amsthm}, \textsf{array}, \textsf{arydshln}, \textsf{breqn}, \textsf{caption}, \textsf{color}, \textsf{colortbl}, \textsf{dblfnote} \textsf{draftwatermark}, \textsf{empheq},   \textsf{fancyhdr}, \textsf{float}, \textsf{flowfram}, \textsf{framed}, \textsf{graphicx}, \textsf{hvfloat},  \textsf{hyperref}, \textsf{lettrine}, \textsf{listings}, \textsf{minitoc}, \textsf{multicol}, \textsf{multienum}, \textsf{pdfpages}, \textsf{pstricks}, \textsf{quotchap}, \textsf{ragged2e},  \textsf{sidecap}, \textsf{stabular}, \textsf{subfig}, \textsf{subfigure}, \textsf{supertabular}, \textsf{xtab}, \textsf{tabls}, \textsf{tabulary}, \textsf{PGF \&\ TIKZ}, \textsf{tocbibind}, \textsf{tocloft}, \textsf{tocstyle}, \textsf{wrapfig}, \textsf{xcolor}, \textsf{xltxtra} packages, \textsf{amsart}, \textsf{amsbook}, \textsf{artikel1}, \textsf{artikel2}, \textsf{artikel3}, \textsf{extarticle}, \textsf{flashcards}, \textsf{standrad article}, \textsf{boek}, \textsf{boek3}, \textsf{standard book}, \textsf{bookest}, \textsf{extbook}, \textsf{extletter}, \textsf{scrlettr},\textsf{standard letter}, \textsf{memoir}, \textsf{extreport}, \textsf{rapport1},  \textsf{rapport3}, \textsf{refrep}, \textsf{standard report}, \textsf{scartcl}, \textsf{scrbook}, \textsf{scrreprt} classes and any other packages and classes that relies on these packages and classes. This means, you can use all these packages and classes in addition to other packages and classes that rely on these packages and classes and use their functionality fully for your bidirectional documents. 
+%The \textsf{bidi} package supports \textsf{amsmath}, \textsf{amsthm}, \textsf{array}, \textsf{arydshln}, \textsf{breqn}, \textsf{caption}, \textsf{color}, \textsf{colortbl}, \textsf{crop}, \textsf{dblfnote} \textsf{draftwatermark}, \textsf{empheq},   \textsf{fancyhdr}, \textsf{float}, \textsf{flowfram}, \textsf{framed}, \textsf{graphicx}, \textsf{hvfloat},  \textsf{hyperref}, \textsf{lettrine}, \textsf{listings}, \textsf{minitoc}, \textsf{multicol}, \textsf{multienum}, \textsf{pdfpages}, \textsf{pstricks}, \textsf{quotchap}, \textsf{picinpar}, \textsf{ragged2e},  \textsf{sidecap}, \textsf{stabular}, \textsf{subfig}, \textsf{subfigure}, \textsf{supertabular}, \textsf{xtab}, \textsf{tabls}, \textsf{tabulary}, \textsf{PGF \&\ TIKZ}, \textsf{tocbibind}, \textsf{tocloft}, \textsf{tocstyle}, \textsf{wrapfig}, \textsf{xcolor}, \textsf{xltxtra} packages, \textsf{amsart}, \textsf{amsbook}, \textsf{artikel1}, \textsf{artikel2}, \textsf{artikel3}, \textsf{extarticle}, \textsf{flashcards}, \textsf{standrad article}, \textsf{boek}, \textsf{boek3}, \textsf{standard book}, \textsf{bookest}, \textsf{extbook}, \textsf{extletter}, \textsf{scrlettr},\textsf{standard letter}, \textsf{memoir}, \textsf{extreport}, \textsf{rapport1},  \textsf{rapport3}, \textsf{refrep}, \textsf{standard report}, \textsf{scartcl}, \textsf{scrbook}, \textsf{scrreprt} classes and any other packages and classes that relies on these packages and classes. This means, you can use all these packages and classes in addition to other packages and classes that rely on these packages and classes and use their functionality fully for your bidirectional documents. 
 %
 %We now give some details that you should know about the supported packages or classes.
 %\subsection{Color}
@@ -2517,7 +2519,7 @@ by Vafa Khalighi.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2012/01/01}
-\def\bidiversion{v1.4.4}
+\def\bidiversion{v1.4.5}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -6524,6 +6526,160 @@ bidi implementation of tufte title]
 %    \end{macrocode}
 % \iffalse
 %</combine-xetex-bidi.def>
+%<*crop-xetex-bidi.def>
+%\fi
+% \subsection{\textsf{crop-xetex-bidi.def}}
+%    \begin{macrocode}
+\ProvidesFile{crop-xetex-bidi.def}[2011/11/05 v0.1 bidi adaptations for crop package for XeTeX engine]
+\renewcommand*\CROP@@laxis{%
+    \if@RTLmain%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(2,0){\line(1,0){11}}
+    \end{picture}%
+    \else%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(-2,0){\line(-1,0){11}}
+    \end{picture}%
+    \fi%
+}
+\renewcommand*\CROP@@raxis{%
+    \if@RTLmain%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(-2,0){\line(-1,0){11}}
+    \end{picture}%
+    \else%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(2,0){\line(1,0){11}}
+    \end{picture}%
+    \fi%
+}
+\renewcommand*\CROP@@ulc{%
+    \if@RTLmain%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(30,0){\circle{10}}
+        \put(30,-5){\line(0,1){10}}
+        \put(35,0){\line(-1,0){30}}
+        \put(0,30){\circle{10}}
+        \put(5,30){\line(-1,0){10}}
+        \put(0,35){\line(0,-1){30}}
+    \end{picture}%
+    \else%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(-30,0){\circle{10}}
+        \put(-30,-5){\line(0,1){10}}
+        \put(-35,0){\line(1,0){30}}
+        \put(0,30){\circle{10}}
+        \put(-5,30){\line(1,0){10}}
+        \put(0,35){\line(0,-1){30}}
+    \end{picture}%
+    \fi%
+}
+\renewcommand*\CROP@@urc{%
+    \if@RTLmain%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(-30,0){\circle{10}}
+        \put(-30,-5){\line(0,1){10}}
+        \put(-35,0){\line(1,0){30}}
+        \put(0,30){\circle{10}}
+        \put(5,30){\line(-1,0){10}}
+        \put(0,35){\line(0,-1){30}}
+    \end{picture}%
+    \else%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(30,0){\circle{10}}
+        \put(30,-5){\line(0,1){10}}
+        \put(35,0){\line(-1,0){30}}
+        \put(0,30){\circle{10}}
+        \put(-5,30){\line(1,0){10}}
+        \put(0,35){\line(0,-1){30}}
+    \end{picture}%
+    \fi%
+}
+\renewcommand*\CROP@@llc{%
+    \if@RTLmain%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(30,0){\circle{10}}
+        \put(30,-5){\line(0,1){10}}
+        \put(35,0){\line(-1,0){30}}
+        \put(0,-30){\circle{10}}
+        \put(5,-30){\line(-1,0){10}}
+        \put(0,-35){\line(0,1){30}}
+    \end{picture}%
+    \else%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(-30,0){\circle{10}}
+        \put(-30,-5){\line(0,1){10}}
+        \put(-35,0){\line(1,0){30}}
+        \put(0,-30){\circle{10}}
+        \put(-5,-30){\line(1,0){10}}
+        \put(0,-35){\line(0,1){30}}
+    \end{picture}%
+    \fi%
+}
+\renewcommand*\CROP@@lrc{%
+    \if@RTLmain%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(-30,0){\circle{10}}
+        \put(-30,-5){\line(0,1){10}}
+        \put(-35,0){\line(1,0){30}}
+        \put(0,-30){\circle{10}}
+        \put(5,-30){\line(-1,0){10}}
+        \put(0,-35){\line(0,1){30}}
+    \end{picture}%
+    \else%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(30,0){\circle{10}}
+        \put(30,-5){\line(0,1){10}}
+        \put(35,0){\line(-1,0){30}}
+        \put(0,-30){\circle{10}}
+        \put(-5,-30){\line(1,0){10}}
+        \put(0,-35){\line(0,1){30}}
+    \end{picture}%
+    \fi%
+}
+\renewcommand*\CROP@@frame{%
+    \if@RTLmain%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(0,0){\line(-1,0){\strip@pt\paperwidth}}
+        \put(0,0){\line(0,-1){\strip@pt\paperheight}}
+        \put(-\strip@pt\paperwidth,0){\line(0,-1){\strip@pt\paperheight}}
+        \put(0,-\strip@pt\paperheight){\line(-1,0){\strip@pt\paperwidth}}
+    \end{picture}%
+    \else%
+    \begin{picture}(0,0)
+        \unitlength\p@\thinlines
+        \put(0,0){\line(1,0){\strip@pt\paperwidth}}
+        \put(0,0){\line(0,-1){\strip@pt\paperheight}}
+        \put(\strip@pt\paperwidth,0){\line(0,-1){\strip@pt\paperheight}}
+        \put(0,-\strip@pt\paperheight){\line(1,0){\strip@pt\paperwidth}}
+    \end{picture}%
+    \fi%
+}
+\@ifpackagewith{crop}{axes}{%
+\CROP@execopt{axes}%
+}{}
+\@ifpackagewith{crop}{cam}{%
+\CROP@execopt{cam}%
+}{}
+\@ifpackagewith{crop}{frame}{%
+\CROP@execopt{frame}%
+}{}
+%    \end{macrocode}
+% \iffalse
+%</crop-xetex-bidi.def>
 %<*cvthemebidicasual.sty>
 %\fi
 % \subsection{\textsf{cvthemebidicasual.sty}}
@@ -11041,11 +11197,12 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{loadingorder-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{loadingorder-bidi.def}[2012/01/01 v0.8 making sure that bidi is the last package loaded]
+\ProvidesFile{loadingorder-bidi.def}[2012/01/01 v0.8a making sure that bidi is the last package loaded]
 \bidi@isloaded{amsmath}
 \bidi@isloaded{amsthm}
 \bidi@isloaded{breqn}
 \bidi@isloaded{caption}
+\bidi@isloaded{crop}
 \bidi@isloaded{color}
 \bidi@isloaded{dblfnote}
 \bidi@isloaded{xcolor}
@@ -11067,6 +11224,7 @@ bidi implementation of tufte title]
 \bidi@isloaded{lettrine}
 \bidi@isloaded{pstricks}
 \bidi@isloaded{pgf}
+\bidi@isloaded{picinpar}
 \bidi@isloaded{quotchap}
 \bidi@isloaded{tikz}
 \bidi@isloaded{titlesec}
@@ -11104,6 +11262,9 @@ bidi implementation of tufte title]
   \if@bidi@captionloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package caption after bidi package. Please load package caption before bidi package, and then try to run xelatex on your document again}{}]{caption}
   \fi%
+  \if@bidi@croploaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package crop after bidi package. Please load package crop before bidi package, and then try to run xelatex on your document again}{}]{crop}
+  \fi%
   \if@bidi@colorloaded@\else
   \@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}}
@@ -11168,6 +11329,9 @@ bidi implementation of tufte title]
   \if@bidi@pgfloaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pgf after bidi package. Please load package pgf before bidi package, and then try to run xelatex on your document again}{}]{pgf}
   \fi%
+  \if@bidi@picinparloaded@\else
+    \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package picinpar after bidi package. Please load package picinpar before bidi package, and then try to run xelatex on your document again}{}]{picinpar}
+  \fi%
   \if@bidi@quotchaploaded@\else
     \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package quotchap after bidi package. Please load package quotchap before bidi package, and then try to run xelatex on your document again}{}]{quotchap}
   \fi%
@@ -11812,6 +11976,21 @@ bidi implementation of tufte title]
 %    \end{macrocode}
 % \iffalse
 %</pgf-xetex-bidi.def>
+%<*picinpar-xetex-bidi.def>
+%\fi
+% \subsection{\textsf{picinpar-xetex-bidi.def}}
+%    \begin{macrocode}
+\ProvidesFile{picinpar-xetex-bidi.def}[2011/11/05 v0.1 bidi adaptations for picinpar package for XeTeX engine]
+\long\def\@makewincaption#1#2{%
+   \setbox\@tempboxa\hbox{\footnotesize{\bf #1:\enspace}{#2}}%
+   \ifdim\wd\@tempboxa>\picwd
+      {\footnotesize{\bf #1:\enspace}{#2\par}}
+   \else
+      \hbox to\picwd{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi}
+   \fi}
+%    \end{macrocode}
+% \iffalse
+%</picinpar-xetex-bidi.def>
 %<*plain-luatex-bidi.def>
 %\fi
 % \subsection{\textsf{plain-luatex-bidi.def}}
@@ -15727,10 +15906,9 @@ bidi implementation of tufte title]
 \gdef\endpicture{%
   \egroup\hss\egroup
     \ht\@picbox\@picht\dp\@picbox\z@
-   \ifmmode\else\LTR\beginL\fi%
-    \mbox{\box\@picbox}%
-    \ifmmode\else\endL\endLTR\fi}
+    \mbox{\beginL\box\@picbox\endL}}
 \@ifpackageloaded{mathtools}{\RequirePackage{graphicx}}{}
+\@ifpackageloaded{crop}{\RequirePackage{graphicx}}{}
 \@ifpackageloaded{sidecap}{\RequirePackage{ragged2e}}{}
 \DeclareOption{RTLdocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}}
 \DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}}
@@ -16316,6 +16494,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{amsthm}{\input{amsthm-xetex-bidi.def}}{}
 \@ifpackageloaded{breqn}{\input{breqn-xetex-bidi.def}}{}
 \@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{}
+\@ifpackageloaded{crop}{\input{crop-xetex-bidi.def}}{}
 \@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{}
 \@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{}
 \@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{}
@@ -16371,6 +16550,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{multienum}{\input{multienum-xetex-bidi.def}}{}
 \@ifpackageloaded{natbib}{\input{natbib-xetex-bidi.def}}{}
 \@ifpackageloaded{minitoc}{\input{minitoc-xetex-bidi.def}}{}
+\@ifpackageloaded{picinpar}{\input{picinpar-xetex-bidi.def}}{}
 \@ifpackageloaded{quotchap}{\input{quotchap-xetex-bidi.def}}{}
 \@ifpackageloaded{ragged2e}{\input{ragged2e-xetex-bidi.def}}{}
 \@ifpackageloaded{tabls}{\input{tabls-xetex-bidi.def}}{}
diff --git a/Master/texmf-dist/source/latex/bidi/bidi.ins b/Master/texmf-dist/source/latex/bidi/bidi.ins
index 9ee20d62cf0..c7b074762a4 100644
--- a/Master/texmf-dist/source/latex/bidi/bidi.ins
+++ b/Master/texmf-dist/source/latex/bidi/bidi.ins
@@ -71,6 +71,7 @@ by Vafa Khalighi.
 \generate{\file{colortbl-xetex-bidi.def}{\from{\jobname.dtx}{colortbl-xetex-bidi.def}}}
 \generate{\file{color-xetex-bidi.def}{\from{\jobname.dtx}{color-xetex-bidi.def}}}
 \generate{\file{combine-xetex-bidi.def}{\from{\jobname.dtx}{combine-xetex-bidi.def}}}
+\generate{\file{crop-xetex-bidi.def}{\from{\jobname.dtx}{crop-xetex-bidi.def}}}
 \generate{\file{cvthemebidicasual.sty}{\from{\jobname.dtx}{cvthemebidicasual.sty}}}
 \generate{\file{cvthemebidiclassic.sty}{\from{\jobname.dtx}{cvthemebidiclassic.sty}}}
 \generate{\file{dblfnote-xetex-bidi.def}{\from{\jobname.dtx}{dblfnote-xetex-bidi.def}}}
@@ -105,6 +106,7 @@ by Vafa Khalighi.
 \generate{\file{natbib-xetex-bidi.def}{\from{\jobname.dtx}{natbib-xetex-bidi.def}}}
 \generate{\file{pdfpages-xetex-bidi.def}{\from{\jobname.dtx}{pdfpages-xetex-bidi.def}}}
 \generate{\file{pgf-xetex-bidi.def}{\from{\jobname.dtx}{pgf-xetex-bidi.def}}}
+\generate{\file{picinpar-xetex-bidi.def}{\from{\jobname.dtx}{picinpar-xetex-bidi.def}}}
 \generate{\file{plain-luatex-bidi.def}{\from{\jobname.dtx}{plain-luatex-bidi.def}}}
 \generate{\file{plain-xetex-bidi.def}{\from{\jobname.dtx}{plain-xetex-bidi.def}}}
 \generate{\file{pstricks-xetex-bidi.def}{\from{\jobname.dtx}{pstricks-xetex-bidi.def}}}