summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-12 01:51:24 +0000
committerKarl Berry <karl@freefriends.org>2013-11-12 01:51:24 +0000
commit6cafe69d37728ca48ca50b388e807918724ac5a5 (patch)
tree136c7bead8de7f5fb1e4b8ac2e10a1e15138c898 /Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
parentc0453cb4da51bfe72fbe9b9cb13df1c8985dd38b (diff)
bidi (12nov13)
git-svn-id: svn://tug.org/texlive/trunk@32128 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def')
-rw-r--r--Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def54
1 files changed, 30 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
index 71f45d0acb5..1379de18b23 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def
@@ -17,7 +17,7 @@
%% by Vafa Khalighi.
%%
%%
-%% \CheckSum{41975}
+%% \CheckSum{41974}
%% \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
@@ -34,13 +34,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-\ProvidesFile{multicol-xetex-bidi.def}[2011/11/18 v0.2 bidi adaptations for multicol package for XeTeX engine]
-\def\revprocess@cols#1#2{\count@\doublecol@number\relax
-\advance\count@ by -2
- \loop #2%
- \ifnum\count@>#1\relax
- \advance\count@-\tw@
- \repeat}
+\ProvidesFile{multicol-xetex-bidi.def}[2013/11/11 v0.3 bidi adaptations for multicol package for XeTeX engine]
\def\page@sofar{%
\process@cols\mult@rightbox
{\ifvoid\count@
@@ -62,29 +56,41 @@
\nointerlineskip
\setbox\z@\hbox{p}\global\dimen\tw@\dp\z@
\moveright\multicol@leftmargin
- \if@RTL\hbox to\full@width{%
- \ifdim\dp\mult@rightbox>\dimen\tw@
- \global\dimen\tw@\dp\mult@rightbox \fi
- \box\mult@rightbox
- \llap{\phantom p}%
- \revprocess@cols\mult@gfirstbox{%
- \ifdim\dp\count@>\dimen\tw@
- \global\dimen\tw@\dp\count@ \fi
- \hss{\columnseprulecolor\vrule
- \@width\columnseprule}\hss\box\count@}%
-}\else%
\hbox to\full@width{%
- \process@cols\mult@gfirstbox{%
+ \if@RTL
+ \process@cols\mult@gfirstbox{%
+ \hskip\hsize
+ \hss{\columnseprulecolor\vrule
+ \@width\columnseprule}\hss
+ }%
+ \hskip\hsize
+ \process@cols\mult@gfirstbox{%
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
+ \hskip-\hsize
\box\count@
- \hss{\columnseprulecolor\vrule
- \@width\columnseprule}\hss}%
+ \hskip-\hsize
+ \hskip-\columnsep
+ }%
\ifdim\dp\mult@rightbox>\dimen\tw@
\global\dimen\tw@\dp\mult@rightbox \fi
+ \hskip-\hsize
\box\mult@rightbox
- \rlap{\phantom p}%
- }\fi%
+ \hskip-\hsize
+ \hskip\full@width
+ \else
+ \process@cols\mult@gfirstbox{%
+ \ifdim\dp\count@>\dimen\tw@
+ \global\dimen\tw@\dp\count@ \fi
+ \box\count@
+ \hss{\columnseprulecolor\vrule
+ \@width\columnseprule}\hss}%
+ \ifdim\dp\mult@rightbox>\dimen\tw@
+ \global\dimen\tw@\dp\mult@rightbox \fi
+ \box\mult@rightbox
+ \fi
+ \rlap{\phantom p}%
+ }%
\kern-\dimen\tw@
\ifdim\dimen\tw@ = \mc@gridwarn
\PackageWarning{multicol}%