diff options
author | Karl Berry <karl@freefriends.org> | 2018-09-29 21:26:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-09-29 21:26:04 +0000 |
commit | 77872db57134ce690bf9ee630569ae942b917af9 (patch) | |
tree | 749769ba90fb80e20fe4b7be1f364ff223b75899 /Master/texmf-dist/source/xelatex | |
parent | 0a07d00af20143947cb66d788e41fe3a50461e46 (diff) |
bidi (29sep18)
git-svn-id: svn://tug.org/texlive/trunk@48787 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/xelatex')
4 files changed, 172 insertions, 33 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 bb2035fafa4..5ef0e5f09c0 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.9, 2018/09/27 +* v34.0, 2018/09/29 * * 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 5c11d0a657e..993d45929c2 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.9}} +\large User documentation for \textcolor{blue!65!black}{version 34.0}} \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.9}} +User documentation for \textcolor{blue!65!black}{version 34.0}} \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 71c5a9d522c..fbccb5306c4 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.9 of the bidi + pdftitle={User documentation for version 34.0 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 67e0acc0094..2ab76fe941e 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.9 +v34.0 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/27 +Current version release date: 2018/09/29 ___________________ Vafa Khalighi @@ -243,7 +243,7 @@ by Vafa Khalighi. \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={Source documentation for version 33.9 of the bidi + pdftitle={Source documentation for version 34.0 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.9}} +%\large Source documentation for \textcolor{blue!65!black}{version 34.0}} % \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.9}} +%Source documentation for \textcolor{blue!65!black}{version 34.0}} % %\vskip 0pt plus 3fill %\textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -340,7 +340,7 @@ by Vafa Khalighi. %\iffalse %<*table> %\fi -%% \CheckSum{50190} +%% \CheckSum{50462} %% \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/27} -\def\bidi@version{33.9} +\def\bididate{2018/09/29} +\def\bidi@version{34.0} \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 27, 2018. + Released September 29, 2018. } \@RTLmainfalse \AtBeginDocument{% @@ -2060,11 +2060,19 @@ Bidirectional typesetting in plain TeX and LaTeX] \dimen\@bidi@copyins@=40pc \count\@bidi@copyins@=1000 \newcommand*{\@bidi@inslogo@}{\insert\@bidi@copyins@{\@bidi@logo@}} -\newcommand*{\@bidi@logo@hb@xt@}{% +\newcommand*{\@bidi@logo@hb@xt@columnwidth}{% \if@RTLmain - \hboxR to + \if@twocolumn + \hboxR to \columnwidth + \else + \hboxR to \textwidth + \fi \else - \hboxL to + \if@twocolumn + \hboxL to \columnwidth + \else + \hboxL to \textwidth + \fi \fi } \newcommand*{\@bidi@logo}[1]{% @@ -2083,7 +2091,10 @@ Bidirectional typesetting in plain TeX and LaTeX] }% \the\toks@ } -\newcommand*{\@bidi@logo@}{\@bidi@logo@hb@xt@\textwidth{\hss\LRE{\bfseries Typeset by the \textsf{bidi} package\quad\@bidi@logo{bidi-logo.pdf}}}} +\newcommand*{\@bidi@logo@}{% + \@bidi@logo@hb@xt@columnwidth + {\hss\LRE{\bfseries Typeset by the \textsf{bidi} + package\quad\@bidi@logo{bidi-logo.pdf}}}} \define@key{bidi@pdfencrypt}{userpassword}[]{% \def\bidi@pdfencrypt@userpassword{#1}% } @@ -2244,9 +2255,9 @@ Bidirectional typesetting in plain TeX and LaTeX] %\fi % \section{File \texttt{bidi.tex}} % \begin{macrocode} -\def\bididate{2018/09/27} +\def\bididate{2018/09/29} \catcode`@=11 -\def\bidi@version{33.9} +\def\bidi@version{34.0} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -2345,7 +2356,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \def\@bidi@pdfcustomproperties{% This is the bidi package, Version \bidi@version, - Released September 27, 2018. + Released September 29, 2018. } \def\bidi@pdfm@mark{% \special{pdf:% @@ -11903,7 +11914,7 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{flowfram-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{flowfram-xetex-bidi.def}[2018/09/23 v0.4 bidi adaptations for flowfram package for XeTeX engine] +\ProvidesFile{flowfram-xetex-bidi.def}[2018/09/29 v0.5 bidi adaptations for flowfram package for XeTeX engine] \def\@outputdblcol{% \@nxtcol=\c@thisframe \c@curpg=\c@page @@ -11965,7 +11976,9 @@ bidi implementation of tufte title] \endgroup \aftergroup \set@typeset@protect - \reset@font\normalsize\normalsfcodes + \reset@font\normalsize + \bidi@font@@outputpage + \normalsfcodes \let\label\@gobble \let\index\@gobble \let\glossary\@gobble @@ -12589,7 +12602,15 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{ftnright-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{ftnright-xetex-bidi.def}[2017/05/06 v0.5 bidi adaptations for ftnright package for XeTeX engine] +\ProvidesFile{ftnright-xetex-bidi.def}[2018/09/29 v0.6 bidi adaptations for ftnright package for XeTeX engine] + +\def\prepare@bidi@copyins{% + \global\bidi@rcol@copyinsskip\skip\@bidi@copyins@ + \global\skip\@bidi@copyins@\z@ + \global\count\@bidi@copyins@\z@ + \global\dimen\@bidi@copyins@\textheight} + +\newskip\bidi@rcol@copyinsskip \def\LTR@outputdblcol{% \if@firstcolumn @@ -12597,6 +12618,8 @@ bidi implementation of tufte title] \global\setbox\@leftcolumn\copy\@outputbox \global\count\footins\@m \global\skip\footins\rcol@footinsskip + \global\count\@bidi@copyins@\@m + \global\skip\@bidi@copyins@\bidi@rcol@copyinsskip \splitmaxdepth\maxdimen \vbadness\maxdimen \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}% @@ -12614,6 +12637,7 @@ bidi implementation of tufte title] \fi \else \preparefootins + \prepare@bidi@copyins \global\@firstcolumntrue \setbox\@outputbox\vbox{% \hb@xt@\textwidth{% @@ -12637,14 +12661,14 @@ bidi implementation of tufte title] \endgroup \fi}% - - \def\RTL@outputdblcol{% \if@firstcolumn \global\@firstcolumnfalse \global\setbox\@leftcolumn\copy\@outputbox \global\count\footins\@m \global\skip\footins\rcol@footinsskip + \global\count\@bidi@copyins@\@m + \global\skip\@bidi@copyins@\bidi@rcol@copyinsskip \splitmaxdepth\maxdimen \vbadness\maxdimen \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}% @@ -12662,6 +12686,7 @@ bidi implementation of tufte title] \fi \else \preparefootins + \prepare@bidi@copyins \global\@firstcolumntrue \setbox\@outputbox\vbox{% \hb@xt@\textwidth{% @@ -12689,7 +12714,124 @@ bidi implementation of tufte title] \endgroup \fi}% +\def\@startcolumn{% + \ifx\@deferlist\@empty + \global\@fcolmadefalse + \global\@colroom\@colht + \else + \ifvoid\footins\else + \ftn@amount\ht\footins + \advance\ftn@amount\dp\footins + \advance\ftn@amount\skip\footins + \fi + \ifvoid\@bidi@copyins@\else + \bidi@copyins@amount\ht\@bidi@copyins@ + \advance\bidi@copyins@amount\dp\@bidi@copyins@ + \advance\bidi@copyins@amount\skip\@bidi@copyins@ + \fi + \global\advance\@colht-\ftn@amount + \global\advance\@colht-\bidi@copyins@amount + \global\@colroom\@colht + \@xstartcol + \global\advance\@colht\ftn@amount + \global\advance\@colroom\ftn@amount + \global\advance\@colht\bidi@copyins@amount + \global\advance\@colroom\bidi@copyins@amount + \fi + \if@fcolmade + \setbox\@cclv\box\@outputbox + \@makecol + \else + \ifvoid\footins\else + \insert\footins{\unvbox\footins}\fi + \ifvoid\@bidi@copyins@\else + \insert\@bidi@copyins@{\unvbox\@bidi@copyins@}\fi + \fi} +\newdimen\bidi@copyins@amount + +\def\@makecol{\if@firstcolumn + \setbox\@outputbox\box\@cclv + \if@twocolumn \else + \ifvoid\footins \else + \@latexerr{ftnright package + used in one-column mode}% + {The ftnright package was designed to + work with LaTeX's standard^^Jtwocolumn + option. It does *not* work with the + multicol package.^^JSo please specify + `twocolumn' in the + \noexpand\documentclass command.}% + \shipout\box\footins \fi + \ifvoid\@bidi@copyins@ \else + \@latexerr{ftnright package + used in one-column mode}% + {The ftnright package was designed to + work with LaTeX's standard^^Jtwocolumn + option. It does *not* work with the + multicol package.^^JSo please specify + `twocolumn' in the + \noexpand\documentclass command.}% + \shipout\box\@bidi@copyins@ \fi\fi + \ifnum\insertpenalties>\z@ + \@latexerr{ftnright package + scrambled footnotes}% + {There is too much footnote material in + the first column and ftnright^^Jis + unable to cope with this.^^JYou need + to reduce the amount to get a properly + formatted page.}% + \fi + \else + \ifvoid\footins + \ifvoid\@bidi@copyins@ + \setbox\@outputbox\box\@cclv + \else + \setbox\@outputbox\vbox + {\ifvoid\@cclv \else + \unvbox\@cclv + \vskip \skip\@bidi@copyins@ + \fi + \color@begingroup + \normalcolor + \unvbox \@bidi@copyins@ + \color@endgroup}% + \fi + \else + \setbox\@outputbox\vbox + {\ifvoid\@cclv \else + \unvbox\@cclv + \vskip\skip\footins\fi + \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 + \fi + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox\vbox to\@colht + {\boxmaxdepth\maxdepth + \@texttop + \@tempdima\dp\@outputbox + \unvbox\@outputbox + \vskip-\@tempdima + \@textbottom}% + \fi + \global\maxdepth\@maxdepth} \let\leftfootnoterule\@empty \let\rightfootnoterule\@empty @@ -12699,6 +12841,10 @@ bidi implementation of tufte title] \long\def\@makefntext#1{\parindent 1em \noindent\hbox to 2em{}% \llap{\@thefnmark\hbox{.}\,\,}#1} + +\setlength{\skip\@bidi@copyins@} + {10pt plus 5pt minus 3pt} +\AtBeginDocument{\prepare@bidi@copyins} % \end{macrocode} % \iffalse %</ftnright-xetex-bidi.def> @@ -15303,7 +15449,6 @@ bidi implementation of tufte title] \mix_endLTR: \group_end: } - \tl_set_eq:NN\l_mix_mediabutton_tl\mediabutton \tl_set:Nn\mediabutton{\mix_uribegin:\l_mix_mediabutton_tl} @@ -16231,7 +16376,7 @@ bidi implementation of tufte title] %\fi % \section{File \texttt{pdfbase-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{pdfbase-xetex-bidi.def}[2017/08/27 v0.1 bidi adaptations for pdfbase package for XeTeX engine] +\ProvidesFile{pdfbase-xetex-bidi.def}[2018/09/29 v0.2 bidi adaptations for pdfbase package for XeTeX engine] \ExplSyntaxOn \cs_set_eq:NN\pbs_outputpage_orig:\@outputpage \cs_set_nopar:Npn\@outputpage{ @@ -16250,16 +16395,10 @@ bidi implementation of tufte title] \box_use_clear:N\@outputbox %end of page \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}} - %end of dvi - \int_compare:nT{\pbs@last@page=\g_pbs_page_int}{ - \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eod_seq{##1}} - } } \bool_if:NT\l_pbs_is_vertical_bool{ \vbox_set:Nn\@outputbox{\box_use_clear:N\@outputbox} } - %insert /Properties into current page's resources - \pbs_insert_properties_entry: \pbs_outputpage_orig: } \ExplSyntaxOff |