bidi (25sep11)

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

5 files changed, 166 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index 9c7ae94cfbc..5d2cc780ada 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{2011/10/01}
-\def\bidiversion{v1.3.1}
+\def\bidiversion{v1.3.2}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -44,13 +44,12 @@ Location on CTAN: /macros/latex/contrib/bidi}
 \def\eq@if#1#2#3{%
   \expandafter\def\csname\expandafter\@gobbletwo\string#1%
                     \expandafter\@gobbletwo\string#3\endcsname
-                       {\let#1#3
-                       \let#2#3}
+                       {\let#1#3%
+                       \let#2#3}%
   \expandafter\def\csname\expandafter\@gobbletwo\string#2%
                     \expandafter\@gobbletwo\string#3\endcsname
-                       {\let#2#3
-                       \let#1#3}
-}
+                       {\let#2#3%
+                       \let#1#3}}
 \eqnewif{\if@RTLmain}{\if@rlmain}
 \eqnewif{\if@RTL}{\if@rl}
 \newif\if@RTLmaths
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 cfd85f75df6..aa5e0618f15 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
@@ -12,7 +12,49 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrartcl-xetex-bidi.def}[2011/08/26 v0.4 bidi adaptations for scrartcl class for XeTeX engine]
+\ProvidesFile{scrartcl-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrartcl class for XeTeX engine]
+\renewcommand\deffootnote[4][]{%
+  \long\def\@makefntext##1{%
+    \setlength{\@tempdimc}{#3}%
+    \def\@tempa{#1}\ifx\@tempa\@empty
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#2}%
+        \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}%
+    \else
+      \addtolength{\@tempdimc}{#2}%
+      \addtolength{\@tempdimc}{-#1}%
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#1}%
+        \@tempdimb = \hsize
+        \addtolength{\@tempdimb}{-#2}%
+        \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi
+      }%
+    \fi
+    \par
+    \parindent\@tempdimc\noindent
+    \ftn@font\hbox to \z@{\hss\@@makefnmark}##1%
+  }%
+  \def\@@makefnmark{\hbox{\ftnm@font{#4}}}%
+}
+\deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}}
+\renewcommand*\left@footnote{%
+  \normalsize\ftn@rule@test@values
+  \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
+  \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
+  {\usekomafont{footnoterule}{%
+      \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}%
+  \kern 2.6\p@}
+\renewcommand*\right@footnote{%
+  \hbox to \columnwidth
+  {\beginR \vbox{\kern -3\p@
+  \normalsize\ftn@rule@test@values
+  \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
+  \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
+  {\usekomafont{footnoterule}{%
+      \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}%
+  \kern 2.6\p@}\hfil\endR}}
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
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 2ca938210b9..a31ac0b2a3b 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
@@ -12,7 +12,49 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrbook-xetex-bidi.def}[2010/08/13 v0.4 bidi adaptations for scrbook class for XeTeX engine]
+\ProvidesFile{scrbook-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrbook class for XeTeX engine]
+\renewcommand\deffootnote[4][]{%
+  \long\def\@makefntext##1{%
+    \setlength{\@tempdimc}{#3}%
+    \def\@tempa{#1}\ifx\@tempa\@empty
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#2}%
+        \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}%
+    \else
+      \addtolength{\@tempdimc}{#2}%
+      \addtolength{\@tempdimc}{-#1}%
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#1}%
+        \@tempdimb = \hsize
+        \addtolength{\@tempdimb}{-#2}%
+        \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi
+      }%
+    \fi
+    \par
+    \parindent\@tempdimc\noindent
+    \ftn@font\hbox to \z@{\hss\@@makefnmark}##1%
+  }%
+  \def\@@makefnmark{\hbox{\ftnm@font{#4}}}%
+}
+\deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}}
+\renewcommand*\left@footnote{%
+  \normalsize\ftn@rule@test@values
+  \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
+  \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
+  {\usekomafont{footnoterule}{%
+      \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}%
+  \kern 2.6\p@}
+\renewcommand*\right@footnote{%
+  \hbox to \columnwidth
+  {\beginR \vbox{\kern -3\p@
+  \normalsize\ftn@rule@test@values
+  \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
+  \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
+  {\usekomafont{footnoterule}{%
+      \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}%
+  \kern 2.6\p@}\hfil\endR}}
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}
diff --git a/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def
index cbe42c58748..13ee4ee867b 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrlettr-xetex-bidi.def
@@ -12,7 +12,38 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrlettr-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrlettr class for XeTeX engine]
+\ProvidesFile{scrlettr-xetex-bidi.def}[2011/09/24 v0.2 bidi adaptations for scrlettr class for XeTeX engine]
+\renewcommand\deffootnote[4][]{%
+  \long\def\@makefntext##1{%
+    \edef\@tempa{#1}\ifx\@tempa\@empty
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#2}
+        \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}%
+    \else
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#1}
+        \@tempdimb = \hsize
+        \addtolength{\@tempdimb}{-#2}
+        \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi}%
+    \fi
+    \par
+    \parindent #3\noindent
+    \hbox to \z@{\hss\@@makefnmark}##1}
+  \def\@@makefnmark{\hbox{#4}}
+}
+\deffootnote[1em]{1.5em}{1em}
+  {\textsuperscript{\thefootnotemark}}
+\def\left@footnote{\kern-1\p@
+ \hrule width 0.4\columnwidth
+ \kern .6\p@}
+\def\right@footnote{%
+ \hbox to \columnwidth
+ {\beginR \vbox{\kern -3\p@
+ \kern-1\p@
+ \hrule width 0.4\columnwidth
+ \kern .6\p@}\hfil\endR}}
 \def\@datefield{\@reffalse
  \ifx\varyourref\@empty \else \@reftrue \fi
  \ifx\varyourmail\@empty \else \@reftrue \fi
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 cee09220f59..db865f4844e 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
@@ -12,7 +12,49 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{scrreprt-xetex-bidi.def}[2011/08/26 v0.4 bidi adaptations for scrreprt class for XeTeX engine]
+\ProvidesFile{scrreprt-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrreprt class for XeTeX engine]
+\renewcommand\deffootnote[4][]{%
+  \long\def\@makefntext##1{%
+    \setlength{\@tempdimc}{#3}%
+    \def\@tempa{#1}\ifx\@tempa\@empty
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#2}%
+        \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}%
+    \else
+      \addtolength{\@tempdimc}{#2}%
+      \addtolength{\@tempdimc}{-#1}%
+      \@setpar{\@@par
+        \@tempdima = \hsize
+        \addtolength{\@tempdima}{-#1}%
+        \@tempdimb = \hsize
+        \addtolength{\@tempdimb}{-#2}%
+        \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi
+      }%
+    \fi
+    \par
+    \parindent\@tempdimc\noindent
+    \ftn@font\hbox to \z@{\hss\@@makefnmark}##1%
+  }%
+  \def\@@makefnmark{\hbox{\ftnm@font{#4}}}%
+}
+\deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}}
+\renewcommand*\left@footnote{%
+  \normalsize\ftn@rule@test@values
+  \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
+  \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
+  {\usekomafont{footnoterule}{%
+      \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}%
+  \kern 2.6\p@}
+\renewcommand*\right@footnote{%
+  \hbox to \columnwidth
+  {\beginR \vbox{\kern -3\p@
+  \normalsize\ftn@rule@test@values
+  \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
+  \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
+  {\usekomafont{footnoterule}{%
+      \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}%
+  \kern 2.6\p@}\hfil\endR}}
 \renewcommand*\maketitle[1][1]{%
   \if@titlepage
     \begin{titlepage}