From dfdb051e6a8511d0728517690bb7c1df476022cf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Sep 2011 23:30:53 +0000 Subject: bidi (5sep11) git-svn-id: svn://tug.org/texlive/trunk@23837 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bidi/README | 4 +- Master/texmf-dist/doc/latex/bidi/bidi.pdf | Bin 135804 -> 136478 bytes Master/texmf-dist/source/latex/bidi/bidi.dtx | 62 ++++++++++++--------- Master/texmf-dist/tex/latex/bidi/bidi.sty | 5 +- Master/texmf-dist/tex/latex/bidi/bidi.tex | 3 +- .../tex/latex/bidi/dblfnote-xetex-bidi.def | 4 +- .../tex/latex/bidi/scrartcl-xetex-bidi.def | 8 +-- .../tex/latex/bidi/scrbook-xetex-bidi.def | 12 ++-- .../tex/latex/bidi/scrreprt-xetex-bidi.def | 8 +-- 9 files changed, 56 insertions(+), 50 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/bidi/README b/Master/texmf-dist/doc/latex/bidi/README index 05e738da6dc..c932bac9339 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.2.6 +v1.2.7 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.5. +This version fixes all the bugs that were present in v1.2.6. ___________________ Vafa Khalighi diff --git a/Master/texmf-dist/doc/latex/bidi/bidi.pdf b/Master/texmf-dist/doc/latex/bidi/bidi.pdf index 55abd0f349f..0b4276c788c 100644 Binary files a/Master/texmf-dist/doc/latex/bidi/bidi.pdf and b/Master/texmf-dist/doc/latex/bidi/bidi.pdf differ diff --git a/Master/texmf-dist/source/latex/bidi/bidi.dtx b/Master/texmf-dist/source/latex/bidi/bidi.dtx index cdeeb0fd89c..372bb0bc578 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.2.6 +v1.2.7 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.5. +This version fixes all the bugs that were present in v1.2.6. ___________________ Vafa Khalighi @@ -224,11 +224,11 @@ by Vafa Khalighi. % \GetFileInfo{\jobname.sty} % \CheckSum{0} % \makeatletter -% \title{The \textsf{bidi} Package\\ \url{https://bitbucket.org/vafa/bidi}\\[5pt] +% \title{The \textsf{bidi} Package\\[5pt] % Support for bidirectional typesetting in plain \TeX{} and \LaTeXe} % \author{Vafa Khalighi\\ % \url{vafaklg@gmail.com}} -% \date{\today\qquad Version 1.2.6} +% \date{\today\qquad Version 1.2.7} % \maketitle % \tableofcontents %\section{Introduction} @@ -243,9 +243,8 @@ 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.2.6, 2011/08/26 +%v1.2.7, 2011/09/05 %License: LaTeX Project Public License, version 1.3c or higher (your choice) -%Home: https://bitbucket.org/vafa/bidi %Location on CTAN: /macros/latex/contrib/bidi %\end{lstlisting} %\section{Basics} @@ -656,6 +655,17 @@ by Vafa Khalighi. %Also if you are going to use \Lcs{color} command to colour the text at the beginning of a paragraph, then you should have \Lcs{leavevmode} before \Lcs{color} command. % %For having coloured tabular, you can use \textsf{colortbl} package. +%\subsection{The \textsf{dblfnote} package} +%The \textsf{dblfnote} package makes footnotes double-columned. In addition \textsf{bidi} package adds bidirectional support for the \textsf{dblfnote} package by providing the following commands: +%\begin{BDef} +%\Lcs{RTLdfnmakecol}\qquad\Lcs{LTRdfnmakecol} +%\end{BDef} +%\begin{itemize} +%\item \Lcs{RTLdfnmakecol} makes footnotes double-columned RTL. +%\item \Lcs{LTRdfnmakecol} makes footnotes double-columned LTR. +%\item If the main direction of the document is RTL, \Lcs{RTLdfnmakecol} is active and if the main direction of the document is LTR, \Lcs{LTRdfnmakecol} is active. +%\end{itemize} +% %\subsection{Hyperref} %The \textsf{hyperref} package works fine with bidirectional documents if and only if, your link will not span more than a line. If your link spans more than a line, then your whole document, or page or paragraph may be linked. % @@ -2300,8 +2310,8 @@ by Vafa Khalighi. % \subsection{\textsf{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2011/08/26} -\def\bidiversion{v1.2.6} +\def\bididate{2011/09/05} +\def\bidiversion{v1.2.7} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -2312,7 +2322,6 @@ with many other commonly-used packages.^^J Copyright © 2009–2011 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J -Home: https://bitbucket.org/vafa/bidi^^J Location on CTAN: /macros/latex/contrib/bidi} \typeout{\bidiinfo} \edef\bidi@everyjob{\the\everyjob} @@ -2378,7 +2387,7 @@ Location on CTAN: /macros/latex/contrib/bidi} %\fi % \subsection{\textsf{bidi.tex}} % \begin{macrocode} -\def\bididate{2011/08/01} +\def\bididate{2011/09/05} \def\bidiversion{v0.1} \catcode`@=11 \newlinechar`\^^J @@ -2390,7 +2399,6 @@ with many other commonly-used packages.^^J Copyright © 2009–2011 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J -Home: https://bitbucket.org/vafa/bidi^^J Location on CTAN: /macros/latex/contrib/bidi} \message{\bidiinfo} \edef\bidi@everyjob{\the\everyjob} @@ -5979,7 +5987,7 @@ bidi implementation of tufte title] %\fi % \subsection{\textsf{dblfnote-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{dblfnote-xetex-bidi.def}[2011/03/01 v0.1 bidi adaptations for dblfnote package for XeTeX engine] +\ProvidesFile{dblfnote-xetex-bidi.def}[2011/09/05 v0.2 bidi adaptations for dblfnote package for XeTeX engine] \def\right@footnote{% \hbox to \DFNcolumnwidth {\beginR \vbox{\kern -3\p@ @@ -5989,7 +5997,7 @@ bidi implementation of tufte title] \@pboxswfalse \setlength\@tempdima{#4}% \def\@mpargs{{#1}{#2}[#3]{#4}}% - \setbox\@tempboxa\vbox\bgroup\hbox\bgroup\if@RTL\beginL\fi\if #1t\vtop\else\vbox\fi\bgroup + \setbox\@tempboxa\vbox\bgroup \color@begingroup \hsize\@tempdima \textwidth\hsize \columnwidth\hsize @@ -11989,9 +11997,9 @@ bidi implementation of tufte title] \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -12025,10 +12033,10 @@ bidi implementation of tufte title] \interlinepenalty\@M \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{sectionentry}{#1\nobreak + {\usekomafont{sectionentry}{#1\nobreak \usekomafont{sectionentrypagenumber}{% \hfill\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \endgroup \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \penalty20008 @@ -12397,9 +12405,9 @@ bidi implementation of tufte title] \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -12424,9 +12432,9 @@ bidi implementation of tufte title] \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -12455,10 +12463,10 @@ bidi implementation of tufte title] \interlinepenalty\@M \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{chapterentry}{#1\nobreak + {\usekomafont{chapterentry}{#1\nobreak \usekomafont{chapterentrypagenumber}{% \hfill\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20009 @@ -12947,9 +12955,9 @@ bidi implementation of tufte title] \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -12978,10 +12986,10 @@ bidi implementation of tufte title] \interlinepenalty\@M \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{chapterentry}{#1\nobreak + {\usekomafont{chapterentry}{#1\nobreak \usekomafont{chapterentrypagenumber}{% \hfill\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20009 diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.sty b/Master/texmf-dist/tex/latex/bidi/bidi.sty index 81d0c506d2a..ce3dd0b55ab 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/26} -\def\bidiversion{v1.2.6} +\def\bididate{2011/09/05} +\def\bidiversion{v1.2.7} \ProvidesPackage{bidi}[\bididate\space \bidiversion\space Bidirectional typesetting in plain TeX and LaTeX] \edef\bidiinfo{% @@ -25,7 +25,6 @@ with many other commonly-used packages.^^J Copyright © 2009–2011 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J -Home: https://bitbucket.org/vafa/bidi^^J Location on CTAN: /macros/latex/contrib/bidi} \typeout{\bidiinfo} \edef\bidi@everyjob{\the\everyjob} diff --git a/Master/texmf-dist/tex/latex/bidi/bidi.tex b/Master/texmf-dist/tex/latex/bidi/bidi.tex index 2623a88e12e..c02c06d5025 100644 --- a/Master/texmf-dist/tex/latex/bidi/bidi.tex +++ b/Master/texmf-dist/tex/latex/bidi/bidi.tex @@ -12,7 +12,7 @@ %% License information appended. %% %% -\def\bididate{2011/08/01} +\def\bididate{2011/09/05} \def\bidiversion{v0.1} \catcode`@=11 \newlinechar`\^^J @@ -24,7 +24,6 @@ with many other commonly-used packages.^^J Copyright © 2009–2011 Vafa Khalighi^^J \bidiversion, \bididate^^J License: LaTeX Project Public License, version 1.3c or higher (your choice)^^J -Home: https://bitbucket.org/vafa/bidi^^J Location on CTAN: /macros/latex/contrib/bidi} \message{\bidiinfo} \edef\bidi@everyjob{\the\everyjob} diff --git a/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def index 73b0353e4fb..7b94fcc82e6 100644 --- a/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/dblfnote-xetex-bidi.def @@ -12,7 +12,7 @@ %% License information appended. %% %% -\ProvidesFile{dblfnote-xetex-bidi.def}[2011/03/01 v0.1 bidi adaptations for dblfnote package for XeTeX engine] +\ProvidesFile{dblfnote-xetex-bidi.def}[2011/09/05 v0.2 bidi adaptations for dblfnote package for XeTeX engine] \def\right@footnote{% \hbox to \DFNcolumnwidth {\beginR \vbox{\kern -3\p@ @@ -22,7 +22,7 @@ \@pboxswfalse \setlength\@tempdima{#4}% \def\@mpargs{{#1}{#2}[#3]{#4}}% - \setbox\@tempboxa\vbox\bgroup\hbox\bgroup\if@RTL\beginL\fi\if #1t\vtop\else\vbox\fi\bgroup + \setbox\@tempboxa\vbox\bgroup \color@begingroup \hsize\@tempdima \textwidth\hsize \columnwidth\hsize 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 0807c273bff..29ea80fd14d 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrartcl-xetex-bidi.def @@ -196,9 +196,9 @@ \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -232,10 +232,10 @@ \interlinepenalty\@M \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{sectionentry}{#1\nobreak + {\usekomafont{sectionentry}{#1\nobreak \usekomafont{sectionentrypagenumber}{% \hfill\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \endgroup \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \penalty20008 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 48e5c719799..c9024060259 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrbook-xetex-bidi.def @@ -196,9 +196,9 @@ \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -223,9 +223,9 @@ \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -254,10 +254,10 @@ \interlinepenalty\@M \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{chapterentry}{#1\nobreak + {\usekomafont{chapterentry}{#1\nobreak \usekomafont{chapterentrypagenumber}{% \hfill\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20009 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 e037050e57f..022f2d9e0d0 100644 --- a/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def +++ b/Master/texmf-dist/tex/latex/bidi/scrreprt-xetex-bidi.def @@ -196,9 +196,9 @@ \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi\@tempdima \hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{partentry}{#1\nobreak + {\usekomafont{partentry}{#1\nobreak \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20010 @@ -227,10 +227,10 @@ \interlinepenalty\@M \leavevmode \advance\if@RTL\rightskip\else\leftskip\fi \@tempdima \null\nobreak\hskip -\if@RTL\rightskip\else\leftskip\fi - \usekomafont{chapterentry}{#1\nobreak + {\usekomafont{chapterentry}{#1\nobreak \usekomafont{chapterentrypagenumber}{% \hfill\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par + \hb@xt@\@pnumwidth{\hss#2}}}}\par \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax \endgroup \penalty20009 -- cgit v1.2.3