From 86e8221f09069b58618c78721f104b3628f8fb16 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Sep 2011 22:16:53 +0000 Subject: bidi (25sep11) git-svn-id: svn://tug.org/texlive/trunk@24087 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/bidi/bidi.dtx | 184 +++++++++++++++++++++++++-- 1 file changed, 170 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx index 02dca8a465c..b64fda1ea4e 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.1 +v1.3.2 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.0. +This version fixes all the bugs that were present in v1.3.1. ___________________ 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.1} +% \date{\today\qquad Version 1.3.2} % \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.1, 2011/10/01 +%v1.3.2, 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.1} +\def\bidiversion{v1.3.2} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -2551,13 +2551,12 @@ Location on CTAN: /macros/latex/contrib/bidi} \def\eq@if#1#2#3{% \expandafter\def\csname\expandafter\@gobbletwo\string#1% \expandafter\@gobbletwo\string#3\endcsname - {\let#1#3 - \let#2#3} + {\let#1#3% + \let#2#3}% \expandafter\def\csname\expandafter\@gobbletwo\string#2% \expandafter\@gobbletwo\string#3\endcsname - {\let#2#3 - \let#1#3} -} + {\let#2#3% + \let#1#3}} \eqnewif{\if@RTLmain}{\if@rlmain} \eqnewif{\if@RTL}{\if@rl} \newif\if@RTLmaths @@ -12320,7 +12319,49 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{scrartcl-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{scrartcl-xetex-bidi.def}[2011/08/26 v0.4 bidi adaptations for scrartcl class for XeTeX engine] +\ProvidesFile{scrartcl-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrartcl class for XeTeX engine] +\renewcommand\deffootnote[4][]{% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% +} +\deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} +\renewcommand*\left@footnote{% + \normalsize\ftn@rule@test@values + \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax + \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% + \kern 2.6\p@} +\renewcommand*\right@footnote{% + \hbox to \columnwidth + {\beginR \vbox{\kern -3\p@ + \normalsize\ftn@rule@test@values + \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax + \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% + \kern 2.6\p@}\hfil\endR}} \renewcommand*\maketitle[1][1]{% \if@titlepage \begin{titlepage} @@ -12728,7 +12769,49 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{scrbook-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{scrbook-xetex-bidi.def}[2010/08/13 v0.4 bidi adaptations for scrbook class for XeTeX engine] +\ProvidesFile{scrbook-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrbook class for XeTeX engine] +\renewcommand\deffootnote[4][]{% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% +} +\deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} +\renewcommand*\left@footnote{% + \normalsize\ftn@rule@test@values + \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax + \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% + \kern 2.6\p@} +\renewcommand*\right@footnote{% + \hbox to \columnwidth + {\beginR \vbox{\kern -3\p@ + \normalsize\ftn@rule@test@values + \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax + \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% + \kern 2.6\p@}\hfil\endR}} \renewcommand*\maketitle[1][1]{% \if@titlepage \begin{titlepage} @@ -13192,7 +13275,38 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{scrlettr-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{scrlettr-xetex-bidi.def}[2010/07/25 v0.1 bidi adaptations for scrlettr class for XeTeX engine] +\ProvidesFile{scrlettr-xetex-bidi.def}[2011/09/24 v0.2 bidi adaptations for scrlettr class for XeTeX engine] +\renewcommand\deffootnote[4][]{% + \long\def\@makefntext##1{% + \edef\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2} + \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}% + \else + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1} + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2} + \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi}% + \fi + \par + \parindent #3\noindent + \hbox to \z@{\hss\@@makefnmark}##1} + \def\@@makefnmark{\hbox{#4}} +} +\deffootnote[1em]{1.5em}{1em} + {\textsuperscript{\thefootnotemark}} +\def\left@footnote{\kern-1\p@ + \hrule width 0.4\columnwidth + \kern .6\p@} +\def\right@footnote{% + \hbox to \columnwidth + {\beginR \vbox{\kern -3\p@ + \kern-1\p@ + \hrule width 0.4\columnwidth + \kern .6\p@}\hfil\endR}} \def\@datefield{\@reffalse \ifx\varyourref\@empty \else \@reftrue \fi \ifx\varyourmail\@empty \else \@reftrue \fi @@ -13278,7 +13392,49 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{scrreprt-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{scrreprt-xetex-bidi.def}[2011/08/26 v0.4 bidi adaptations for scrreprt class for XeTeX engine] +\ProvidesFile{scrreprt-xetex-bidi.def}[2011/09/24 v0.5 bidi adaptations for scrreprt class for XeTeX engine] +\renewcommand\deffootnote[4][]{% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \if@RTL\parshape \@ne 0pt \@tempdima\else\parshape \@ne #2 \@tempdima\fi}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \if@RTL\parshape \tw@ 0pt \@tempdima 0pt \@tempdimb\else\parshape \tw@ #1 \@tempdima #2 \@tempdimb\fi + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% +} +\deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} +\renewcommand*\left@footnote{% + \normalsize\ftn@rule@test@values + \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax + \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% + \kern 2.6\p@} +\renewcommand*\right@footnote{% + \hbox to \columnwidth + {\beginR \vbox{\kern -3\p@ + \normalsize\ftn@rule@test@values + \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax + \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% + \kern 2.6\p@}\hfil\endR}} \renewcommand*\maketitle[1][1]{% \if@titlepage \begin{titlepage} -- cgit v1.2.3