From 140f4b57375334c908ad0cf2e96697fe95aafb31 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Nov 2011 23:10:56 +0000 Subject: bidi (5nov11) git-svn-id: svn://tug.org/texlive/trunk@24514 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bidi/bidi.sty | 2 +- .../texmf-dist/tex/latex/bidi/crop-xetex-bidi.def | 175 +++++++++++++++++++++ .../tex/latex/bidi/loadingorder-bidi.def | 10 +- .../tex/latex/bidi/picinpar-xetex-bidi.def | 36 +++++ Master/texmf-dist/tex/latex/bidi/xetex-bidi.def | 7 +- 5 files changed, 225 insertions(+), 5 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/bidi/crop-xetex-bidi.def create mode 100644 Master/texmf-dist/tex/latex/bidi/picinpar-xetex-bidi.def (limited to 'Master/texmf-dist/tex/latex/bidi') diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty index 31abec34312..47e53724d18 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{2012/01/01} -\def\bidiversion{v1.4.4} +\def\bidiversion{v1.4.5} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% diff --git a/Master/texmf-dist/tex/latex/bidi/crop-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/crop-xetex-bidi.def new file mode 100644 index 00000000000..3d5c1484ee6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/bidi/crop-xetex-bidi.def @@ -0,0 +1,175 @@ +%% +%% This is file `crop-xetex-bidi.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bidi.dtx (with options: `crop-xetex-bidi.def') +%% +%% ______________________________________ +%% Copyright © 2009–2012 Vafa Khalighi +%% +%% License information appended. +%% +%% +\ProvidesFile{crop-xetex-bidi.def}[2011/11/05 v0.1 bidi adaptations for crop package for XeTeX engine] +\renewcommand*\CROP@@laxis{% + \if@RTLmain% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(2,0){\line(1,0){11}} + \end{picture}% + \else% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(-2,0){\line(-1,0){11}} + \end{picture}% + \fi% +} +\renewcommand*\CROP@@raxis{% + \if@RTLmain% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(-2,0){\line(-1,0){11}} + \end{picture}% + \else% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(2,0){\line(1,0){11}} + \end{picture}% + \fi% +} +\renewcommand*\CROP@@ulc{% + \if@RTLmain% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(30,0){\circle{10}} + \put(30,-5){\line(0,1){10}} + \put(35,0){\line(-1,0){30}} + \put(0,30){\circle{10}} + \put(5,30){\line(-1,0){10}} + \put(0,35){\line(0,-1){30}} + \end{picture}% + \else% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(-30,0){\circle{10}} + \put(-30,-5){\line(0,1){10}} + \put(-35,0){\line(1,0){30}} + \put(0,30){\circle{10}} + \put(-5,30){\line(1,0){10}} + \put(0,35){\line(0,-1){30}} + \end{picture}% + \fi% +} +\renewcommand*\CROP@@urc{% + \if@RTLmain% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(-30,0){\circle{10}} + \put(-30,-5){\line(0,1){10}} + \put(-35,0){\line(1,0){30}} + \put(0,30){\circle{10}} + \put(5,30){\line(-1,0){10}} + \put(0,35){\line(0,-1){30}} + \end{picture}% + \else% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(30,0){\circle{10}} + \put(30,-5){\line(0,1){10}} + \put(35,0){\line(-1,0){30}} + \put(0,30){\circle{10}} + \put(-5,30){\line(1,0){10}} + \put(0,35){\line(0,-1){30}} + \end{picture}% + \fi% +} +\renewcommand*\CROP@@llc{% + \if@RTLmain% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(30,0){\circle{10}} + \put(30,-5){\line(0,1){10}} + \put(35,0){\line(-1,0){30}} + \put(0,-30){\circle{10}} + \put(5,-30){\line(-1,0){10}} + \put(0,-35){\line(0,1){30}} + \end{picture}% + \else% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(-30,0){\circle{10}} + \put(-30,-5){\line(0,1){10}} + \put(-35,0){\line(1,0){30}} + \put(0,-30){\circle{10}} + \put(-5,-30){\line(1,0){10}} + \put(0,-35){\line(0,1){30}} + \end{picture}% + \fi% +} +\renewcommand*\CROP@@lrc{% + \if@RTLmain% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(-30,0){\circle{10}} + \put(-30,-5){\line(0,1){10}} + \put(-35,0){\line(1,0){30}} + \put(0,-30){\circle{10}} + \put(5,-30){\line(-1,0){10}} + \put(0,-35){\line(0,1){30}} + \end{picture}% + \else% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(30,0){\circle{10}} + \put(30,-5){\line(0,1){10}} + \put(35,0){\line(-1,0){30}} + \put(0,-30){\circle{10}} + \put(-5,-30){\line(1,0){10}} + \put(0,-35){\line(0,1){30}} + \end{picture}% + \fi% +} +\renewcommand*\CROP@@frame{% + \if@RTLmain% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(0,0){\line(-1,0){\strip@pt\paperwidth}} + \put(0,0){\line(0,-1){\strip@pt\paperheight}} + \put(-\strip@pt\paperwidth,0){\line(0,-1){\strip@pt\paperheight}} + \put(0,-\strip@pt\paperheight){\line(-1,0){\strip@pt\paperwidth}} + \end{picture}% + \else% + \begin{picture}(0,0) + \unitlength\p@\thinlines + \put(0,0){\line(1,0){\strip@pt\paperwidth}} + \put(0,0){\line(0,-1){\strip@pt\paperheight}} + \put(\strip@pt\paperwidth,0){\line(0,-1){\strip@pt\paperheight}} + \put(0,-\strip@pt\paperheight){\line(1,0){\strip@pt\paperwidth}} + \end{picture}% + \fi% +} +\@ifpackagewith{crop}{axes}{% +\CROP@execopt{axes}% +}{} +\@ifpackagewith{crop}{cam}{% +\CROP@execopt{cam}% +}{} +\@ifpackagewith{crop}{frame}{% +\CROP@execopt{frame}% +}{} +%% +%% Copyright © 2009–2012 Vafa Khalighi +%% +%% It may be distributed and/or modified under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is “author-maintained” (as per LPPL maintenance status) +%% by Vafa Khalighi. +%% +%% +%% +%% +%% End of file `crop-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def index 69b0f658a35..a18f3f25280 100644 --- a/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/loadingorder-bidi.def @@ -12,11 +12,12 @@ %% License information appended. %% %% -\ProvidesFile{loadingorder-bidi.def}[2012/01/01 v0.8 making sure that bidi is the last package loaded] +\ProvidesFile{loadingorder-bidi.def}[2012/01/01 v0.8a making sure that bidi is the last package loaded] \bidi@isloaded{amsmath} \bidi@isloaded{amsthm} \bidi@isloaded{breqn} \bidi@isloaded{caption} +\bidi@isloaded{crop} \bidi@isloaded{color} \bidi@isloaded{dblfnote} \bidi@isloaded{xcolor} @@ -38,6 +39,7 @@ \bidi@isloaded{lettrine} \bidi@isloaded{pstricks} \bidi@isloaded{pgf} +\bidi@isloaded{picinpar} \bidi@isloaded{quotchap} \bidi@isloaded{tikz} \bidi@isloaded{titlesec} @@ -75,6 +77,9 @@ \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} \fi% + \if@bidi@croploaded@\else + \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package crop after bidi package. Please load package crop before bidi package, and then try to run xelatex on your document again}{}]{crop} + \fi% \if@bidi@colorloaded@\else \@ifpackageloaded{hyperref}{}{% \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package color after bidi package. Please load package color before bidi package, and then try to run xelatex on your document again}{}]{color}} @@ -139,6 +144,9 @@ \if@bidi@pgfloaded@\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pgf after bidi package. Please load package pgf before bidi package, and then try to run xelatex on your document again}{}]{pgf} \fi% + \if@bidi@picinparloaded@\else + \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package picinpar after bidi package. Please load package picinpar before bidi package, and then try to run xelatex on your document again}{}]{picinpar} + \fi% \if@bidi@quotchaploaded@\else \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package quotchap after bidi package. Please load package quotchap before bidi package, and then try to run xelatex on your document again}{}]{quotchap} \fi% diff --git a/Master/texmf-dist/tex/latex/bidi/picinpar-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/picinpar-xetex-bidi.def new file mode 100644 index 00000000000..fa1771f8b8f --- /dev/null +++ b/Master/texmf-dist/tex/latex/bidi/picinpar-xetex-bidi.def @@ -0,0 +1,36 @@ +%% +%% This is file `picinpar-xetex-bidi.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bidi.dtx (with options: `picinpar-xetex-bidi.def') +%% +%% ______________________________________ +%% Copyright © 2009–2012 Vafa Khalighi +%% +%% License information appended. +%% +%% +\ProvidesFile{picinpar-xetex-bidi.def}[2011/11/05 v0.1 bidi adaptations for picinpar package for XeTeX engine] +\long\def\@makewincaption#1#2{% + \setbox\@tempboxa\hbox{\footnotesize{\bf #1:\enspace}{#2}}% + \ifdim\wd\@tempboxa>\picwd + {\footnotesize{\bf #1:\enspace}{#2\par}} + \else + \hbox to\picwd{\if@RTL\beginR\fi\hfil\box\@tempboxa\hfil\if@RTL\endR\fi} + \fi} +%% +%% Copyright © 2009–2012 Vafa Khalighi +%% +%% It may be distributed and/or modified under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is “author-maintained” (as per LPPL maintenance status) +%% by Vafa Khalighi. +%% +%% +%% +%% +%% End of file `picinpar-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def index 35e987ebb1a..6aae2f56c93 100644 --- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def @@ -98,10 +98,9 @@ \gdef\endpicture{% \egroup\hss\egroup \ht\@picbox\@picht\dp\@picbox\z@ - \ifmmode\else\LTR\beginL\fi% - \mbox{\box\@picbox}% - \ifmmode\else\endL\endLTR\fi} + \mbox{\beginL\box\@picbox\endL}} \@ifpackageloaded{mathtools}{\RequirePackage{graphicx}}{} +\@ifpackageloaded{crop}{\RequirePackage{graphicx}}{} \@ifpackageloaded{sidecap}{\RequirePackage{ragged2e}}{} \DeclareOption{RTLdocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}} \DeclareOption{rldocument}{\@RTLtrue\@RTL@footnotetrue\g@addto@macro\document{\autofootnoterule}} @@ -687,6 +686,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \@ifpackageloaded{amsthm}{\input{amsthm-xetex-bidi.def}}{} \@ifpackageloaded{breqn}{\input{breqn-xetex-bidi.def}}{} \@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{} +\@ifpackageloaded{crop}{\input{crop-xetex-bidi.def}}{} \@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{} \@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{} \@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{} @@ -742,6 +742,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \@ifpackageloaded{multienum}{\input{multienum-xetex-bidi.def}}{} \@ifpackageloaded{natbib}{\input{natbib-xetex-bidi.def}}{} \@ifpackageloaded{minitoc}{\input{minitoc-xetex-bidi.def}}{} +\@ifpackageloaded{picinpar}{\input{picinpar-xetex-bidi.def}}{} \@ifpackageloaded{quotchap}{\input{quotchap-xetex-bidi.def}}{} \@ifpackageloaded{ragged2e}{\input{ragged2e-xetex-bidi.def}}{} \@ifpackageloaded{tabls}{\input{tabls-xetex-bidi.def}}{} -- cgit v1.2.3