summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/xelatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-22 21:00:59 +0000
committerKarl Berry <karl@freefriends.org>2018-09-22 21:00:59 +0000
commit4be14a8ad3ab56b99c27d841112f78675bd3c1ca (patch)
tree2ca2bdacf32c25c33e191964de066ef0b565e162 /Master/texmf-dist/source/xelatex
parent11b17670348e1e440d1a3e2891671f87be10abf5 (diff)
bidi (22sep18)
git-svn-id: svn://tug.org/texlive/trunk@48737 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/xelatex')
-rw-r--r--Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx2
-rw-r--r--Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx4
-rw-r--r--Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx2
-rw-r--r--Master/texmf-dist/source/xelatex/bidi/bidi.dtx230
4 files changed, 203 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx
index c07be5dcac2..f89edd699c4 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx
@@ -19,7 +19,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run
*
* Copyright (c) 2009--2018 Vafa Khalighi
*
-* v33.4, 2018/09/21
+* v33.5, 2018/09/23
*
* License: LaTeX Project Public License, version
* 1.3c or higher (your choice)
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx
index 2b6958d7676..19f4ec7e5c4 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx
@@ -3,7 +3,7 @@
\begin{document}
\title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-\large User documentation for \textcolor{blue!65!black}{version 33.4}}
+\large User documentation for \textcolor{blue!65!black}{version 33.5}}
\author{Vafa Khalighi\\
\url{persian-tex@tug.org}}
\setcounter{page}{0}
@@ -14,7 +14,7 @@
\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
\Large
-User documentation for \textcolor{blue!65!black}{version 33.4}}
+User documentation for \textcolor{blue!65!black}{version 33.5}}
\vskip 0pt plus 3fill
\textit{\large to my Master, \textbf{Ferdowsi The Great}}
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx
index 8d52cc9b624..c13b74e6f54 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx
@@ -1,7 +1,7 @@
\documentclass{ltxdoc}
\input{bidi-doc-preamble.ltx}
\hypersetup{%
- pdftitle={User documentation for version 33.4 of the bidi
+ pdftitle={User documentation for version 33.5 of the bidi
package}%
}
\begin{document}
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
index 21099399c8c..d1e3fa355d5 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
@@ -5,7 +5,7 @@
%<*readme>
___________________
The bidi package
-v33.4
+v33.5
This package provides a convenient interface for typesetting
bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -46,7 +46,7 @@ mailing list. You can subscribe to the mailing list at
<https://lists.sourceforge.net/lists/listinfo/persian-tex-dist-discuss>
-Current version release date: 2018/09/21
+Current version release date: 2018/09/23
___________________
Vafa Khalighi
@@ -243,7 +243,7 @@ by Vafa Khalighi.
\documentclass{ltxdoc}
\input{bidi-doc-preamble.ltx}
\hypersetup{%
- pdftitle={Source documentation for version 33.4 of the bidi
+ pdftitle={Source documentation for version 33.5 of the bidi
package}%
}
\EnableCrossrefs
@@ -262,7 +262,7 @@ by Vafa Khalighi.
% \GetFileInfo{\jobname.dtx}
% \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
%\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-%\large Source documentation for \textcolor{blue!65!black}{version 33.4}}
+%\large Source documentation for \textcolor{blue!65!black}{version 33.5}}
% \author{Vafa Khalighi\\
% \url{persian-tex@tug.org}}
%\setcounter{page}{0}
@@ -273,7 +273,7 @@ by Vafa Khalighi.
%\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
%
%\Large
-%Source documentation for \textcolor{blue!65!black}{version 33.4}}
+%Source documentation for \textcolor{blue!65!black}{version 33.5}}
%
%\vskip 0pt plus 3fill
%\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -340,7 +340,7 @@ by Vafa Khalighi.
%\iffalse
%<*table>
%\fi
-%% \CheckSum{49745}
+%% \CheckSum{50014}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -545,7 +545,7 @@ by Vafa Khalighi.
%\fi
% \section{File \texttt{algorithm2e-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{algorithm2e-xetex-bidi.def}[2018/09/21 v0.2 bidi adaptations for algorithm2e package for XeTeX engine]
+\ProvidesFile{algorithm2e-xetex-bidi.def}[2018/09/23 v0.2 bidi adaptations for algorithm2e package for XeTeX engine]
\expandafter\ifx\csname algocf@within\endcsname\relax% if \algocf@within doesn't exist
\else% else
\renewcommand\thealgocf{\csname the\algocf@within\endcsname\@SepMark\@arabic\c@algocf}%
@@ -1953,8 +1953,8 @@ by Vafa Khalighi.
% \section{File \texttt{bidi.sty}}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\def\bididate{2018/09/21}
-\def\bidi@version{33.4}
+\def\bididate{2018/09/23}
+\def\bidi@version{33.5}
\ProvidesPackage{bidi}[\bididate\space v\bidi@version\space
Bidirectional typesetting in plain TeX and LaTeX]
\edef\@bidi@info{****************************************************^^J%
@@ -2038,7 +2038,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
}
\newcommand*{\@bidi@pdfcustomproperties}{%
This is the bidi package, Version \bidi@version,
- Released September 21, 2018.
+ Released September 23, 2018.
}
\@RTLmainfalse
\AtBeginDocument{%
@@ -2058,7 +2058,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
\newinsert\@bidi@copyins@
\skip\@bidi@copyins@=12\p@
\dimen\@bidi@copyins@=40pc
-%\count\@bidi@copyins@=1000
+\count\@bidi@copyins@=1000
\newcommand*{\@bidi@inslogo@}{\insert\@bidi@copyins@{\@bidi@logo@}}
\newcommand*{\@bidi@logo@hb@xt@}{%
\if@RTLmain
@@ -2241,9 +2241,9 @@ Bidirectional typesetting in plain TeX and LaTeX]
%\fi
% \section{File \texttt{bidi.tex}}
% \begin{macrocode}
-\def\bididate{2018/09/21}
+\def\bididate{2018/09/23}
\catcode`@=11
-\def\bidi@version{33.4}
+\def\bidi@version{33.5}
\let \protect \relax
\newlinechar`\^^J
\edef\@bidi@info{****************************************************^^J%
@@ -2342,7 +2342,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
}
\def\@bidi@pdfcustomproperties{%
This is the bidi package, Version \bidi@version,
- Released September 21, 2018.
+ Released September 23, 2018.
}
\def\bidi@pdfm@mark{%
\special{pdf:%
@@ -9411,7 +9411,7 @@ bidi implementation of tufte title]
%\fi
% \section{File \texttt{extrafootnotefeatures-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2017/05/19 v1.1 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/09/23 v1.2 bidi extra footnote features for XeTeX engine]
\newcommand*{\@bidi@before@Hy@hyperfootnotes}{%
\if@bidi@csundef{ifHy@hyperfootnotes}{}{%
\if@bidi@csundef{HLTR@@LTRfootnotetext}{}{%
@@ -9623,6 +9623,14 @@ bidi implementation of tufte title]
\boxmaxdepth \@maxdepth
\unvbox\@outputbox
\ifvoid\footinsv@r\else\@footstartv@r\@footgroupv@r\fi
+ \ifvoid\@bidi@copyins@
+ \else
+ \vskip \skip\@bidi@copyins@
+ \color@begingroup
+ \normalcolor
+ \unvbox \@bidi@copyins@
+ \color@endgroup
+ \fi
\extrafeetinshook}}
\bidi@ensure@newcommand{\extrafeetinshook}{}
\bidi@ensure@newcommand{\foottextfont}{\footnotesize}
@@ -11314,7 +11322,33 @@ bidi implementation of tufte title]
\normalcolor
\footnoterule
\unvbox \footins
- \color@endgroup}}
+ \color@endgroup
+ \ifvoid\footinsv@r
+ \ifvoid\@bidi@copyins@
+ \else
+ \vskip \skip\@bidi@copyins@
+ \color@begingroup
+ \normalcolor
+ \unvbox \@bidi@copyins@
+ \color@endgroup
+ \fi
+ \fi
+ }}
+\newcommand*{\bidi@mopcopyins}{\setbox\@outputbox \vbox{%
+ \boxmaxdepth\@maxdepth
+ \@tempdima\dp\@cclv
+ \unvbox\@cclv
+ \vskip-\@tempdima
+ \bidi@mopfn@bottom
+ \ifvoid\@bidi@copyins@
+ \else
+ \vskip \skip\@bidi@copyins@
+ \color@begingroup
+ \normalcolor
+ \unvbox \@bidi@copyins@
+ \color@endgroup
+ \fi
+ }}
\newcommand*{\bidi@mopfootnotebf}{%
\setbox\@outputbox \vbox{%
\boxmaxdepth\@maxdepth
@@ -11325,11 +11359,44 @@ bidi implementation of tufte title]
\normalcolor
\footnoterule
\unvbox \footins
- \color@endgroup}}
+ \color@endgroup
+ \ifvoid\footinsv@r
+ \ifvoid\@bidi@copyins@
+ \else
+ \vskip \skip\@bidi@copyins@
+ \color@begingroup
+ \normalcolor
+ \unvbox \@bidi@copyins@
+ \color@endgroup
+ \fi
+ \fi
+ }}
+\newcommand*{\bidi@mopcopyinsbf}{%
+ \setbox\@outputbox \vbox{%
+ \boxmaxdepth\@maxdepth
+ \unvbox\@outputbox
+ \bidi@mopfn@bottom
+ \ifvoid\@bidi@copyins@
+ \else
+ \vskip \skip\@bidi@copyins@
+ \color@begingroup
+ \normalcolor
+ \unvbox \@bidi@copyins@
+ \color@endgroup
+ \fi
+ }}
\gdef\mem@makecol{%
\m@m@makecolintro
\ifvoid\footins
- \setbox\@outputbox \box\@cclv
+ \ifvoid\footinsv@r
+ \ifvoid\@bidi@copyins@
+ \setbox\@outputbox \box\@cclv
+ \else
+ \bidi@mopcopyins
+ \fi
+ \else
+ \setbox\@outputbox \box\@cclv
+ \fi
\else
\m@mopfootnote
\fi
@@ -11342,6 +11409,12 @@ bidi implementation of tufte title]
\setbox\@outputbox \box\@cclv
\m@m@makecolfloats
\ifvoid\footins
+ \ifvoid\footinsv@r
+ \ifvoid\@bidi@copyins@
+ \else
+ \bidi@mopcopyinsbf
+ \fi
+ \fi
\else
\bidi@mopfootnotebf
\fi
@@ -11752,7 +11825,7 @@ bidi implementation of tufte title]
%\fi
% \section{File \texttt{flowfram-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{flowfram-xetex-bidi.def}[2018/02/22 v0.3 bidi adaptations for flowfram package for XeTeX engine]
+\ProvidesFile{flowfram-xetex-bidi.def}[2018/09/23 v0.4 bidi adaptations for flowfram package for XeTeX engine]
\def\@outputdblcol{%
\@nxtcol=\c@thisframe
\c@curpg=\c@page
@@ -11832,11 +11905,6 @@ bidi implementation of tufte title]
\box\@outputbox
\global\let\bidi@AfterOutputBoxOutputPage\@firstofone
\bidi@afteroutputboxoutputpagehook
- \ifvoid\@bidi@copyins@
- \else
- \vskip\skip\@bidi@copyins@
- \unvbox\@bidi@copyins@
- \fi
}}%
\global\let\bidi@AfterOutputPageShipOut\@firstofone
\bidi@afteroutputpageshipouthook
@@ -15623,7 +15691,7 @@ bidi implementation of tufte title]
%\fi
% \section{File \texttt{multicol-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{multicol-xetex-bidi.def}[2016/11/27 v0.8 bidi adaptations for multicol package for XeTeX engine]
+\ProvidesFile{multicol-xetex-bidi.def}[2018/09/23 v0.9 bidi adaptations for multicol package for XeTeX engine]
\def\page@sofar{%
\process@cols\mult@rightbox
{\ifvoid\count@
@@ -15753,6 +15821,57 @@ bidi implementation of tufte title]
\kern2.6\p@}
\def\textwidth@footnoterule{\kern-3\p@
\hrule \@width \textwidth \kern 2.6\p@}
+\def\bidi@leave@mult@copyins{%
+ \advance\dimen@-\skip\@bidi@copyins@
+ \advance\dimen@-\ht\@bidi@copyins@
+}
+\bidi@AtEndPreamble{%
+ \if@bidi@csdef{footinsv@r}{%
+ \def\bidi@leave@mult@footins@vr{%
+ \advance\dimen@-\skip\footinsv@r
+ \advance\dimen@-\ht\footinsv@r
+ }%
+ \def\bidi@init@mult@footinsv@r{%
+ \multiply\count\footinsv@r\col@number
+ \multiply\skip \footinsv@r\col@number
+ }%
+ \def\bidi@reinsert@footnotesv@r{\ifvoid\footinsv@r\else
+ \insert\footinsv@r{}\fi}%
+ \bidi@patchcmd{\prepare@multicols}{%
+ \reinsert@footnotes
+ }{%
+ \reinsert@footnotes
+ \bidi@init@mult@footinsv@r
+ \bidi@reinsert@footnotesv@r
+ }{}{}%
+ \bidi@patchcmd{\multi@column@out}{%
+ \ifnum \c@tracingmulticols>\thr@@
+ }{%
+ \ifvoid\footinsv@r\else
+ \PackageWarning{multicol}%
+ {I moved some lines to
+ the next page.\MessageBreak
+ Footnotes on page
+ \thepage\space might be wrong}%
+ \fi
+ \ifnum \c@tracingmulticols>\thr@@
+}{}{}%
+ }{}%
+ \bidi@patchcmd{\multi@column@out}{%
+ \let\ifshr@kingsaved\ifshr@king
+ }{%
+ \if@bidi@csdef{footinsv@r}{%
+ \divide\skip\footinsv@r\col@number
+ \ifvoid\footinsv@r \else
+ \bidi@leave@mult@footins@vr
+ \fi
+ }{}%
+ \ifvoid\@bidi@copyins@ \else
+ \bidi@leave@mult@copyins
+ \fi
+ \let\ifshr@kingsaved\ifshr@king
+ }{}{}%
+}
% \end{macrocode}
% \iffalse
%</multicol-xetex-bidi.def>
@@ -21589,7 +21708,7 @@ to\rtside{\box\bslice\hfil}}
%\fi
% \section{File \texttt{latex-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{latex-xetex-bidi.def}[2018/09/21 v1.3.4 bidi adaptations for `latex.ltx' for XeTeX engine]
+\ProvidesFile{latex-xetex-bidi.def}[2018/09/23 v1.3.5 bidi adaptations for `latex.ltx' for XeTeX engine]
\newcommand{\TeXXeTOn}{\TeXXeTstate\@ne}
\newcommand{\TeXXeTOff}{\TeXXeTstate\z@}
\TeXXeTOn
@@ -22070,6 +22189,60 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\renewcommand{\@outputdblcol}{\if@RTLmain\RTL@outputdblcol\else\LTR@outputdblcol\fi}
\newcommand{\RTLdblcol}{\renewcommand{\@outputdblcol}{\RTL@outputdblcol}}
\newcommand{\LTRdblcol}{\renewcommand{\@outputdblcol}{\LTR@outputdblcol}}
+
+\gdef \@makecol {%
+ \ifvoid\footins
+ \ifvoid\@bidi@copyins@
+ \setbox\@outputbox \box\@cclv
+ \else
+ \setbox\@outputbox \vbox {%
+ \boxmaxdepth \@maxdepth
+ \unvbox \@cclv
+ \vskip \skip\@bidi@copyins@
+ \color@begingroup
+ \normalcolor
+ \unvbox \@bidi@copyins@
+ \color@endgroup
+ }%
+ \fi
+ \else
+ \setbox\@outputbox \vbox {%
+ \boxmaxdepth \@maxdepth
+ \unvbox \@cclv
+ \vskip \skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup
+ \ifvoid\@bidi@copyins@
+ \else
+ \vskip \skip\@bidi@copyins@
+ \color@begingroup
+ \normalcolor
+ \unvbox \@bidi@copyins@
+ \color@endgroup
+ \fi
+ }%
+ \fi
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}%
+ \global \let \@midlist \@empty
+ \@combinefloats
+ \ifvbox\@kludgeins
+ \@makespecialcolbox
+ \else
+ \setbox\@outputbox \vbox to\@colht {%
+ \@texttop
+ \dimen@ \dp\@outputbox
+ \unvbox \@outputbox
+ \vskip -\dimen@
+ \@textbottom
+ }%
+ \fi
+ \global \maxdepth \@maxdepth
+}
+
\def\LTRmarginpar{%
\ifhmode
\@bsphack
@@ -22281,11 +22454,6 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\box\@outputbox
\global\let\bidi@AfterOutputBoxOutputPage\@firstofone
\bidi@afteroutputboxoutputpagehook
- \ifvoid\@bidi@copyins@
- \else
- \vskip\skip\@bidi@copyins@
- \unvbox\@bidi@copyins@
- \fi
\global\let\bidi@BeforeFooter\@firstofone
\bidi@beforefooterhook
\baselineskip \footskip