bidi update (24jun10)

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

10 files changed, 67 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index 642fa43b666..cf54955b761 100644
--- a/Master/texmf-dist/doc/latex/bidi/README
+++ b/Master/texmf-dist/doc/latex/bidi/README
@@ -1,11 +1,11 @@
 _________________
 The bidi package
-v1.1.2
+v1.1.3
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
 
-This version fixes all the bugs that were present in v1.1.1. 
+This version fixes all the bugs that were present in v1.1.2. 
 
 ______________
 Vafa Khalighi
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
index f4f7932668e..70c41e5c948 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex b/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
index 92b326fec3b..5ac826841e2 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
+++ b/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex
@@ -27,7 +27,7 @@
 \makeatother\makeatother
 \title{The \textsf{bidi} Package\\ \href{http://bitbucket.org/vafa/bidi}{\texttt{http://bitbucket.org/vafa/bidi}}}
 \author{Vafa Khalighi\\ \href{mailto:vafakh84@gmail.com}{\texttt{vafakh84@gmail.com}}}
-\date{Version 1.1.2}
+\date{Version 1.1.3}
 \begin{document}
 \maketitle
 \tableofcontents
@@ -44,7 +44,7 @@ Description: A convenient interface for typesetting bidirectional texts
 in plain TeX and LaTeX.  The package includes adaptations for use
 with many other commonly-used packages.
 Copyright (c) 2009-2010 Vafa Khalighi
-v1.1.2, <commit 62>, 2010/07/25
+v1.1.3, <commit 67>, 2010/07/25
 License: LaTeX Project Public License, version 1.3c or higher (your choice)
 Home: http://bitbucket.org/vafa/bidi
 Location on CTAN: /macros/latex/contrib/bidi
@@ -600,38 +600,38 @@ When footnotes are typeset RTL, \Lcs{if@RTL@footnote} is true and when footnotes
 \item \Lcs{save@dir}, if the direction of typesetting is RTL, defines \Lcs{saved@@dir} to be RTL and if the direction of typesetting is LTR, defines \Lcs{saved@@dir} to be LTR.
 \item \Lcs{reset@dir}, if \Lcs{saved@@dir} is defined as RTL, inserts \Lcs{setRTL} otherwise, if  \Lcs{saved@@dir} is defined as LTR, inserts \Lcs{setLTR}, otherwise does nothing.
 \end{itemize}
-\part{Implementation}
-In this section, we describe the implementation of bidi package in whole.
-\lstset{firstnumber=last}
-\lstset{language=[LaTeX]Tex,
-    keywordstyle=\color{mygreen},
-    basicstyle=\normalfont\ttfamily,
-    commentstyle=\color{blue}\ttfamily,
-    stringstyle=\rmfamily,
-    numbers=none,
-    numberstyle=\scriptsize,
-    stepnumber=5,
-    numbersep=8pt,
-    showstringspaces=false,
-    breaklines=true,
-    frameround=ftff,
-    frame=none,
-    backgroundcolor=\color{white}
-} 
-\lstset{numbers=left,
-    numberstyle=\scriptsize,
-    stepnumber=1,
-    numbersep=8pt
-}   
-\lstset{morekeywords={bididate,bidiversion,bidicommit}}
-\section{File \textsf{bidi.sty}}
-\begin{lstlisting}[firstnumber=1]
-\NeedsTeXFormat{LaTeX2e}
-\end{lstlisting}
-Here we define the date, version number and commit number of the package.
-\begin{lstlisting}
-\def\bididate{2010/07/25}
-\def\bidiversion{v1.1.0}
-\def\bidicommit{commit 44}
-\end{lstlisting}
+%\part{Implementation}
+%In this section, we describe the implementation of bidi package in whole.
+%\lstset{firstnumber=last}
+%\lstset{language=[LaTeX]Tex,
+%    keywordstyle=\color{mygreen},
+%    basicstyle=\normalfont\ttfamily,
+%    commentstyle=\color{blue}\ttfamily,
+%    stringstyle=\rmfamily,
+%    numbers=none,
+%    numberstyle=\scriptsize,
+%    stepnumber=5,
+%    numbersep=8pt,
+%    showstringspaces=false,
+%    breaklines=true,
+%    frameround=ftff,
+%    frame=none,
+%    backgroundcolor=\color{white}
+%} 
+%\lstset{numbers=left,
+%    numberstyle=\scriptsize,
+%    stepnumber=1,
+%    numbersep=8pt
+%}   
+%\lstset{morekeywords={bididate,bidiversion,bidicommit}}
+%\section{File \textsf{bidi.sty}}
+%\begin{lstlisting}[firstnumber=1]
+%\NeedsTeXFormat{LaTeX2e}
+%\end{lstlisting}
+%Here we define the date, version number and commit number of the package.
+%\begin{lstlisting}
+%\def\bididate{2010/07/25}
+%\def\bidiversion{v1.1.0}
+%\def\bidicommit{commit 44}
+%\end{lstlisting}
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.tex b/Master/texmf-dist/doc/latex/bidi/bidi.tex
index 3e994d62e09..6efdbefa4d9 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi.tex
+++ b/Master/texmf-dist/doc/latex/bidi/bidi.tex
@@ -10,7 +10,7 @@
 %% 
 \def\bididate{2010/07/25}
 \def\bidiversion{v0.1}
-\def\bidicommit{commit 64}
+\def\bidicommit{commit 69}
 \catcode`@=11
 \edef\bidiinfo{%
 bidi package (Support for bidirectional typesetting in plain TeX and LaTeX)^^J
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index a59f83e7951..bffc5c1a57d 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -10,8 +10,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \def\bididate{2010/07/25}
-\def\bidiversion{v1.1.2}
-\def\bidicommit{commit 64}
+\def\bidiversion{v1.1.3}
+\def\bidicommit{commit 69}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidicommit>
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -81,7 +81,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
     \PackageError{bidi}{TeX engines other than XeTeX and LuaTeX are not yet supported}
   \fi
 \fi
-%\@developmentversiontrue
+\@developmentversiontrue
 \if@developmentversion
     \PackageWarningNoLine{bidi}{Thanks for testing the development version of bidi package. The development version may not work correctly or may not work at all. The development version is not recommended to be used for production purposes and should only be used for testing purposes. You are encouraged to use the stable version of bidi package available on CTAN for production purposes}
 \fi
diff --git a/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
index 9a156aabb37..f21592ce7e7 100644
--- a/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def
@@ -9,16 +9,16 @@
 %% 
 %% 
 \ProvidesFile{fancyhdr-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for fancyhdr package for XeTeX engine]
-\def\@fancyhead#1#2#3#4#5{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi\hbox to\headwidth{\fancy@reset
+\def\@fancyhead#1#2#3#4#5{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi\hbox to\headwidth{\beginL\fancy@reset
   \@fancyvbox\headheight{\hbox
-    {\rlap{\parbox[b]{\headwidth}{\if@RTLmain\raggedleft\else\raggedright\fi\if@RTLmain\beginR\fi#2\if@RTLmain\endR\fi}}\hfill
+    {\rlap{\parbox[b]{\headwidth}{\raggedright\if@RTLmain\beginR\fi#2\if@RTLmain\endR\fi}}\hfill
       \parbox[b]{\headwidth}{\centering\if@RTLmain\beginR\fi#3\if@RTLmain\endR\fi}\hfill
-      \llap{\parbox[b]{\headwidth}{\if@RTLmain\raggedright\else\raggedleft\fi\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}\headrule}}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi}
-\def\@fancyfoot#1#2#3#4#5{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi\hbox to\headwidth{\fancy@reset
+      \llap{\parbox[b]{\headwidth}{\raggedleft\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}\headrule}\endL}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi}
+\def\@fancyfoot#1#2#3#4#5{\if@RTLmain\beginR\fi#1\if@RTLmain\endR\fi\hbox to\headwidth{\beginL\fancy@reset
     \@fancyvbox\footskip{\footrule
-      \hbox{\rlap{\parbox[t]{\headwidth}{\if@RTLmain\raggedleft\else\raggedright\fi\if@RTLmain\beginR\fi#2\if@RTLmain\endR\fi}}\hfill
+      \hbox{\rlap{\parbox[t]{\headwidth}{\raggedright\if@RTLmain\beginR\fi#2\if@RTLmain\endR\fi}}\hfill
         \parbox[t]{\headwidth}{\centering\if@RTLmain\beginR\fi#3\if@RTLmain\endR\fi}\hfill
-        \llap{\parbox[t]{\headwidth}{\if@RTLmain\raggedright\else\raggedleft\fi\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}}}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi}
+        \llap{\parbox[t]{\headwidth}{\raggedleft\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}}\endL}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
diff --git a/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
index e1e68fa16aa..14731e92685 100644
--- a/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/luatex-bidi.def
@@ -9,7 +9,7 @@
 %% 
 %% 
 \ProvidesFile{luatex-bidi.def}[2010/07/25 v0.1 bidi adaptations  for LuaTeX engine]
-\directlua { tex.enableprimitives('',tex.extraprimitives()) }
+\directlua { tex.enableprimitives('',{'pagedir','bodydir','pardir','textdir','mathdir'}) }
 
 \input{footnote-luatex-bidi.def}
 
diff --git a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
index 311c3a39fa3..86c1482339b 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
@@ -325,6 +325,12 @@
   \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
   \hrule\@width.4\columnwidth
   \kern 2.6\p@}\hfil\endR}}
+\renewcommand*{\raggeddictum}{\if@RTL\raggedright\else\raggedleft\fi}
+\renewcommand*{\raggeddictumtext}{\if@RTL\raggedleft\else\raggedright\fi}
+\renewcommand*{\raggeddictumauthor}{\if@RTL\raggedright\else\raggedleft\fi}
+\renewcommand\marginline[1]{%
+  \marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
+}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
diff --git a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
index fc1994de306..d85755c3dc0 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
@@ -381,6 +381,12 @@
   \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
   \hrule\@width.4\columnwidth
   \kern 2.6\p@}\hfil\endR}}
+\renewcommand*{\raggeddictum}{\if@RTL\raggedright\else\raggedleft\fi}
+\renewcommand*{\raggeddictumtext}{\if@RTL\raggedleft\else\raggedright\fi}
+\renewcommand*{\raggeddictumauthor}{\if@RTL\raggedright\else\raggedleft\fi}
+\renewcommand\marginline[1]{%
+  \marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
+}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %% 
diff --git a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
index 2b04dfd8938..d4c9145a86f 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
@@ -338,6 +338,12 @@
   \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
   \hrule\@width.4\columnwidth
   \kern 2.6\p@}\hfil\endR}}
+\renewcommand*{\raggeddictum}{\if@RTL\raggedright\else\raggedleft\fi}
+\renewcommand*{\raggeddictumtext}{\if@RTL\raggedleft\else\raggedright\fi}
+\renewcommand*{\raggeddictumauthor}{\if@RTL\raggedright\else\raggedleft\fi}
+\renewcommand\marginline[1]{%
+  \marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
+}
 %% 
 %% Copyright © 2009-2010      by Vafa Khalighi     <vafakh84@gmail.com>
 %%