diff options
| author | Karl Berry <karl@freefriends.org> | 2010-04-18 18:05:48 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-04-18 18:05:48 +0000 |
| commit | 1965064413bcfbb6a41e311fe7231eb2969590c8 (patch) | |
| tree | acf34686757b66fac81dba74d04f1b4303f13831 /Master/texmf-dist/tex | |
| parent | 37f1831f5559f99501eb0123e22795ae5300650b (diff) | |
bidi update (16apr10)
git-svn-id: svn://tug.org/texlive/trunk@17905 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/bidi/bidi.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bidi/xetex-bidi.def | 32 |
2 files changed, 20 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty index 3fbad45a7c3..91288f61c0b 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.0.8} -\def\bidicommit{commit 31} +\def\bidiversion{v1.0.9} +\def\bidicommit{commit 42} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space <\bidicommit> Bidirectional typesetting in XeLaTeX and LuaLaTeX] \edef\bidiinfo{% diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def index 3080f735671..16679305b61 100644 --- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def @@ -300,20 +300,24 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \egroup \egroup \expandafter\@iiiparbox\@mpargs{\leavevmode\unvbox\@tempboxa}} -\def\@arrayparboxrestore{% - \let\if@nobreak\iffalse - \let\if@noskipsec\iffalse - \let\par\@@par - \let\-\@dischyph - \let\'\@acci\let\`\@accii\let\=\@acciii - \parindent\z@ \parskip\z@skip - \everypar{\if@RTL\beginR\else\beginL\fi}% - \linewidth\hsize - \@totalleftmargin\z@ - \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip - \parfillskip\@flushglue \lineskip\normallineskip - \baselineskip\normalbaselineskip - \sloppy} +\long\def\@iiiparbox#1#2[#3]#4#5{% + \leavevmode + \@pboxswfalse + \setlength\@tempdima{#4}% + \@begin@tempboxa\vbox{\hbox{\if@RTL\beginL\fi\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}\if@RTL\endL\fi}}% + \ifx\relax#2\else + \setlength\@tempdimb{#2}% + \edef\@parboxto{to\the\@tempdimb}% + \fi + \if#1b\vbox + \else\if #1t\vtop + \else\ifmmode\vcenter + \else\@pboxswtrue $\vcenter + \fi\fi\fi + \@parboxto{\let\hss\vss\let\unhbox\unvbox + \csname bm@#3\endcsname}% + \if@pboxsw \m@th$\fi + \@end@tempboxa} \def\@addmarginpar{\@next\@marbox\@currlist{\@cons\@freelist\@marbox \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne \if@twocolumn |