bidi 5/27

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

7 files changed, 34 insertions, 70 deletions

diff --git a/Master/texmf-dist/doc/latex/bidi/ChangeLog b/Master/texmf-dist/doc/latex/bidi/ChangeLog
index 8b79aff6138..d34e23501ff 100644
--- a/Master/texmf-dist/doc/latex/bidi/ChangeLog
+++ b/Master/texmf-dist/doc/latex/bidi/ChangeLog
@@ -1,3 +1,7 @@
+2013/05/26   version 13.4    Persian TeX Group
+         *  Version 13.4 released.
+         *  Synced `cals-xetex-bidi.def' with version 2.1 of `cals' package.
+
 2013/05/22   version 13.3    Persian TeX Group
          *  Version 13.3 released.
          *  `cals' package partially supported.
diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index 5ced64d0a01..ec542c3ad5d 100644
--- a/Master/texmf-dist/doc/latex/bidi/README
+++ b/Master/texmf-dist/doc/latex/bidi/README
@@ -1,6 +1,6 @@
 ___________________
 The bidi package
-v13.3
+v13.4
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -17,7 +17,7 @@ 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).
 
-Current version release date: 2013/05/22
+Current version release date: 2013/05/26
 
 ___________________
 Persian TeX Group
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.pdf b/Master/texmf-dist/doc/latex/bidi/bidi.pdf
index 7da00f0342a..aae517cb0b4 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bidi.pdf
diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx
index 6e5f5aceb2d..43b9e3c1d6d 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
-v13.3
+v13.4
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX.
@@ -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/05/22
+Current version release date: 2013/05/26
 
 ___________________
 Persian TeX Group
@@ -39,6 +39,10 @@ This work is “maintained” (as per LPPL maintenance status)
 by Persian TeX Group.
 %</readme>
 %<*changelog>
+2013/05/26   version 13.4    Persian TeX Group
+         *  Version 13.4 released.
+         *  Synced `cals-xetex-bidi.def' with version 2.1 of `cals' package.
+         
 2013/05/22   version 13.3    Persian TeX Group
          *  Version 13.3 released.
          *  `cals' package partially supported.
@@ -362,7 +366,7 @@ by Persian TeX Group.
 % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe}
 % \author{Persian TeX Group\\
 %  \url{persian-tex@tug.org}}
-% \date{\today\qquad Version 13.3}
+% \date{\today\qquad Version 13.4}
 %\maketitle
 % \tableofcontents
 %\section*{Introduction}
@@ -377,7 +381,7 @@ by Persian TeX Group.
 %in plain TeX and LaTeX.  The package includes adaptations for use
 %with many other commonly-used packages.
 %Copyright (c) 2009-2013 Persian TeX Group
-%v13.3, 2013/05/22
+%v13.4, 2013/05/26
 %License: LaTeX Project Public License, version 1.3c or higher (your choice)
 %Location on CTAN: /macros/latex/contrib/bidi
 %\end{lstlisting}
@@ -2701,8 +2705,8 @@ by Persian TeX Group.
 % \subsection{\textsf{bidi.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2013/05/22}
-\def\bidiversion{v13.3}
+\def\bididate{2013/05/26}
+\def\bidiversion{v13.4}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
@@ -2770,7 +2774,7 @@ Location on CTAN: /macros/latex/contrib/bidi}
 %\fi
 % \subsection{\textsf{bidi.tex}}
 %    \begin{macrocode}
-\def\bididate{2013/05/22}
+\def\bididate{2013/05/26}
 \def\bidiversion{v0.2}
 \catcode`@=11
 \let \protect \relax
@@ -6803,34 +6807,9 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{cals-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{cals-xetex-bidi.def}[2013/05/22 v0.1 bidi adaptations for cals package for XeTeX engine]
-\renewcommand\cals@issue@row{%
-\nointerlineskip
-\setbox0=\vtop{\if@RTLtab\hboxR\else\hbox\fi to \textwidth{\hskip\leftskip \box\cals@current@cs \hskip\rightskip}}%
-  \ht0=0pt \box0
-\nointerlineskip
-\if@RTLtab\hboxR\else\hbox\fi to \textwidth{\hskip\leftskip\hbox{\cals@issue@rowsep}\hskip\rightskip}%
-\nointerlineskip
-\if@RTLtab\hboxR\else\hbox\fi to \textwidth{\hskip\leftskip \box\cals@current@row \hskip\rightskip}%
-\let\cals@last@rs@below=\cals@current@rs@below
-\let\cals@last@context=\cals@current@context}
-\renewcommand\cals@issue@rowsep@alone{%
-\setbox0=\if@RTLtab\hboxR\else\hbox\fi to \textwidth{%
- \hskip\leftskip
- \cals@rs@sofar@reset
- \cals@rs@joinOne\cals@framers@width\cals@current@rs@above
- \cals@rs@sofar@end
- \hskip\rightskip}%
-\ht0=0pt \dp0=0pt \box0 }
-\renewenvironment{calstable}[1][c]{%
-\if@RTL\@RTLtabtrue\fi
-  \if l#1%
-    \if@RTLtab\leftskip\fill \rightskip\z@\else\leftskip\z@ \rightskip\fill\fi
-  \else\if r#1%
-    \if@RTLtab\leftskip\z@ \rightskip\fill\else\leftskip\fill \rightskip\z@\fi
-  \else\if c#1%
-    \leftskip\fill \rightskip\fill
-  \fi\fi\fi
+\ProvidesFile{cals-xetex-bidi.def}[2013/05/26 v0.2 bidi adaptations for cals package for XeTeX engine]
+\renewenvironment{calstable}{%
+\if@RTL\@RTLtabtrue\cals@activate@rtl\fi
 \let\cals@thead@tokens=\relax
 \let\cals@tfoot@tokens=\relax
 \let\cals@tbreak@tokens=\relax
@@ -6838,13 +6817,16 @@ bidi implementation of tufte title]
 \let\cals@last@context=n%
 \let\cals@current@context=b%
 \parindent=0pt %
-\cals@setpadding{Ag}\cals@setcellprevdepth{Al}%
+\cals@setpadding{Ag}\cals@setcellprevdepth{Al}\cals@set@tohsize%
+%% Alignment inside is independent on center/flushright outside
+\parfillskip=0pt plus1fil\relax
 \let\cals@borderL=\relax
 \let\cals@borderR=\relax
 \let\cals@borderT=\relax
 \let\cals@borderB=\relax
 }{% End of the table
 \cals@tfoot@tokens\lastrule\@RTLtabfalse}
+
 \renewcommand\alignL{%
 \dimen0=\cals@paddingL \if@RTLtab\cals@paddingL=\dimen0 plus 1fill\else\cals@paddingL=\dimen0\fi \relax
 \dimen0=\cals@paddingR \cals@paddingR=\dimen0 \relax}
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index dafcb7d00fb..b0062e9f8a2 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -13,8 +13,8 @@
 %% 
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2013/05/22}
-\def\bidiversion{v13.3}
+\def\bididate{2013/05/26}
+\def\bidiversion{v13.4}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\bidiinfo{%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.tex b/Master/texmf-dist/tex/latex/bidi/bidi.tex
index 30ccfe54fbf..2e2e466c782 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.tex
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex
@@ -12,7 +12,7 @@
 %%   License information appended.
 %% 
 %% 
-\def\bididate{2013/05/22}
+\def\bididate{2013/05/26}
 \def\bidiversion{v0.2}
 \catcode`@=11
 \let \protect \relax
diff --git a/Master/texmf-dist/tex/latex/bidi/cals-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/cals-xetex-bidi.def
index cc173fdb385..9290121c902 100644
--- a/Master/texmf-dist/tex/latex/bidi/cals-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/cals-xetex-bidi.def
@@ -12,34 +12,9 @@
 %%   License information appended.
 %% 
 %% 
-\ProvidesFile{cals-xetex-bidi.def}[2013/05/22 v0.1 bidi adaptations for cals package for XeTeX engine]
-\renewcommand\cals@issue@row{%
-\nointerlineskip
-\setbox0=\vtop{\if@RTLtab\hboxR\else\hbox\fi to \textwidth{\hskip\leftskip \box\cals@current@cs \hskip\rightskip}}%
-  \ht0=0pt \box0
-\nointerlineskip
-\if@RTLtab\hboxR\else\hbox\fi to \textwidth{\hskip\leftskip\hbox{\cals@issue@rowsep}\hskip\rightskip}%
-\nointerlineskip
-\if@RTLtab\hboxR\else\hbox\fi to \textwidth{\hskip\leftskip \box\cals@current@row \hskip\rightskip}%
-\let\cals@last@rs@below=\cals@current@rs@below
-\let\cals@last@context=\cals@current@context}
-\renewcommand\cals@issue@rowsep@alone{%
-\setbox0=\if@RTLtab\hboxR\else\hbox\fi to \textwidth{%
- \hskip\leftskip
- \cals@rs@sofar@reset
- \cals@rs@joinOne\cals@framers@width\cals@current@rs@above
- \cals@rs@sofar@end
- \hskip\rightskip}%
-\ht0=0pt \dp0=0pt \box0 }
-\renewenvironment{calstable}[1][c]{%
-\if@RTL\@RTLtabtrue\fi
-  \if l#1%
-    \if@RTLtab\leftskip\fill \rightskip\z@\else\leftskip\z@ \rightskip\fill\fi
-  \else\if r#1%
-    \if@RTLtab\leftskip\z@ \rightskip\fill\else\leftskip\fill \rightskip\z@\fi
-  \else\if c#1%
-    \leftskip\fill \rightskip\fill
-  \fi\fi\fi
+\ProvidesFile{cals-xetex-bidi.def}[2013/05/26 v0.2 bidi adaptations for cals package for XeTeX engine]
+\renewenvironment{calstable}{%
+\if@RTL\@RTLtabtrue\cals@activate@rtl\fi
 \let\cals@thead@tokens=\relax
 \let\cals@tfoot@tokens=\relax
 \let\cals@tbreak@tokens=\relax
@@ -47,13 +22,16 @@
 \let\cals@last@context=n%
 \let\cals@current@context=b%
 \parindent=0pt %
-\cals@setpadding{Ag}\cals@setcellprevdepth{Al}%
+\cals@setpadding{Ag}\cals@setcellprevdepth{Al}\cals@set@tohsize%
+%% Alignment inside is independent on center/flushright outside
+\parfillskip=0pt plus1fil\relax
 \let\cals@borderL=\relax
 \let\cals@borderR=\relax
 \let\cals@borderT=\relax
 \let\cals@borderB=\relax
 }{% End of the table
 \cals@tfoot@tokens\lastrule\@RTLtabfalse}
+
 \renewcommand\alignL{%
 \dimen0=\cals@paddingL \if@RTLtab\cals@paddingL=\dimen0 plus 1fill\else\cals@paddingL=\dimen0\fi \relax
 \dimen0=\cals@paddingR \cals@paddingR=\dimen0 \relax}