From dd62e466f5d1dbca765bf38bbaeb50611345fa6a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 May 2013 23:11:40 +0000 Subject: bidi (22may13) git-svn-id: svn://tug.org/texlive/trunk@30638 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/bidi/bidi.dtx | 151 +++++++++++++++++++++++++-- Master/texmf-dist/source/latex/bidi/bidi.ins | 2 + 2 files changed, 142 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx index 0f4f6cd0e41..d7ba444aeea 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.2 +v13.3 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/01 +Current version release date: 2013/05/22 ___________________ Persian TeX Group @@ -39,6 +39,12 @@ This work is “maintained” (as per LPPL maintenance status) by Persian TeX Group. % %<*changelog> +2013/05/22 version 13.3 Persian TeX Group + * Version 13.3 released. + * `cals' package partially supported. + * Fixed `sideways' environment of `rotating' package in RTL mode. + * `newfloat' package supported. + 2013/05/01 version 13.2 Persian TeX Group * Version 13.2 released. * `fancybox' package is supported. @@ -187,6 +193,7 @@ by Persian TeX Group. \generate{\file{bookest-xetex-bidi.def}{\from{\jobname.dtx}{bookest-xetex-bidi.def}}} \generate{\file{book-xetex-bidi.def}{\from{\jobname.dtx}{book-xetex-bidi.def}}} \generate{\file{breqn-xetex-bidi.def}{\from{\jobname.dtx}{breqn-xetex-bidi.def}}} +\generate{\file{cals-xetex-bidi.def}{\from{\jobname.dtx}{cals-xetex-bidi.def}}} \generate{\file{caption-xetex-bidi.def}{\from{\jobname.dtx}{caption-xetex-bidi.def}}} \generate{\file{caption3-xetex-bidi.def}{\from{\jobname.dtx}{caption3-xetex-bidi.def}}} \generate{\file{colortbl-xetex-bidi.def}{\from{\jobname.dtx}{colortbl-xetex-bidi.def}}} @@ -235,6 +242,7 @@ by Persian TeX Group. \generate{\file{multicol-xetex-bidi.def}{\from{\jobname.dtx}{multicol-xetex-bidi.def}}} \generate{\file{multienum-xetex-bidi.def}{\from{\jobname.dtx}{multienum-xetex-bidi.def}}} \generate{\file{natbib-xetex-bidi.def}{\from{\jobname.dtx}{natbib-xetex-bidi.def}}} +\generate{\file{newfloat-xetex-bidi.def}{\from{\jobname.dtx}{newfloat-xetex-bidi.def}}} \generate{\file{ntheorem-xetex-bidi.def}{\from{\jobname.dtx}{ntheorem-xetex-bidi.def}}} \generate{\file{ntheorem-hyper-xetex-bidi.def}{\from{\jobname.dtx}{ntheorem-hyper-xetex-bidi.def}}} \generate{\file{pdfpages-xetex-bidi.def}{\from{\jobname.dtx}{pdfpages-xetex-bidi.def}}} @@ -354,7 +362,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.2} +% \date{\today\qquad Version 13.3} %\maketitle % \tableofcontents %\section*{Introduction} @@ -369,7 +377,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.2, 2013/05/01 +%v13.3, 2013/05/22 %License: LaTeX Project Public License, version 1.3c or higher (your choice) %Location on CTAN: /macros/latex/contrib/bidi %\end{lstlisting} @@ -782,7 +790,7 @@ by Persian TeX Group. %\subsection{Equation Numbers} %For \texttt{reqno}, equation numbers are on the right hand side and for \texttt{leqno}, equation numbers are on the left hand side, independent on the current mode. %\section{Support For Various Packages and Classes} -%The \textsf{bidi} package supports \textsf{amsmath}, \textsf{amstext}, \textsf{amsthm}, \textsf{array}, \textsf{arydshln}, \textsf{breqn}, \textsf{caption}, \textsf{color}, \textsf{colortbl}, \textsf{crop}, \textsf{cuted}, \textsf{cutwin}, \textsf{dblfnote} \textsf{draftwatermark}, \textsf{empheq}, \textsf{fancyhdr}, \textsf{fancybox}, \textsf{fix2col}, \textsf{float}, \textsf{floatrow}, \textsf{flowfram}, \textsf{framed}, \textsf{ftnright}, \textsf{geometry}, \textsf{graphicx}, \textsf{hvfloat}, \textsf{hyperref}, \textsf{lettrine}, \textsf{listings}, \textsf{mdframed}, \textsf{midfloat}, \textsf{minitoc}, \textsf{multicol}, \textsf{multienum}, \textsf{pdfpages}, \textsf{pstricks}, \textsf{quotchap}, \textsf{picinpar}, \textsf{ragged2e}, \textsf{rotating}, \textsf{sidecap}, \textsf{stabular}, \textsf{subfig}, \textsf{subfigure}, \textsf{supertabular}, \textsf{xtab}, \textsf{tabls}, \textsf{tabulary}, \textsf{PGF \&\ TIKZ}, \textsf{tocbibind}, \textsf{tocloft}, \textsf{tocstyle}, \textsf{wrapfig}, \textsf{xcolor}, \textsf{xltxtra} packages, \textsf{amsart}, \textsf{amsbook}, \textsf{artikel1}, \textsf{artikel2}, \textsf{artikel3}, \textsf{extarticle}, \textsf{flashcards}, \textsf{standrad article}, \textsf{boek}, \textsf{boek3}, \textsf{standard book}, \textsf{bookest}, \textsf{extbook}, \textsf{extletter}, \textsf{scrlettr},\textsf{standard letter}, \textsf{memoir}, \textsf{extreport}, \textsf{rapport1}, \textsf{rapport3}, \textsf{refrep}, \textsf{standard report}, \textsf{scrartcl}, \textsf{scrbook}, \textsf{scrreprt} classes and any other packages and classes that relies on these packages and classes. This means, you can use all these packages and classes in addition to other packages and classes that rely on these packages and classes and use their functionality fully for your bidirectional documents. +%The \textsf{bidi} package supports \textsf{amsmath}, \textsf{amstext}, \textsf{amsthm}, \textsf{array}, \textsf{arydshln}, \textsf{breqn}, \textsf{cals}, \textsf{caption}, \textsf{color}, \textsf{colortbl}, \textsf{crop}, \textsf{cuted}, \textsf{cutwin}, \textsf{dblfnote} \textsf{draftwatermark}, \textsf{empheq}, \textsf{fancyhdr}, \textsf{fancybox}, \textsf{fix2col}, \textsf{float}, \textsf{floatrow}, \textsf{flowfram}, \textsf{framed}, \textsf{ftnright}, \textsf{geometry}, \textsf{graphicx}, \textsf{hvfloat}, \textsf{hyperref}, \textsf{lettrine}, \textsf{listings}, \textsf{mdframed}, \textsf{midfloat}, \textsf{minitoc}, \textsf{multicol}, \textsf{multienum}, \textsf{newfloat}, \textsf{pdfpages}, \textsf{pstricks}, \textsf{quotchap}, \textsf{picinpar}, \textsf{ragged2e}, \textsf{rotating}, \textsf{sidecap}, \textsf{stabular}, \textsf{subfig}, \textsf{subfigure}, \textsf{supertabular}, \textsf{xtab}, \textsf{tabls}, \textsf{tabulary}, \textsf{PGF \&\ TIKZ}, \textsf{tocbibind}, \textsf{tocloft}, \textsf{tocstyle}, \textsf{wrapfig}, \textsf{xcolor}, \textsf{xltxtra} packages, \textsf{amsart}, \textsf{amsbook}, \textsf{artikel1}, \textsf{artikel2}, \textsf{artikel3}, \textsf{extarticle}, \textsf{flashcards}, \textsf{standrad article}, \textsf{boek}, \textsf{boek3}, \textsf{standard book}, \textsf{bookest}, \textsf{extbook}, \textsf{extletter}, \textsf{scrlettr},\textsf{standard letter}, \textsf{memoir}, \textsf{extreport}, \textsf{rapport1}, \textsf{rapport3}, \textsf{refrep}, \textsf{standard report}, \textsf{scrartcl}, \textsf{scrbook}, \textsf{scrreprt} classes and any other packages and classes that relies on these packages and classes. This means, you can use all these packages and classes in addition to other packages and classes that rely on these packages and classes and use their functionality fully for your bidirectional documents. % %We now give some details that you should know about the supported packages or classes. %\subsection{Color} @@ -2693,8 +2701,8 @@ by Persian TeX Group. % \subsection{\textsf{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2013/05/01} -\def\bidiversion{v13.2} +\def\bididate{2013/05/22} +\def\bidiversion{v13.3} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -2762,7 +2770,7 @@ Location on CTAN: /macros/latex/contrib/bidi} %\fi % \subsection{\textsf{bidi.tex}} % \begin{macrocode} -\def\bididate{2013/05/01} +\def\bididate{2013/05/22} \def\bidiversion{v0.2} \catcode`@=11 \let \protect \relax @@ -6791,6 +6799,62 @@ bidi implementation of tufte title] % \end{macrocode} % \iffalse % +%<*cals-xetex-bidi.def> +%\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 +\let\cals@thead@tokens=\relax +\let\cals@tfoot@tokens=\relax +\let\cals@tbreak@tokens=\relax +\cals@tfoot@height=0pt \relax +\let\cals@last@context=n% +\let\cals@current@context=b% +\parindent=0pt % +\cals@setpadding{Ag}\cals@setcellprevdepth{Al}% +\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} + +\renewcommand\alignR{% +\dimen0=\cals@paddingL \if@RTLtab\cals@paddingL=\dimen0\else\cals@paddingL=\dimen0 plus 1fill\fi\relax +\dimen0=\cals@paddingR \cals@paddingR=\dimen0 \relax} +% \end{macrocode} +% \iffalse +% %<*caption-xetex-bidi.def> %\fi % \subsection{\textsf{caption-xetex-bidi.def}} @@ -12255,11 +12319,12 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{loadingorder-bidi.def}} % \begin{macrocode} -\ProvidesFile{loadingorder-bidi.def}[2013/05/01 v0.94 making sure that bidi is the last package loaded] +\ProvidesFile{loadingorder-bidi.def}[2013/05/22 v0.95 making sure that bidi is the last package loaded] \bidi@isloaded{amsmath} \bidi@isloaded{amstext} \bidi@isloaded{amsthm} \bidi@isloaded{breqn} +\bidi@isloaded{cals} \bidi@isloaded{caption} \bidi@isloaded{crop} \bidi@isloaded{cuted} @@ -12311,6 +12376,7 @@ bidi implementation of tufte title] \bidi@isloaded{multienum} \bidi@isloaded{minitoc} \bidi@isloaded{natbib} +\bidi@isloaded{newfloat} \bidi@isloaded{ragged2e} \bidi@isloaded{rotating} \bidi@isloaded{tabls} @@ -12333,6 +12399,9 @@ bidi implementation of tufte title] \fi% \if@bidi@breqnloaded@\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package breqn after bidi package. Please load package breqn before bidi package, and then try to run xelatex on your document again}{}]{breqn} + \fi% + \if@bidi@calsloaded@\else + \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package cals after bidi package. Please load package cals before bidi package, and then try to run xelatex on your document again}{}]{cals} \fi% \if@bidi@captionloaded@\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package caption after bidi package. Please load package caption before bidi package, and then try to run xelatex on your document again}{}]{caption} @@ -12481,6 +12550,9 @@ bidi implementation of tufte title] \fi% \if@bidi@natbibloaded@\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package natbib after bidi package. Please load package natbib before bidi package, and then try to run xelatex on your document again}{}]{natbib} + \fi% + \if@bidi@newfloatloaded@\else + \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package newfloat after bidi package. Please load package newfloat before bidi package, and then try to run xelatex on your document again}{}]{newfloat} \fi% \csname if@bidi@ragged2eloaded@\endcsname\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package ragged2e after bidi package. Please load package ragged2e before bidi package, and then try to run xelatex on your document again}{}]{ragged2e} @@ -13332,6 +13404,51 @@ bidi implementation of tufte title] % \end{macrocode} % \iffalse % +%<*newfloat-xetex-bidi.def> +%\fi +% \subsection{\textsf{newfloat-xetex-bidi.def}} +% \begin{macrocode} +\ProvidesFile{newfloat-xetex-bidi.def}[2013/05/22 v0.1 bidi adaptations for newfloat package for XeTeX engine] +\renewcommand*\newfloat@setwithin[2]{% + \ifcsname c@chapter\endcsname + \@removefromreset{#1}{chapter}% + \fi + \@removefromreset{#1}{section}% + \edef\@tempa{#2}% + \ifx\@tempa\@empty + \def\@tempa{none}% + \fi + \def\@tempb{none}% + \ifx\@tempa\@tempb + \ifcsname c@chapter\endcsname + \@chapterlistsgap@off{#1}% + \fi + \newfloat@@setwithin{#1}{}{}% + \else + \def\@tempb{chapter}% + \ifx\@tempa\@tempb + \@addtoreset{#1}{chapter}% + \@chapterlistsgap@on{#1}% + \newfloat@@setwithin{#1}{\ifnum\c@chapter>\z@ \thechapter\@SepMark\fi}{\theHchapter.}% + \else + \def\@tempb{section}% + \ifx\@tempa\@tempb + \@addtoreset{#1}{section}% + \ifcsname c@chapter\endcsname + \@addtoreset{#1}{chapter}% + \@chapterlistsgap@on{#1}% + \newfloat@@setwithin{#1}{\thesection.}{\theHsection.}% + \else + \newfloat@@setwithin{#1}{\ifnum\c@section>\z@ \thesection\@SepMark\fi}{\theHsection.}% + \fi + \else + \newfloat@Error{Invalid value `#2' for option `within'}% + \fi + \fi + \fi} +% \end{macrocode} +% \iffalse +% %<*ntheorem-xetex-bidi.def> %\fi % \subsection{\textsf{ntheorem-xetex-bidi.def}} @@ -14770,7 +14887,7 @@ to\rtside{\box\bslice\hfil}} %\fi % \subsection{\textsf{rotating-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{rotating-xetex-bidi.def}[2013/04/12 v0.1 bidi adaptations for rotating package for XeTeX engine] +\ProvidesFile{rotating-xetex-bidi.def}[2013/05/22 v0.2 bidi adaptations for rotating package for XeTeX engine] \def\end@rotfloat{% \end{minipage}\end{lrbox}% \stepcounter{r@tfl@t}% @@ -14889,6 +15006,16 @@ to\rtside{\box\bslice\hfil}} \wd0\z@\dp0\z@\ht0\z@ \ifmmode\else\if@RTL\beginL\fi\fi\Grot@box\ifmmode\else\if@RTL\endL\fi\fi } +\def\sideways{% + \Grot@setangle{90}% + \setbox\z@\color@hbox\ifmmode\if@RTL\beginR\fi\else\if@RTL\beginR\fi\fi\ignorespaces} +\def\endsideways{% + \ifmmode\if@RTL\endR\fi\else\if@RTL\endR\fi\fi + \unskip\color@endbox + \Grot@x\z@ + \Grot@y\z@ + \ifmmode\else\if@RTL\beginL\fi\fi\Grot@box\ifmmode\else\if@RTL\endL\fi\fi +} % \end{macrocode} % \iffalse % @@ -17587,7 +17714,7 @@ to\rtside{\box\bslice\hfil}} %\fi % \subsection{\textsf{xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{xetex-bidi.def}[2013/05/01 v1.1.2 bidi adaptations for XeTeX engine] +\ProvidesFile{xetex-bidi.def}[2013/05/22 v1.1.3 bidi adaptations for XeTeX engine] \newcommand{\TeXXeTOn}{\TeXXeTstate=1 } \newcommand{\TeXXeTOff}{\TeXXeTstate=0 } \TeXXeTOn @@ -18260,6 +18387,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \@ifpackageloaded{amstext}{\input{amstext-xetex-bidi.def}}{} \@ifpackageloaded{amsthm}{\input{amsthm-xetex-bidi.def}}{} \@ifpackageloaded{breqn}{\input{breqn-xetex-bidi.def}}{} +\@ifpackageloaded{cals}{\input{cals-xetex-bidi.def}}{} \@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{} \@ifpackageloaded{caption3}{\input{caption3-xetex-bidi.def}}{} \@ifpackageloaded{floatrow}{\input{floatrow-xetex-bidi.def}}{} @@ -18328,6 +18456,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \@ifpackageloaded{multicol}{\input{multicol-xetex-bidi.def}}{} \@ifpackageloaded{multienum}{\input{multienum-xetex-bidi.def}}{} \@ifpackageloaded{natbib}{\input{natbib-xetex-bidi.def}}{} +\@ifpackageloaded{newfloat}{\input{newfloat-xetex-bidi.def}}{} \@ifpackageloaded{minitoc}{\input{minitoc-xetex-bidi.def}}{} \@ifpackageloaded{picinpar}{\input{picinpar-xetex-bidi.def}}{} \@ifpackageloaded{quotchap}{\input{quotchap-xetex-bidi.def}}{} diff --git a/Master/texmf-dist/source/latex/bidi/bidi.ins b/Master/texmf-dist/source/latex/bidi/bidi.ins index 220a88c7d40..fee475c559f 100644 --- a/Master/texmf-dist/source/latex/bidi/bidi.ins +++ b/Master/texmf-dist/source/latex/bidi/bidi.ins @@ -69,6 +69,7 @@ by Persian TeX Group. \generate{\file{bookest-xetex-bidi.def}{\from{\jobname.dtx}{bookest-xetex-bidi.def}}} \generate{\file{book-xetex-bidi.def}{\from{\jobname.dtx}{book-xetex-bidi.def}}} \generate{\file{breqn-xetex-bidi.def}{\from{\jobname.dtx}{breqn-xetex-bidi.def}}} +\generate{\file{cals-xetex-bidi.def}{\from{\jobname.dtx}{cals-xetex-bidi.def}}} \generate{\file{caption-xetex-bidi.def}{\from{\jobname.dtx}{caption-xetex-bidi.def}}} \generate{\file{caption3-xetex-bidi.def}{\from{\jobname.dtx}{caption3-xetex-bidi.def}}} \generate{\file{colortbl-xetex-bidi.def}{\from{\jobname.dtx}{colortbl-xetex-bidi.def}}} @@ -117,6 +118,7 @@ by Persian TeX Group. \generate{\file{multicol-xetex-bidi.def}{\from{\jobname.dtx}{multicol-xetex-bidi.def}}} \generate{\file{multienum-xetex-bidi.def}{\from{\jobname.dtx}{multienum-xetex-bidi.def}}} \generate{\file{natbib-xetex-bidi.def}{\from{\jobname.dtx}{natbib-xetex-bidi.def}}} +\generate{\file{newfloat-xetex-bidi.def}{\from{\jobname.dtx}{newfloat-xetex-bidi.def}}} \generate{\file{ntheorem-xetex-bidi.def}{\from{\jobname.dtx}{ntheorem-xetex-bidi.def}}} \generate{\file{ntheorem-hyper-xetex-bidi.def}{\from{\jobname.dtx}{ntheorem-hyper-xetex-bidi.def}}} \generate{\file{pdfpages-xetex-bidi.def}{\from{\jobname.dtx}{pdfpages-xetex-bidi.def}}} -- cgit v1.2.3