diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-12 19:55:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-12 19:55:18 +0000 |
commit | 0fd8181b169facfae592299e5388ee8ddee43152 (patch) | |
tree | 394f33ed1165c1134ac9bc262149fe68f234f002 /Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def | |
parent | f3440401773a196c436d2e1664e195d7ab46ba57 (diff) |
bidi (12jul22)
git-svn-id: svn://tug.org/texlive/trunk@63882 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def')
-rw-r--r-- | Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def index 87745e523f6..2cea01981ad 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{55412} +%% \CheckSum{55408} %% \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 @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2022/07/10 v2.2 bidi extra footnote features for XeTeX engine] +\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2022/07/12 v2.3 bidi extra footnote features for XeTeX engine] \newdimen\bidi@columnwidth \def\bidi@floathook{% \bidi@columnwidth\columnwidth @@ -289,6 +289,7 @@ \@tempskipa\skip#1% \bidi@ifmulticol{\divide\@tempskipa\col@number}{}% \edef\bidi@footskip{\vskip\the\@tempskipa\relax}% + \bidi@removexfootskip \ifvoid\footins \global\setbox\footins\vbox{#2#3}% \else @@ -354,12 +355,12 @@ }% } \newinsert\footinsv@r -\skip\footinsv@r\bigskipamount +\skip\footinsv@r\skip\footins \count\footinsv@r=1000 % no magnifcation \dimen\footinsv@r=\footinsdim \m@make@footstart{v@r} \newinsert\footinsv@l -\skip\footinsv@l\bigskipamount +\skip\footinsv@l\skip\footins \count\footinsv@l=1000 % no magnifcation \dimen\footinsv@l=\footinsdim \m@make@footstart{v@l} @@ -1704,6 +1705,10 @@ \let\bidi@xparaskip\relax \@onlypreamble\AddExtraParaSkip \@onlypreamble\bidi@xparaskip +\def\bidi@startparafootskip#1{% + \global\advance\skip#1\bidi@paraskip +} +\@onlypreamble\bidi@startparafootskip \bidi@ensure@newcommand{\paragraphfootnotes}{% \@namedef{foottextfontv@r}{\foottextfont}% % [RS] \@namedef{foottextfontv@l}{\LTRfoottextfont}% @@ -1713,6 +1718,7 @@ \let\@RTLfootnotetext\@paraRTLfootnotetext \dimen\footinsv@r=\footinsdim \count\footinsv@r=1000\relax + \let\bidi@removexfootskip\bidi@removexparafootskip \m@make@para@footgroup{v@r}% \m@make@para@footstart{v@r}% \let\@footgroupv@r\@para@footgroupv@r @@ -1751,11 +1757,13 @@ \bidi@xparaskip \xdef\bidi@paraskip{\the\@tempdima\relax}% \endgroup + \bidi@startparafootskip\footinsv@r + \bidi@startparafootskip\footinsv@l } \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } \newcommand{\normalRTLparaLTRfootnotes}{% - \@namedef{foottextfontv@r}{\foottextfont}% + \@namedef{foottextfontv@l}{\LTRfoottextfont}% \@bidi@before@Hy@hyperfootnotes \if@RTL@footnote \let\@footnotetext\m@mold@footnotetext @@ -1764,14 +1772,9 @@ \fi \let\@LTRfootnotetext\@paraLTRfootnotetext \let\@RTLfootnotetext\m@mold@RTLfootnotetext - \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 \dimen\footinsv@l=\footinsdim \count\footinsv@l=1000\relax + \let\bidi@removexfootskip\bidi@removexparafootskip \bidi@make@para@LTRfootgroup{v@l}% \m@make@para@footstart{v@l}% \let\@LTRfootgroupv@l\@para@LTRfootgroupv@l @@ -1784,9 +1787,7 @@ \let\@mpLTRfootnotetext\@mpparaLTRfootnotetext \let\@mpRTLfootnotetext\m@mold@mpRTLfootnotetext \@bidi@after@Hy@hyperfootnotes - \m@make@mppara@footgroup{v@r}% \bidi@make@mppara@LTRfootgroup{v@l}% - \let\mp@footgroupv@r\@mppara@footgroupv@r \let\mp@LTRfootgroupv@l\@mppara@LTRfootgroupv@l \g@addto@macro\bidi@floathook{% \begingroup @@ -1808,6 +1809,7 @@ \bidi@xparaskip \xdef\bidi@paraskip{\the\@tempdima\relax}% \endgroup + \bidi@startparafootskip\footinsv@l } \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } @@ -1920,8 +1922,6 @@ \m@mungebox}\m@mmf@prepare} \bidi@ensure@newcommand{\m@make@para@footgroup}[1]{% \@namedef{@para@footgroup#1}{% - \advance\@tempskipa -\bidi@paraskip - \edef\bidi@footskip{\vskip\the\@tempskipa\relax}% \unvbox\@nameuse{footins#1} \@RTLtrue \m@mmakehboxofhboxes @@ -1933,8 +1933,6 @@ \noindent\unhbox0\par}} \bidi@ensure@newcommand{\bidi@make@para@LTRfootgroup}[1]{% \@namedef{@para@LTRfootgroup#1}{% - \advance\@tempskipa -\bidi@paraskip - \edef\bidi@footskip{\vskip\the\@tempskipa\relax}% \unvbox\@nameuse{footins#1} \@RTLfalse \m@mmakehboxofhboxes @@ -1944,6 +1942,11 @@ \def\baselinestretch{\m@m@footnote@spacing}% \@nameuse{foottextfont#1}% \noindent\unhbox0\par}} +\newcommand{\bidi@removexparafootskip}{% + \advance\@tempskipa -\bidi@paraskip + \edef\bidi@footskip{\vskip\the\@tempskipa\relax}% +} +\let\bidi@removexfootskip\relax \bidi@ensure@newcommand{\m@make@mppara@footgroup}[1]{% \@namedef{@mppara@footgroup#1}{% \unvbox\@nameuse{@mpfootins#1} @@ -1964,7 +1967,6 @@ \noindent\unhbox0\par}} \bidi@ensure@newcommand{\m@make@para@footstart}[1]{% \@namedef{@para@footstart#1}{% - \global\advance\skip\@nameuse{footins#1}\bidi@paraskip \leftskip=\z@ \rightskip=\z@ \parindent=\z@ |