summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-13 22:20:31 +0000
committerKarl Berry <karl@freefriends.org>2011-08-13 22:20:31 +0000
commit878253a4b3b9dc4e9da23f4aaffb88d5d3cf6dff (patch)
treef4e789c6ededae6b17abfd6fe380078b2304cfaa /Master/texmf-dist/tex/latex
parentea057cd7f2919f3cf5652e61cbb7d58abbf59ef5 (diff)
bidi (13aug11)
git-svn-id: svn://tug.org/texlive/trunk@23543 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/bidi/bidi.sty4
-rw-r--r--Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def67
-rw-r--r--Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def80
-rw-r--r--Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def80
-rw-r--r--Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def80
-rw-r--r--Master/texmf-dist/tex/latex/bidi/xetex-bidi.def5
6 files changed, 239 insertions, 77 deletions
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index d148e33dafd..a2ed46548f2 100644
--- a/Master/texmf-dist/tex/latex/bidi/bidi.sty
+++ b/Master/texmf-dist/tex/latex/bidi/bidi.sty
@@ -13,8 +13,8 @@
%%
%%
\NeedsTeXFormat{LaTeX2e}
-\def\bididate{2011/08/01}
-\def\bidiversion{v1.2.4}
+\def\bididate{2011/08/13}
+\def\bidiversion{v1.2.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/empheq-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def
deleted file mode 100644
index 64811e88a9e..00000000000
--- a/Master/texmf-dist/tex/latex/bidi/empheq-xetex-bidi.def
+++ /dev/null
@@ -1,67 +0,0 @@
-%%
-%% This is file `empheq-xetex-bidi.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bidi.dtx (with options: `empheq-xetex-bidi.def')
-%%
-%% ______________________________________
-%% Copyright © 2009–2011 Vafa Khalighi
-%%
-%% License information appended.
-%%
-%%
-\ProvidesFile{empheq-xetex-bidi.def}[2011/03/01 v0.1 bidi adaptations for empheq package for XeTeX engine]
-\MHInternalSyntaxOn
-\AtBeginDocument{%
- \@ifpackageloaded{fancybox}{%
- \@ifpackageloaded{color}{\definecolor{shadowcolor}{rgb}{0,0,0}}%
- {\renewcommand*\textcolor[2]{\normalcolor{#2}}}%
- \renewcommand*\shadowbox{%
- \@ifstar{\MH_set_boolean_T:n {shadowbox_star}
- \VerbBox\EQ_shadowbox:n}
- {\MH_set_boolean_F:n {shadowbox_star}
- \VerbBox\EQ_shadowbox:n}}
- \def\EQ_shadowbox:n #1{%
- \sbox{\z@}{\fbox{#1}}%
- \MH_if_boolean:nTF {shadowbox_star}{
- \MH_setlength:dn \@tempdima{\z@}%
- }{
- \MH_setlength:dn \@tempdima{\dp\z@+\shadowsize}%
- }
- \raisebox{\@tempdima}{%
- \if@RTL\makebox[\z@][r]{%
- \kern\shadowsize \textcolor{shadowcolor}{%
- \rule[-\dp\z@-\shadowsize]{\wd\z@}{\shadowsize}}%
- }\else%
- \makebox[\z@][l]{%
- \kern\shadowsize \textcolor{shadowcolor}{%
- \rule[-\dp\z@-\shadowsize]{\wd\z@}{\shadowsize}}%
- }\fi%
- \usebox\z@\textcolor{shadowcolor}{%
- \rule[-\dp\z@-\shadowsize]{\shadowsize}{\ht\z@+\dp\z@}}}}%
- }{}%
-}
-\renewenvironment{EmphEqMainEnv}{\@RTLfalse\collect@body\EQ_getbody:n}{%
- \if_num:w \l_EQ_equationtype_int=\z@ %ZeroCheckpoint
- \EQ_upgrade_error:
- \else:
- \EQ_post_process:
- \ignorespacesafterend
- \fi:}
-\MHInternalSyntaxOff
-%%
-%% Copyright © 2009–2011 Vafa Khalighi <vafa018@gmail.com>
-%%
-%% 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 `empheq-xetex-bidi.def'.
diff --git a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
index 8650bce313d..6ec3afaf909 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def
@@ -12,7 +12,7 @@
%% License information appended.
%%
%%
-\ProvidesFile{scrartcl-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for scrartcl class for XeTeX engine]
+\ProvidesFile{scrartcl-xetex-bidi.def}[2011/08/13 v0.4 bidi adaptations for scrartcl class for XeTeX engine]
\renewcommand*\maketitle[1][1]{%
\if@titlepage
\begin{titlepage}
@@ -335,6 +335,84 @@
\renewcommand\marginline[1]{%
\marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
}
+\renewcommand{\@@makecaption}[3]{%
+ \cap@margin
+ \ifonelinecaptions
+ \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}%
+ \let\scr@tmp@footnotetext=\@footnotetext
+ \let\@footnotetext=\@gobble
+ \sbox\@tempboxa{%
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}%
+ #3\unskip\strut}}%
+ }%
+ \let\@footnotetext=\scr@tmp@footnotetext
+ \let\scr@tmp@footnotetext=\undefined
+ \setcounter{footnote}{\@tempcntb}%
+ \setcounter{mpfootnote}{\@tempcnta}%
+ \else
+ \sbox\@tempboxa{\hspace*{2\cap@width}}%
+ \fi
+ \begingroup%
+ \setlength{\@tempdima}{\cap@width}%
+ \ifdim \wd\@tempboxa >\@tempdima
+ \hb@xt@\hsize{%
+ \setbox\@tempboxa\vbox{\hsize=\cap@width
+ \ifdofullc@p
+ {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}}}%
+ {#3\unskip\strut\par}}}%
+ \else%
+ \ifdim\cap@indent<\z@
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat\par}}}%
+ \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
+ \else%
+ \if@capbreak
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat\par}}}%
+ \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
+ \else
+ {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
+ {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}%
+ \fi
+ \fi
+ \fi
+ }%
+ \setlength{\@tempdima}{\ht\@tempboxa}%
+ \addtolength{\@tempdima}{\dp\@tempboxa}%
+ \addtolength{\@tempdima}{-\ht\strutbox}%
+ \ht\@tempboxa\ht\strutbox
+ \dp\@tempboxa\@tempdima
+ \strut\cap@left
+ \box\@tempboxa
+ \cap@right\strut
+ }%
+ \else
+ \global \@minipagefalse
+ \sbox\@tempboxa{%
+ {\capfont{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}}%
+ #3}}%
+ }%
+ {\capfont{\hb@xt@\hsize{\strut\cap@left\if@RTL\beginR\fi\box\@tempboxa\if@RTL\endR\fi\cap@right\strut}}}%
+ \fi
+ \endgroup
+}
+\renewcommand{\@makecaption}[2]{%
+ \if@captionabove
+ \vskip\belowcaptionskip
+ \else
+ \vskip\abovecaptionskip
+ \fi
+ \@@makecaption\@firstofone{#1}{#2}%
+ \if@captionabove
+ \vskip\abovecaptionskip
+ \else
+ \vskip\belowcaptionskip
+ \fi
+}
%%
%% Copyright © 2009–2011 Vafa Khalighi <vafa018@gmail.com>
%%
diff --git a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
index ef276620002..61d813fe84c 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def
@@ -12,7 +12,7 @@
%% License information appended.
%%
%%
-\ProvidesFile{scrbook-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for scrbook class for XeTeX engine]
+\ProvidesFile{scrbook-xetex-bidi.def}[2010/08/13 v0.4 bidi adaptations for scrbook class for XeTeX engine]
\renewcommand*\maketitle[1][1]{%
\if@titlepage
\begin{titlepage}
@@ -391,6 +391,84 @@
\renewcommand\marginline[1]{%
\marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
}
+\renewcommand{\@@makecaption}[3]{%
+ \cap@margin
+ \ifonelinecaptions
+ \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}%
+ \let\scr@tmp@footnotetext=\@footnotetext
+ \let\@footnotetext=\@gobble
+ \sbox\@tempboxa{%
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}%
+ #3\unskip\strut}}%
+ }%
+ \let\@footnotetext=\scr@tmp@footnotetext
+ \let\scr@tmp@footnotetext=\undefined
+ \setcounter{footnote}{\@tempcntb}%
+ \setcounter{mpfootnote}{\@tempcnta}%
+ \else
+ \sbox\@tempboxa{\hspace*{2\cap@width}}%
+ \fi
+ \begingroup%
+ \setlength{\@tempdima}{\cap@width}%
+ \ifdim \wd\@tempboxa >\@tempdima
+ \hb@xt@\hsize{%
+ \setbox\@tempboxa\vbox{\hsize=\cap@width
+ \ifdofullc@p
+ {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}}}%
+ {#3\unskip\strut\par}}}%
+ \else%
+ \ifdim\cap@indent<\z@
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat\par}}}%
+ \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
+ \else%
+ \if@capbreak
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat\par}}}%
+ \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
+ \else
+ {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
+ {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}%
+ \fi
+ \fi
+ \fi
+ }%
+ \setlength{\@tempdima}{\ht\@tempboxa}%
+ \addtolength{\@tempdima}{\dp\@tempboxa}%
+ \addtolength{\@tempdima}{-\ht\strutbox}%
+ \ht\@tempboxa\ht\strutbox
+ \dp\@tempboxa\@tempdima
+ \strut\cap@left
+ \box\@tempboxa
+ \cap@right\strut
+ }%
+ \else
+ \global \@minipagefalse
+ \sbox\@tempboxa{%
+ {\capfont{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}}%
+ #3}}%
+ }%
+ {\capfont{\hb@xt@\hsize{\strut\cap@left\if@RTL\beginR\fi\box\@tempboxa\if@RTL\endR\fi\cap@right\strut}}}%
+ \fi
+ \endgroup
+}
+\renewcommand{\@makecaption}[2]{%
+ \if@captionabove
+ \vskip\belowcaptionskip
+ \else
+ \vskip\abovecaptionskip
+ \fi
+ \@@makecaption\@firstofone{#1}{#2}%
+ \if@captionabove
+ \vskip\abovecaptionskip
+ \else
+ \vskip\belowcaptionskip
+ \fi
+}
%%
%% Copyright © 2009–2011 Vafa Khalighi <vafa018@gmail.com>
%%
diff --git a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
index 7f0ec1401ad..3b4c717ae7c 100644
--- a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def
@@ -12,7 +12,7 @@
%% License information appended.
%%
%%
-\ProvidesFile{scrreprt-xetex-bidi.def}[2010/07/25 v0.3 bidi adaptations for scrreprt class for XeTeX engine]
+\ProvidesFile{scrreprt-xetex-bidi.def}[2011/08/13 v0.4 bidi adaptations for scrreprt class for XeTeX engine]
\renewcommand*\maketitle[1][1]{%
\if@titlepage
\begin{titlepage}
@@ -348,6 +348,84 @@
\renewcommand\marginline[1]{%
\marginpar[\if@RTL\raggedright\else\raggedleft\fi{#1}]{\if@RTL\raggedleft\else\raggedright\fi #1}%
}
+\renewcommand{\@@makecaption}[3]{%
+ \cap@margin
+ \ifonelinecaptions
+ \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}%
+ \let\scr@tmp@footnotetext=\@footnotetext
+ \let\@footnotetext=\@gobble
+ \sbox\@tempboxa{%
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}%
+ #3\unskip\strut}}%
+ }%
+ \let\@footnotetext=\scr@tmp@footnotetext
+ \let\scr@tmp@footnotetext=\undefined
+ \setcounter{footnote}{\@tempcntb}%
+ \setcounter{mpfootnote}{\@tempcnta}%
+ \else
+ \sbox\@tempboxa{\hspace*{2\cap@width}}%
+ \fi
+ \begingroup%
+ \setlength{\@tempdima}{\cap@width}%
+ \ifdim \wd\@tempboxa >\@tempdima
+ \hb@xt@\hsize{%
+ \setbox\@tempboxa\vbox{\hsize=\cap@width
+ \ifdofullc@p
+ {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}}}%
+ {#3\unskip\strut\par}}}%
+ \else%
+ \ifdim\cap@indent<\z@
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat\par}}}%
+ \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
+ \else%
+ \if@capbreak
+ {\capfont{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat\par}}}%
+ \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
+ \else
+ {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
+ {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}%
+ \fi
+ \fi
+ \fi
+ }%
+ \setlength{\@tempdima}{\ht\@tempboxa}%
+ \addtolength{\@tempdima}{\dp\@tempboxa}%
+ \addtolength{\@tempdima}{-\ht\strutbox}%
+ \ht\@tempboxa\ht\strutbox
+ \dp\@tempboxa\@tempdima
+ \strut\cap@left
+ \box\@tempboxa
+ \cap@right\strut
+ }%
+ \else
+ \global \@minipagefalse
+ \sbox\@tempboxa{%
+ {\capfont{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont{#2\captionformat}}}}%
+ #3}}%
+ }%
+ {\capfont{\hb@xt@\hsize{\strut\cap@left\if@RTL\beginR\fi\box\@tempboxa\if@RTL\endR\fi\cap@right\strut}}}%
+ \fi
+ \endgroup
+}
+\renewcommand{\@makecaption}[2]{%
+ \if@captionabove
+ \vskip\belowcaptionskip
+ \else
+ \vskip\abovecaptionskip
+ \fi
+ \@@makecaption\@firstofone{#1}{#2}%
+ \if@captionabove
+ \vskip\abovecaptionskip
+ \else
+ \vskip\belowcaptionskip
+ \fi
+}
%%
%% Copyright © 2009–2011 Vafa Khalighi <vafa018@gmail.com>
%%
diff --git a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
index 27b9e5bf025..a658679b3f3 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -315,10 +315,6 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\setlength\@tempdima{#1}% support calc
\hb@xt@\@tempdima{\csname bm@#2\endcsname}%
\@end@tempboxa}
-\def\bm@l{\if@RTL\hss\else\fi\unhbox\@tempboxa\if@RTL\else\hss\fi}
-\def\bm@r{\if@RTL\else\hss\fi\unhbox\@tempboxa\if@RTL\hss\else\fi}
-\def\bm@b{\hss\unhbox\@tempboxa}
-\def\bm@t{\unhbox\@tempboxa\hss}
\def\LTRmarginpar{%
\ifhmode
\@bsphack
@@ -568,7 +564,6 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{}
\@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{}
\@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{}
-\@ifpackageloaded{empheq}{\input{empheq-xetex-bidi.def}}{}
\@ifpackageloaded{float}{\input{float-xetex-bidi.def}}{}
\@ifpackageloaded{flowfram}{\input{flowfram-xetex-bidi.def}}{}
\@ifpackageloaded{xltxtra}{\input{xltxtra-xetex-bidi.def}}{}