diff options
author | Karl Berry <karl@freefriends.org> | 2011-09-27 00:24:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-09-27 00:24:20 +0000 |
commit | e4e8eef9e1180c92e1f3c563aa584aea42f45608 (patch) | |
tree | 0ba0e5eba5ce886286f26955f1b8b6b10eedb651 | |
parent | e1ce438b65610681c070dafd5cb4b370d27c73c8 (diff) |
bidi (26sep11)
git-svn-id: svn://tug.org/texlive/trunk@24103 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/bidi/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/bidi/bidi.pdf | bin | 152639 -> 152740 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/bidi/bidi.dtx | 48 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/bidi.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bidi/xetex-bidi.def | 20 |
8 files changed, 42 insertions, 50 deletions
diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README index 38442aff00f..b552fa3303c 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.3.2 +v1.3.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.3.1. +This version fixes all the bugs that were present in v1.3.2. ___________________ VAFA KHALIGHI diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.pdf b/Master/texmf-dist/doc/latex/bidi/bidi.pdf Binary files differindex ea7dd5e2d28..ad504a72919 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 b64fda1ea4e..4423c33942c 100644 --- a/Master/texmf-dist/source/latex/bidi/bidi.dtx +++ b/Master/texmf-dist/source/latex/bidi/bidi.dtx @@ -5,12 +5,12 @@ %<*readme> ___________________ The bidi package -v1.3.2 +v1.3.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.3.1. +This version fixes all the bugs that were present in v1.3.2. ___________________ VAFA KHALIGHI @@ -232,7 +232,7 @@ by VAFA KHALIGHI. % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe} % \author{VAFA KHALIGHI\\ % \url{vafaklg@gmail.com}} -% \date{\today\qquad Version 1.3.2} +% \date{\today\qquad Version 1.3.3} % \maketitle % \tableofcontents %\section*{Introduction} @@ -247,7 +247,7 @@ by VAFA KHALIGHI. %in plain TeX and LaTeX. The package includes adaptations for use %with many other commonly-used packages. %Copyright (c) 2009-2011 VAFA KHALIGHI -%v1.3.2, 2011/10/01 +%v1.3.3, 2011/10/01 %License: LaTeX Project Public License, version 1.3c or higher (your choice) %Location on CTAN: /macros/latex/contrib/bidi %\end{lstlisting} @@ -2521,7 +2521,7 @@ by VAFA KHALIGHI. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \def\bididate{2011/10/01} -\def\bidiversion{v1.3.2} +\def\bidiversion{v1.3.3} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -10316,8 +10316,8 @@ bidi implementation of tufte title] \if@RTL \edef\L@parshape{\L@parshape 0pt \the\linewidth}\else\edef\L@parshape{\L@parshape \rightmargin \the\linewidth}\fi \noindent\leavevmode \parshape=\L@parshape - $\smash{\if@RTL\rlap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% - \hskip \the\L@Findent}\else\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + $\smash{\if@RTL\rlap{\hskip \the\L@Findent\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + }\else\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% \hskip \the\L@Findent}\fi}$% \usebox{\L@tbox}} % \end{macrocode} @@ -11156,12 +11156,12 @@ bidi implementation of tufte title] \def\TeXXeTOn{\TeXXeTstate=1 } \def\TeXXeTOff{\TeXXeTstate=0 } \TeXXeTOn -\def\Bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\box\z@}\fi} - \let\o@everypar=\everypar - \newtoks\n@everypar - \n@everypar\expandafter{\the\o@everypar} - \o@everypar{\Bidi@RTL@everypar\the\n@everypar} - \let\everypar=\n@everypar +\def\bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\ifvoid\z@\else\box\z@\fi}\fi} + \let\bidi@o@everypar=\everypar + \newtoks\bidi@n@everypar + \bidi@n@everypar\expandafter{\the\bidi@o@everypar} + \bidi@o@everypar{\bidi@RTL@everypar\the\bidi@n@everypar} + \let\everypar=\bidi@n@everypar \def\moreLRE{\bracetext \aftergroup\endL \beginL\@RTLfalse} \def\moreRLE{\bracetext \aftergroup\endR \beginR\@RTLtrue} \protected\def\hboxR{\hbox\bgroup @@ -14702,7 +14702,7 @@ bidi implementation of tufte title] % \subsection{\textsf{wrapfig-xetex-bidi.def}} % \begin{macrocode} \ProvidesFile{wrapfig-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for wrapfig package for XeTeX engine] -\let\WF@@everypar\n@everypar +\let\WF@@everypar\bidi@n@everypar \def\WF@putfigmaybe{% \ifinner \vskip-\parskip \global\WF@floatfalse @@ -14899,12 +14899,12 @@ bidi implementation of tufte title] \newcommand{\TeXXeTOn}{\TeXXeTstate=1 } \newcommand{\TeXXeTOff}{\TeXXeTstate=0 } \TeXXeTOn -\def\Bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\usebox\z@}\fi} - \let\o@everypar=\everypar - \newtoks\n@everypar - \n@everypar\expandafter{\the\o@everypar} - \o@everypar{\Bidi@RTL@everypar\the\n@everypar} - \let\everypar=\n@everypar +\def\bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\ifvoid\z@\else\usebox\z@\fi}\fi} + \let\bidi@o@everypar=\everypar + \newtoks\bidi@n@everypar + \bidi@n@everypar\expandafter{\the\bidi@o@everypar} + \bidi@o@everypar{\bidi@RTL@everypar\the\bidi@n@everypar} + \let\everypar=\bidi@n@everypar \def\moreLRE{\bracetext \aftergroup\endL \beginL\@RTLfalse} \def\moreRLE{\bracetext \aftergroup\endR \beginR\@RTLtrue} \protected\def\hboxR{\hbox\bgroup @@ -15009,12 +15009,8 @@ bidi implementation of tufte title] \parindent\listparindent \advance\linewidth -\rightmargin \advance\linewidth -\leftmargin - \if@RTL - \advance\@totalleftmargin \rightmargin - \else - \advance\@totalleftmargin \leftmargin - \fi - \parshape \@ne \@totalleftmargin \linewidth + \advance\@totalleftmargin \leftmargin + \if@RTL\parshape \@ne 0pt \linewidth\else\parshape \@ne \@totalleftmargin \linewidth\fi \ignorespaces} \newenvironment{LTRitems}[1][\labelsep] {\par\@RTLfalse diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty index 5d2cc780ada..f9e5cdf00bb 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.2} +\def\bidiversion{v1.3.3} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% diff --git a/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def index 5144936c755..ea03703ab10 100644 --- a/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/lettrine-xetex-bidi.def @@ -98,8 +98,8 @@ \if@RTL \edef\L@parshape{\L@parshape 0pt \the\linewidth}\else\edef\L@parshape{\L@parshape \rightmargin \the\linewidth}\fi \noindent\leavevmode \parshape=\L@parshape - $\smash{\if@RTL\rlap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% - \hskip \the\L@Findent}\else\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + $\smash{\if@RTL\rlap{\hskip \the\L@Findent\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + }\else\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% \hskip \the\L@Findent}\fi}$% \usebox{\L@tbox}} %% diff --git a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def index 05b5f6b6dc5..839ac292df6 100644 --- a/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/plain-xetex-bidi.def @@ -15,12 +15,12 @@ \def\TeXXeTOn{\TeXXeTstate=1 } \def\TeXXeTOff{\TeXXeTstate=0 } \TeXXeTOn -\def\Bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\box\z@}\fi} - \let\o@everypar=\everypar - \newtoks\n@everypar - \n@everypar\expandafter{\the\o@everypar} - \o@everypar{\Bidi@RTL@everypar\the\n@everypar} - \let\everypar=\n@everypar +\def\bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\ifvoid\z@\else\box\z@\fi}\fi} + \let\bidi@o@everypar=\everypar + \newtoks\bidi@n@everypar + \bidi@n@everypar\expandafter{\the\bidi@o@everypar} + \bidi@o@everypar{\bidi@RTL@everypar\the\bidi@n@everypar} + \let\everypar=\bidi@n@everypar \def\moreLRE{\bracetext \aftergroup\endL \beginL\@RTLfalse} \def\moreRLE{\bracetext \aftergroup\endR \beginR\@RTLtrue} \protected\def\hboxR{\hbox\bgroup diff --git a/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def index cd4452aca20..b18fe03cb4e 100644 --- a/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/wrapfig-xetex-bidi.def @@ -13,7 +13,7 @@ %% %% \ProvidesFile{wrapfig-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for wrapfig package for XeTeX engine] -\let\WF@@everypar\n@everypar +\let\WF@@everypar\bidi@n@everypar \def\WF@putfigmaybe{% \ifinner \vskip-\parskip \global\WF@floatfalse diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def index 326ed5bc2e8..12cf896b8ec 100644 --- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def @@ -16,12 +16,12 @@ \newcommand{\TeXXeTOn}{\TeXXeTstate=1 } \newcommand{\TeXXeTOff}{\TeXXeTstate=0 } \TeXXeTOn -\def\Bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\usebox\z@}\fi} - \let\o@everypar=\everypar - \newtoks\n@everypar - \n@everypar\expandafter{\the\o@everypar} - \o@everypar{\Bidi@RTL@everypar\the\n@everypar} - \let\everypar=\n@everypar +\def\bidi@RTL@everypar{\if@RTL{\setbox\z@\lastbox\beginR\ifvoid\z@\else\usebox\z@\fi}\fi} + \let\bidi@o@everypar=\everypar + \newtoks\bidi@n@everypar + \bidi@n@everypar\expandafter{\the\bidi@o@everypar} + \bidi@o@everypar{\bidi@RTL@everypar\the\bidi@n@everypar} + \let\everypar=\bidi@n@everypar \def\moreLRE{\bracetext \aftergroup\endL \beginL\@RTLfalse} \def\moreRLE{\bracetext \aftergroup\endR \beginR\@RTLtrue} \protected\def\hboxR{\hbox\bgroup @@ -126,12 +126,8 @@ \parindent\listparindent \advance\linewidth -\rightmargin \advance\linewidth -\leftmargin - \if@RTL - \advance\@totalleftmargin \rightmargin - \else - \advance\@totalleftmargin \leftmargin - \fi - \parshape \@ne \@totalleftmargin \linewidth + \advance\@totalleftmargin \leftmargin + \if@RTL\parshape \@ne 0pt \linewidth\else\parshape \@ne \@totalleftmargin \linewidth\fi \ignorespaces} \newenvironment{LTRitems}[1][\labelsep] {\par\@RTLfalse |