diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-24 16:22:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-24 16:22:28 +0000 |
commit | 6b0b12a0ae24345e1714d47483e443e536aab276 (patch) | |
tree | d2af3de4d5c774ec31d7c834f35ac183f4276954 /Master | |
parent | c02517b14854ed403f1cbbf165371920f1a2eb8f (diff) |
bidi (1aug10)
git-svn-id: svn://tug.org/texlive/trunk@19876 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/bidi/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf | bin | 144598 -> 144521 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/bidi/bidi-doc.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def | 89 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/bidi.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/bidi.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def | 19 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/xetex-bidi.def | 6 |
11 files changed, 60 insertions, 86 deletions
diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README index a174fb67b90..cfa28022a4b 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.4a +v1.1.4c 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.4. +This version fixes all the bugs that were present in v1.1.4b. Note: The image ctg.jpg is in public domain (a public domain artwork from iranpoliticsclub.net) and taken from diff --git a/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf b/Master/texmf-dist/doc/latex/bidi/bidi-doc.pdf Binary files differindex f7b1a5f085b..2cabf2e0263 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 56334375492..7c5a9f76670 100644 --- a/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex +++ b/Master/texmf-dist/doc/latex/bidi/bidi-doc.tex @@ -28,7 +28,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.4a} +\date{Version 1.1.4c} \begin{document} \maketitle \part*{Dedication} @@ -60,7 +60,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.4a, <commit 77>, 2010/07/25 +v1.1.4c, <commit 80>, 2010/08/01 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 diff --git a/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def index 795bb7f2abf..465ad3df62c 100644 --- a/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/array-xetex-bidi.def @@ -8,7 +8,7 @@ %% License information appended. %% %% -\ProvidesFile{array-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for array package for XeTeX engine] +\ProvidesFile{array-xetex-bidi.def}[2010/08/01 v0.2b bidi adaptations for array package for XeTeX engine] \def\@testpach{\@chclass \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else \ifnum \@lastchclass=7 5 \else @@ -34,63 +34,36 @@ \if \@nextchar b5 \else \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi} -\def\tabular{\gdef\@halignto{}\@tabular} -\def\@tabular{\if@RTL\global\@RTLtabtrue\fi% - \leavevmode - \hbox\bgroup \if@RTLtab\beginR \fi - $% - \@tabularinit - \@array -} -\renewcommand\@array[2][c]{% - \@tempdima \ht \strutbox - \advance \@tempdima by\extrarowheight - \setbox \@arstrutbox \hbox{% - \vrule \@height \arraystretch \@tempdima - \@depth \arraystretch \dp \strutbox - \@width \z@ - }% - \begingroup - \@mkpream{#2}% - \xdef\@preamble{% - \noexpand \ialign \@halignto - \bgroup \@arstrut \@preamble - \tabskip \z@ \cr - }% - \endgroup - \@arrayleft - \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi - \bgroup - \@arrayinit - \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi - \@preamble - % indent -} -%% environment body goes here -\def\endtabular{% - \crcr - \egroup % \bgroup from \@preamble - \if@RTLtab\egroup\endR\egroup\fi % \vbox\hbox - \egroup - \gdef\@preamble{}% - $\if@RTLtab\endR\fi% - \egroup % original \hbox -\global\@RTLtabfalse} -\def\@tabularinit{% - \col@sep\tabcolsep - \let \d@llarbegin \begingroup - \let \d@llarend \endgroup -} -\def\@arrayinit{% - \let \@sharp ## - \let \protect \relax - \lineskip \z@ - \baselineskip \z@ - \m@th - \let \\ \@arraycr - \let \tabularnewline \\% - \let \par \@empty -} +\def\@tabular{\if@RTL\@RTLtabtrue\fi% + \leavevmode + \hbox \bgroup\if@RTLtab\beginR \fi $\col@sep\tabcolsep \let\d@llarbegin\begingroup + \let\d@llarend\endgroup + \@tabarray} +\def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup\@RTLtabfalse} +\expandafter\let\csname endtabular*\endcsname=\endtabular +\def\@array[#1]#2{% + \@tempdima \ht \strutbox + \advance \@tempdima by\extrarowheight + \setbox \@arstrutbox \hbox{\vrule + \@height \arraystretch \@tempdima + \@depth \arraystretch \dp \strutbox + \@width \z@}% + \begingroup + \@mkpream{#2}% + \xdef\@preamble{\noexpand \ialign \@halignto + \bgroup \@arstrut \@preamble + \tabskip \z@ \cr}% + \endgroup + \@arrayleft + \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi + \bgroup + \let \@sharp ##\let \protect \relax + \lineskip \z@ + \baselineskip \z@ + \m@th + \let\\\@arraycr \let\tabularnewline\\\let\par\@empty \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi\@preamble} +\def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}} +\def\endarray{\crcr \egroup\if@RTLtab\egroup\endR\egroup\fi \egroup \@arrayright \gdef\@preamble{}} %% %% Copyright © 2009-2010 by Vafa Khalighi <vafakh84@gmail.com> %% diff --git a/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def index 550f6e046e7..c69964e91a8 100644 --- a/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/arydshln-xetex-bidi.def @@ -8,9 +8,9 @@ %% License information appended. %% %% -\ProvidesFile{arydshln-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for arydshln package for XeTeX engine] +\ProvidesFile{arydshln-xetex-bidi.def}[2010/08/01 v0.2 bidi adaptations for arydshln package for XeTeX engine] \def\endarray{\adl@endarray \egroup \adl@arrayrestore \if@RTLtab\egroup\endR\egroup\fi\egroup} -\def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup\global\@RTLtabfalse} +\def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup\@RTLtabfalse} \expandafter\let\csname endtabular*\endcsname\endtabular \let\adl@array\@array \def\@array{\adl@everyvbox\everyvbox diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty index 4aee7be9bfe..641a854ce0d 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi.sty +++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty @@ -9,9 +9,9 @@ %% %% \NeedsTeXFormat{LaTeX2e} -\def\bididate{2010/07/25} -\def\bidiversion{v1.1.4a} -\def\bidicommit{commit 77} +\def\bididate{2010/08/01} +\def\bidiversion{v1.1.4c} +\def\bidicommit{commit 81} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidicommit> 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 9a0041bc82e..9fca30bbefd 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi.tex +++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex @@ -8,9 +8,9 @@ %% License information appended. %% %% -\def\bididate{2010/07/25} +\def\bididate{2010/08/01} \def\bidiversion{v0.1} -\def\bidicommit{commit 77} +\def\bidicommit{commit 81} \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/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def index f21592ce7e7..2305dbc9865 100644 --- a/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/fancyhdr-xetex-bidi.def @@ -8,17 +8,18 @@ %% License information appended. %% %% -\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{\beginL\fancy@reset +\ProvidesFile{fancyhdr-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for fancyhdr package for XeTeX engine] +\let\fnch@everypar\everypar% +\def\@fancyhead#1#2#3#4#5{\if@RTLmain\beginR\else\beginL\fi#1\if@RTLmain\endR\else\endL\fi\hbox to\headwidth{\beginL\fancy@reset \@fancyvbox\headheight{\hbox - {\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}{\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 + {\rlap{\parbox[b]{\headwidth}{\raggedright\if@RTLmain\beginR\else\beginL\fi#2\if@RTLmain\endR\else\endL\fi}}\hfill + \parbox[b]{\headwidth}{\centering\if@RTLmain\beginR\else\beginL\fi#3\if@RTLmain\endR\else\endL\fi}\hfill + \llap{\parbox[b]{\headwidth}{\raggedleft\if@RTLmain\beginR\else\beginL\fi#4\if@RTLmain\endR\else\endL\fi}}}\headrule}\endL}\if@RTLmain\beginR\else\beginL\fi#5\if@RTLmain\endR\else\endL\fi} +\def\@fancyfoot#1#2#3#4#5{\if@RTLmain\beginR\else\beginL\fi#1\if@RTLmain\endR\else\endL\fi\hbox to\headwidth{\beginL\fancy@reset \@fancyvbox\footskip{\footrule - \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}{\raggedleft\if@RTLmain\beginR\fi#4\if@RTLmain\endR\fi}}}}\endL}\if@RTLmain\beginR\fi#5\if@RTLmain\endR\fi} + \hbox{\rlap{\parbox[t]{\headwidth}{\raggedright\if@RTLmain\beginR\else\beginL\fi#2\if@RTLmain\endR\else\endL\fi}}\hfill + \parbox[t]{\headwidth}{\centering\if@RTLmain\beginR\else\beginL\fi#3\if@RTLmain\endR\else\endL\fi}\hfill + \llap{\parbox[t]{\headwidth}{\raggedleft\if@RTLmain\beginR\else\beginL\fi#4\if@RTLmain\endR\else\endL\fi}}}}\endL}\if@RTLmain\beginR\else\beginL\fi#5\if@RTLmain\endR\else\endL\fi} %% %% Copyright © 2009-2010 by Vafa Khalighi <vafakh84@gmail.com> %% diff --git a/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def index 7e4d06435de..0a56cdb48a6 100644 --- a/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/stabular-xetex-bidi.def @@ -8,15 +8,15 @@ %% License information appended. %% %% -\ProvidesFile{stabular-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for stabular package for XeTeX engine] -\def\@stabular{\if@RTL\global\@RTLtabtrue\fi +\ProvidesFile{stabular-xetex-bidi.def}[2010/08/01 v0.2 bidi adaptations for stabular package for XeTeX engine] +\def\@stabular{\if@RTL\@RTLtabtrue\fi \leavevmode \bgroup \if@RTLtab\beginR \fi \let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\@stabarray} \def\endstabular{\crcr\egroup\if@RTLtab\egroup\endR\egroup\fi \egroup \if@RTLtab\endR\fi\egroup - \global\@RTLtabfalse} + \@RTLtabfalse} \expandafter \let \csname endstabular*\endcsname = \endstabular \def\@sarray[#1]#2{% \bgroup diff --git a/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def index 4cfdbca3f34..56b36fd5847 100644 --- a/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/tabls-xetex-bidi.def @@ -8,9 +8,9 @@ %% License information appended. %% %% -\ProvidesFile{tabls-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for tabls package for XeTeX engine] +\ProvidesFile{tabls-xetex-bidi.def}[2010/08/01 v0.2 bidi adaptations for tabls package for XeTeX engine] \def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup - \global\@RTLtabfalse} + \@RTLtabfalse} \expandafter\let\csname endtabular*\endcsname=\endtabular diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def index 6f07baa2982..719fe721731 100644 --- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def @@ -8,7 +8,7 @@ %% License information appended. %% %% -\ProvidesFile{xetex-bidi.def}[2010/07/25 v0.7 bidi adaptations for XeTeX engine] +\ProvidesFile{xetex-bidi.def}[2010/08/01 v0.8 bidi adaptations for XeTeX engine] \ifx\TeXXeTstate\undefined\else% \TeXXeTstate=1 \fi @@ -184,14 +184,14 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \let\undertext=\underline \fi \global\@RTLtabfalse -\def\@tabular{\if@RTL\global\@RTLtabtrue\fi +\def\@tabular{\if@RTL\@RTLtabtrue\fi \leavevmode \hbox \bgroup \if@RTLtab\beginR \fi $\let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} \def\endtabular{\crcr\egroup\if@RTLtab\egroup\endR\egroup\fi \egroup $\if@RTLtab\endR\fi\egroup - \global\@RTLtabfalse} + \@RTLtabfalse} \expandafter \let \csname endtabular*\endcsname = \endtabular \def\@array[#1]#2{% \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi |