diff options
Diffstat (limited to 'Master/texmf-dist/source/xelatex')
4 files changed, 85 insertions, 24 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 f89edd699c4..6835ebec849 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.5, 2018/09/23 +* v33.8, 2018/09/26 * * 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 19f4ec7e5c4..94c71bd0759 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.5}} +\large User documentation for \textcolor{blue!65!black}{version 33.8}} \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.5}} +User documentation for \textcolor{blue!65!black}{version 33.8}} \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 c13b74e6f54..eb8a4da1e05 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.5 of the bidi + pdftitle={User documentation for version 33.8 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 d1e3fa355d5..0dc0522f7c9 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.5 +v33.8 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/23 +Current version release date: 2018/09/26 ___________________ Vafa Khalighi @@ -243,7 +243,7 @@ by Vafa Khalighi. \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={Source documentation for version 33.5 of the bidi + pdftitle={Source documentation for version 33.8 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.5}} +%\large Source documentation for \textcolor{blue!65!black}{version 33.8}} % \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.5}} +%Source documentation for \textcolor{blue!65!black}{version 33.8}} % %\vskip 0pt plus 3fill %\textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -340,7 +340,7 @@ by Vafa Khalighi. %\iffalse %<*table> %\fi -%% \CheckSum{50014} +%% \CheckSum{50128} %% \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 @@ -1953,8 +1953,8 @@ by Vafa Khalighi. % \section{File \texttt{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2018/09/23} -\def\bidi@version{33.5} +\def\bididate{2018/09/26} +\def\bidi@version{33.8} \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 23, 2018. + Released September 26, 2018. } \@RTLmainfalse \AtBeginDocument{% @@ -2097,6 +2097,7 @@ Bidirectional typesetting in plain TeX and LaTeX] \def\bidi@pdfencrypt@permissionflags{#1}% } \newcommand*{\pdfencryptsetup}{\setkeys{bidi@pdfencrypt}} +\@onlypreamble\pdfencryptsetup \input{latex-xetex-bidi.def} \input{loadingorder-xetex-bidi.def} \define@choicekey{bidi.sty}{RTLdocument}[\bidi@tempa\bidi@tempb]{on,off}[on]{% @@ -2214,13 +2215,15 @@ Bidirectional typesetting in plain TeX and LaTeX] \bidi@digits=`\۰ \loop \XeTeXcharclass \bidi@digits \bidi@digits@charclass \ifnum\bidi@digits<`\۹ \advance\bidi@digits \@ne \repeat \XeTeXinterchartoks \bidi@sepmark@charclass \bidi@digits@charclass = {\DigitsDotDashInterCharToks} \newcommand*{\DigitsDotDashInterCharToks}{\if@nonlatin\char"200F \fi} -\AtEndDocument{% +\bidi@AtEndPreamble{% \special{pdf:encrypt userpw (\bidi@pdfencrypt@userpassword) ownerpw (\bidi@pdfencrypt@ownerpassword) length \bidi@pdfencrypt@keylength perm \bidi@pdfencrypt@permissionflags }% +} +\AtEndDocument{% \special{pdf:% docinfo<<% \if@bidi@pdfm@mark @@ -2241,9 +2244,9 @@ Bidirectional typesetting in plain TeX and LaTeX] %\fi % \section{File \texttt{bidi.tex}} % \begin{macrocode} -\def\bididate{2018/09/23} +\def\bididate{2018/09/26} \catcode`@=11 -\def\bidi@version{33.5} +\def\bidi@version{33.8} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -2342,7 +2345,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \def\@bidi@pdfcustomproperties{% This is the bidi package, Version \bidi@version, - Released September 23, 2018. + Released September 26, 2018. } \def\bidi@pdfm@mark{% \special{pdf:% @@ -9411,7 +9414,7 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{extrafootnotefeatures-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/09/23 v1.2 bidi extra footnote features for XeTeX engine] +\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2018/09/26 v1.3 bidi extra footnote features for XeTeX engine] \newcommand*{\@bidi@before@Hy@hyperfootnotes}{% \if@bidi@csundef{ifHy@hyperfootnotes}{}{% \if@bidi@csundef{HLTR@@LTRfootnotetext}{}{% @@ -9676,9 +9679,9 @@ bidi implementation of tufte title] \rightskip=\z@ \footnoterule}} \newinsert\footinsv@r - \skip\footinsv@r\bigskipamount - \count\footinsv@r=1000 % no magnifcation - \dimen\footinsv@r=\footinsdim +\skip\footinsv@r\bigskipamount +\count\footinsv@r=1000 % no magnifcation +\dimen\footinsv@r=\footinsdim \m@make@footstart{v@r} \bidi@ensure@newcommand{\@footgroupv@r}{} \newinsert\@mpfootinsv@r @@ -11092,7 +11095,17 @@ bidi implementation of tufte title] \repeat}} \bidi@ensure@newcommand*{\m@mremovehboxes}{\setbox0=\lastbox \ifhbox0{\m@mremovehboxes}\unhbox0 \fi} -\bidi@ensure@newcommand*{\footfudgefiddle}{64} +\newcommand*\AddExtraParaSkip[1]{% + \if@bidi@csdef{footfudgefactor}{% + \PackageError{bidi}{% + The control sequence `\string\AddExtraParaSkip` + must be used before the control sequence + `\string\paragraphfootnotes' in the preamble% + }\@ehc + }{% + \def\bidi@xparaskip{\advance\@tempdima#1\relax}% + }% +} \bidi@ensure@newcommand{\paragraphfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \@bidi@before@Hy@hyperfootnotes @@ -11102,7 +11115,9 @@ bidi implementation of tufte title] \dimen\footinsv@r=\footinsdim \count\footinsv@r=1000\relax \m@make@para@footgroup{v@r}% + \m@make@para@footstart{v@r}% \let\@footgroupv@r\@para@footgroupv@r + \let\@footstartv@r\@para@footstartv@r \let\@mpfootnotetext\@mpparafootnotetext \let\@mpLTRfootnotetext\@mpparaLTRfootnotetext \let\@mpRTLfootnotetext\@mpparaRTLfootnotetext @@ -11112,6 +11127,16 @@ bidi implementation of tufte title] \begingroup \def\baselinestretch{\m@m@footnote@spacing}% \foottextfont + \@tempdima\footnotesep + \advance\@tempdima -\ht\strutbox + \ifdim\@tempdima<\z@ \@tempdima\z@ \fi + \advance\@tempdima.5\normalbaselineskip + \bidi@xparaskip + \xdef\bidi@paraskip{\the\@tempdima\relax}% + \ifdim\skip\footinsv@r>\bigskipamount + \else + \global\advance\skip\footinsv@r\bidi@paraskip + \fi \@tempdima\normalbaselineskip \multiply \@tempdima \@cclvi \@tempdimb \columnwidth @@ -11120,6 +11145,8 @@ bidi implementation of tufte title] \xdef\footfudgefactor{\strip@pt\@tempdima}% \endgroup } +\let\bidi@xparaskip\relax +\@onlypreamble\AddExtraParaSkip \bidi@ensure@newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{% \let\bidi@RTL@everypar\@empty% \def\baselinestretch{\m@m@footnote@spacing}% @@ -11229,6 +11256,16 @@ bidi implementation of tufte title] \begingroup \def\baselinestretch{\m@m@footnote@spacing}% \@nameuse{foottextfont#1}% + \@tempdima\footnotesep + \advance\@tempdima -\ht\strutbox + \ifdim\@tempdima<\z@ \@tempdima\z@ \fi + \advance\@tempdima.5\normalbaselineskip + \bidi@xparaskip + \xdef\bidi@paraskip{\the\@tempdima\relax}% + \ifdim\skip\@nameuse{footins#1}>\bigskipamount + \else + \global\advance\skip\@nameuse{footins#1}\bidi@paraskip + \fi \@tempdima\normalbaselineskip \multiply \@tempdima \@cclvi \@tempdimb \columnwidth @@ -11293,7 +11330,7 @@ bidi implementation of tufte title] \leftskip=\z@ \rightskip=\z@ \parindent=\z@ - \vskip\skip\@nameuse{footins#1}% + \vskip\skip\footins \footnoterule}} \bidi@ensure@newcommand*{\m@m@makecolfloats}{% \xdef\@freelist{\@freelist\@midlist}% @@ -15691,7 +15728,7 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{multicol-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{multicol-xetex-bidi.def}[2018/09/23 v0.9 bidi adaptations for multicol package for XeTeX engine] +\ProvidesFile{multicol-xetex-bidi.def}[2018/09/26 v1.0 bidi adaptations for multicol package for XeTeX engine] \def\page@sofar{% \process@cols\mult@rightbox {\ifvoid\count@ @@ -15775,6 +15812,12 @@ bidi implementation of tufte title] \LTR@column@boxes} \newcommand\bidi@multicol@align@columns {\if@RTLmain\RTL@column@boxes\else\LTR@column@boxes\fi} +\bidi@AtEndPreamble{% + \if@bidi@csdef{footinsv@r}{% + \def\footnoterule{\kern-3\p@ + \hrule \@width \textwidth \kern 2.6\p@}% + }{}% +} \def\multicols#1{\col@number#1\relax \ifnum\col@number<\tw@ \PackageWarning{multicol}% @@ -15856,6 +15899,24 @@ bidi implementation of tufte title] \fi \ifnum \c@tracingmulticols>\thr@@ }{}{}% +\bidi@patchcmd{\endmulticols}{% + \reinsert@footnotes +}{% + \reinsert@footnotes + \bidi@reinsert@footnotesv@r +}{}{}% +\bidi@patchcmd{\speci@ls}{% + \reinsert@footnotes +}{% + \reinsert@footnotes + \bidi@reinsert@footnotesv@r +}{}{}% +\bidi@patchcmd{\speci@ls}{% + \reinsert@footnotes +}{% + \reinsert@footnotes + \bidi@reinsert@footnotesv@r +}{}{}% }{}% \bidi@patchcmd{\multi@column@out}{% \let\ifshr@kingsaved\ifshr@king |