summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-23 22:23:08 +0000
committerKarl Berry <karl@freefriends.org>2011-09-23 22:23:08 +0000
commitdd8e452ef5f9c81a8a05fe871ce3d8fb4b5b646f (patch)
tree9050ac8da771b94d28de61a7fa150c8c3a532fb1
parent7b64a1aead3e4e89f3d17737813d522ca8ec66d2 (diff)
bidi (23sep11)
git-svn-id: svn://tug.org/texlive/trunk@24075 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/bidi/README4
-rw-r--r--Master/texmf-dist/doc/latex/bidi/bidi.pdfbin153768 -> 152582 bytes
-rw-r--r--Master/texmf-dist/source/latex/bidi/bidi.dtx71
-rw-r--r--Master/texmf-dist/source/latex/bidi/bidi.ins1
-rw-r--r--Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def21
-rw-r--r--Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def13
-rw-r--r--Master/texmf-dist/tex/latex/bidi/bidi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def43
-rw-r--r--Master/texmf-dist/tex/latex/bidi/xetex-bidi.def1
9 files changed, 145 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README
index 9147668f91f..78af3112ee2 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.0
+v1.3.1
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.2.9.
+This version fixes all the bugs that were present in v1.3.0.
___________________
VAFA KHALIGHI
diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.pdf b/Master/texmf-dist/doc/latex/bidi/bidi.pdf
index e2eb416a5e1..1617d98b168 100644
--- a/Master/texmf-dist/doc/latex/bidi/bidi.pdf
+++ b/Master/texmf-dist/doc/latex/bidi/bidi.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx
index 4dc6f3ce302..02dca8a465c 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.0
+v1.3.1
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.2.9.
+This version fixes all the bugs that were present in v1.3.0.
___________________
VAFA KHALIGHI
@@ -89,6 +89,7 @@ by VAFA KHALIGHI.
\generate{\file{caption-xetex-bidi.def}{\from{\jobname.dtx}{caption-xetex-bidi.def}}}
\generate{\file{colortbl-xetex-bidi.def}{\from{\jobname.dtx}{colortbl-xetex-bidi.def}}}
\generate{\file{color-xetex-bidi.def}{\from{\jobname.dtx}{color-xetex-bidi.def}}}
+\generate{\file{combine-xetex-bidi.def}{\from{\jobname.dtx}{combine-xetex-bidi.def}}}
\generate{\file{cvthemebidicasual.sty}{\from{\jobname.dtx}{cvthemebidicasual.sty}}}
\generate{\file{cvthemebidiclassic.sty}{\from{\jobname.dtx}{cvthemebidiclassic.sty}}}
\generate{\file{dblfnote-xetex-bidi.def}{\from{\jobname.dtx}{dblfnote-xetex-bidi.def}}}
@@ -231,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.0}
+% \date{\today\qquad Version 1.3.1}
% \maketitle
% \tableofcontents
%\section*{Introduction}
@@ -246,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.0, 2011/10/01
+%v1.3.1, 2011/10/01
%License: LaTeX Project Public License, version 1.3c or higher (your choice)
%Location on CTAN: /macros/latex/contrib/bidi
%\end{lstlisting}
@@ -681,9 +682,6 @@ by VAFA KHALIGHI.
%In the previous versions of \textsf{bidi} package, it was recommended that you need to use \textsf{fmultico} package instead the original \textsf{multicol} package for RTL multicolumn typesetting. This is not the case any more and you should not use buggy \textsf{fmultico} package any more. Simply load the original \textsf{multicol} package before loading \textsf{bidi}. \textsf{bidi} now supports \textsf{multicol} package and you can typeset bidirectional multi columns.
%
%In addition, you also can use \textsf{vwcol} package for variable width bidirectional column typesetting.
-%\subsubsection{The \textsf{paracol} package}
-%As of 17th September of 2011, there is \textsf{paracol} package by Hiroshi Nakashima, which is a multi-column package to typeset columns in ``parallel". The package provides yet another multi-column typesetting mechanism by which you produce multi-column e.g, bilingual document switching and sychronizing each
-%corresponding part in "parallel". The \textsf{paracol} package works perfectly with the \textsf{bidi} package for producing bidirectional documents (both RTL and LTR).
%\section{Extra \textsf{bidi} Packages and Classes}
%\subsection{Typesetting \TeX{} and \LaTeX{} Codes}
%The \LaTeX{} codes in this manual are typeset using the \textsf{bidicode} package.
@@ -1138,6 +1136,27 @@ by VAFA KHALIGHI.
\if@RTL\raggedleft\else\raggedright\fi
\hyphenpenalty\@M
\footnotesize}
+\def\maketitle{\par
+ \@topnum\z@ % this prevents figures from falling at the top of page 1
+ \@setcopyright
+ \thispagestyle{firstpage}% this sets first page specifications
+ \uppercasenonmath\shorttitle
+ \ifx\@empty\shortauthors \let\shortauthors\shorttitle
+ \else \andify\shortauthors
+ \fi
+ \@maketitle@hook
+ \begingroup
+ \@maketitle
+ \toks@\@xp{\shortauthors}\@temptokena\@xp{\shorttitle}%
+ \toks4{\def\\{ \ignorespaces}}% defend against questionable usage
+ \edef\@tempa{%
+ \@nx\markboth{\the\toks4
+ \@nx\MakeUppercase{\the\toks@}}{\the\@temptokena}}%
+ \@tempa
+ \endgroup
+ \c@footnote\z@
+ \@cleartopmattertags
+}
% \end{macrocode}
%
%\iffalse
@@ -1251,6 +1270,19 @@ by VAFA KHALIGHI.
#1\par \endgroup
\skip@34\p@ \advance\skip@-\normalbaselineskip
\vskip\skip@ }
+\def\maketitle{\par
+ \@topnum\z@ % this prevents figures from falling at the top of page 1
+ \begingroup
+ \@maketitle
+ \endgroup
+ \c@footnote\z@
+ \def\do##1{\let##1\relax}%
+ \do\maketitle \do\@maketitle \do\title \do\@xtitle \do\@title
+ \do\author \do\@xauthor \do\address \do\@xaddress
+ \do\email \do\@xemail \do\curraddr \do\@xcurraddr
+ \do\dedicatory \do\@dedicatory \do\thanks \do\thankses
+ \do\keywords \do\@keywords \do\subjclass \do\@subjclass
+}
% \end{macrocode}
% \iffalse
%</amsbook-xetex-bidi.def>
@@ -2489,7 +2521,7 @@ by VAFA KHALIGHI.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\def\bididate{2011/10/01}
-\def\bidiversion{v1.3.0}
+\def\bidiversion{v1.3.1}
\ProvidesPackage{bidi}[\bididate\space \bidiversion\space
Bidirectional typesetting in plain TeX and LaTeX]
\edef\bidiinfo{%
@@ -5949,6 +5981,28 @@ bidi implementation of tufte title]
% \end{macrocode}
% \iffalse
%</color-xetex-bidi.def>
+%<*combine-xetex-bidi.def>
+%\fi
+% \subsection{\textsf{combine-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{combine-xetex-bidi.def}[2011/09/23 v0.1 bidi adaptations for combine class for XeTeX engine]
+\renewcommand{\c@ll@chapsecii}[2]{%
+ \if@RTL\advance\rightskip\@tempdima\else\advance\leftskip\@tempdima\fi
+ \if@RTL\hskip -\rightskip\else\hskip -\leftskip\fi
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+}
+\renewcommand{\c@ll@chapseci}{%
+ \setlength\@tempdima{0em}%
+ \begingroup
+ \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode
+}
+\renewenvironment{tocindent}[1]{%
+ \hangindent \if@RTL-\fi#1 \hangafter -100\relax}{}
+% \end{macrocode}
+% \iffalse
+%</combine-xetex-bidi.def>
%<*cvthemebidicasual.sty>
%\fi
% \subsection{\textsf{cvthemebidicasual.sty}}
@@ -15232,6 +15286,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\@ifclassloaded{boek3}{\input{boek3-xetex-bidi.def}}{}
\@ifclassloaded{book}{\@ifpackageloaded{flowfram}{}{\input{book-xetex-bidi.def}}}{}
\@ifclassloaded{bookest}{\input{bookest-xetex-bidi.def}}{}
+\@ifclassloaded{combine}{\input{combine-xetex-bidi.def}}{}
\@iftagsloaded{leqno}{\input{leqno-xetex-bidi.def}}{}
\@iftagsloaded{fleqn}{\input{fleqn-xetex-bidi.def}}{}
\@ifpackageloaded{amsmath}{\input{amsmath-xetex-bidi.def}}{}
diff --git a/Master/texmf-dist/source/latex/bidi/bidi.ins b/Master/texmf-dist/source/latex/bidi/bidi.ins
index ce06eac8197..808d8c1ee95 100644
--- a/Master/texmf-dist/source/latex/bidi/bidi.ins
+++ b/Master/texmf-dist/source/latex/bidi/bidi.ins
@@ -69,6 +69,7 @@ by VAFA KHALIGHI.
\generate{\file{caption-xetex-bidi.def}{\from{\jobname.dtx}{caption-xetex-bidi.def}}}
\generate{\file{colortbl-xetex-bidi.def}{\from{\jobname.dtx}{colortbl-xetex-bidi.def}}}
\generate{\file{color-xetex-bidi.def}{\from{\jobname.dtx}{color-xetex-bidi.def}}}
+\generate{\file{combine-xetex-bidi.def}{\from{\jobname.dtx}{combine-xetex-bidi.def}}}
\generate{\file{cvthemebidicasual.sty}{\from{\jobname.dtx}{cvthemebidicasual.sty}}}
\generate{\file{cvthemebidiclassic.sty}{\from{\jobname.dtx}{cvthemebidiclassic.sty}}}
\generate{\file{dblfnote-xetex-bidi.def}{\from{\jobname.dtx}{dblfnote-xetex-bidi.def}}}
diff --git a/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
index ab2d6a0bb37..8d674d2475f 100644
--- a/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsart-xetex-bidi.def
@@ -108,6 +108,27 @@
\if@RTL\raggedleft\else\raggedright\fi
\hyphenpenalty\@M
\footnotesize}
+\def\maketitle{\par
+ \@topnum\z@ % this prevents figures from falling at the top of page 1
+ \@setcopyright
+ \thispagestyle{firstpage}% this sets first page specifications
+ \uppercasenonmath\shorttitle
+ \ifx\@empty\shortauthors \let\shortauthors\shorttitle
+ \else \andify\shortauthors
+ \fi
+ \@maketitle@hook
+ \begingroup
+ \@maketitle
+ \toks@\@xp{\shortauthors}\@temptokena\@xp{\shorttitle}%
+ \toks4{\def\\{ \ignorespaces}}% defend against questionable usage
+ \edef\@tempa{%
+ \@nx\markboth{\the\toks4
+ \@nx\MakeUppercase{\the\toks@}}{\the\@temptokena}}%
+ \@tempa
+ \endgroup
+ \c@footnote\z@
+ \@cleartopmattertags
+}
%%
%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com>
%%
diff --git a/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
index 72750cdc9eb..8406fecbf2e 100644
--- a/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/amsbook-xetex-bidi.def
@@ -117,6 +117,19 @@
#1\par \endgroup
\skip@34\p@ \advance\skip@-\normalbaselineskip
\vskip\skip@ }
+\def\maketitle{\par
+ \@topnum\z@ % this prevents figures from falling at the top of page 1
+ \begingroup
+ \@maketitle
+ \endgroup
+ \c@footnote\z@
+ \def\do##1{\let##1\relax}%
+ \do\maketitle \do\@maketitle \do\title \do\@xtitle \do\@title
+ \do\author \do\@xauthor \do\address \do\@xaddress
+ \do\email \do\@xemail \do\curraddr \do\@xcurraddr
+ \do\dedicatory \do\@dedicatory \do\thanks \do\thankses
+ \do\keywords \do\@keywords \do\subjclass \do\@subjclass
+}
%%
%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@gmail.com>
%%
diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty
index 3117bbaa361..9c7ae94cfbc 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.0}
+\def\bidiversion{v1.3.1}
\ProvidesPackage{bidi}[\bididate\space \bidiversion\space
Bidirectional typesetting in plain TeX and LaTeX]
\edef\bidiinfo{%
diff --git a/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def
new file mode 100644
index 00000000000..29dfa8e9528
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bidi/combine-xetex-bidi.def
@@ -0,0 +1,43 @@
+%%
+%% This is file `combine-xetex-bidi.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bidi.dtx (with options: `combine-xetex-bidi.def')
+%%
+%% ______________________________________
+%% Copyright © 2009–2011 VAFA KHALIGHI
+%%
+%% License information appended.
+%%
+%%
+\ProvidesFile{combine-xetex-bidi.def}[2011/09/23 v0.1 bidi adaptations for combine class for XeTeX engine]
+\renewcommand{\c@ll@chapsecii}[2]{%
+ \if@RTL\advance\rightskip\@tempdima\else\advance\leftskip\@tempdima\fi
+ \if@RTL\hskip -\rightskip\else\hskip -\leftskip\fi
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+}
+\renewcommand{\c@ll@chapseci}{%
+ \setlength\@tempdima{0em}%
+ \begingroup
+ \parindent \z@ \if@RTL\leftskip\else\rightskip\fi \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode
+}
+\renewenvironment{tocindent}[1]{%
+ \hangindent \if@RTL-\fi#1 \hangafter -100\relax}{}
+%%
+%% Copyright © 2009–2011 VAFA KHALIGHI <vafaklg@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 `combine-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 adc7f8779c8..326ed5bc2e8 100644
--- a/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
+++ b/Master/texmf-dist/tex/latex/bidi/xetex-bidi.def
@@ -559,6 +559,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\@ifclassloaded{boek3}{\input{boek3-xetex-bidi.def}}{}
\@ifclassloaded{book}{\@ifpackageloaded{flowfram}{}{\input{book-xetex-bidi.def}}}{}
\@ifclassloaded{bookest}{\input{bookest-xetex-bidi.def}}{}
+\@ifclassloaded{combine}{\input{combine-xetex-bidi.def}}{}
\@iftagsloaded{leqno}{\input{leqno-xetex-bidi.def}}{}
\@iftagsloaded{fleqn}{\input{fleqn-xetex-bidi.def}}{}
\@ifpackageloaded{amsmath}{\input{amsmath-xetex-bidi.def}}{}