git.iko.soy/typeable/pandoc
on master help sign in
Provide `bidi` package's option using `\PassOptionsToPackage` (#4357).

* Provide `bidi` package's option using `\PassOptionsToPackage`. This avoid clash when `polyglossia` loads it first and then it is loaded again for XeLaTeX when `latex-dir-rtl` defined. * Adjust test suite for LaTeX template change.

commit2ddf2257dcba7554606ea96b259e81842c5bcbb3 authorVáclav Haisman <vhaisman@gmail.com> dateSun 18 Mar 2018, 04:20 (9 years ago) parent90a705c
2 files changed+5−8
compare with master
unifiedsplit
data/templates/default.latex+3−6 test/writers-lang-and-dir.latex+2−2
data/templates/default.latex+3−6
@@ -2,8 +2,9 @@
22\PassOptionsToPackage{hyphens}{url}
33$if(colorlinks)$
44\PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor}
5−$endif$
6−%
5+$endif$$if(dir)$$if(latex-dir-rtl)$
6+\PassOptionsToPackage{RTLdocument}{bidi}
7+$endif$$endif$%
78\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$if(beamer)$ignorenonframetext,$if(handout)$handout,$endif$$if(aspectratio)$aspectratio=$aspectratio$,$endif$$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
89$if(beamer)$
910\setbeamertemplate{caption}[numbered]
@@ -287,11 +288,7 @@ $endif$
287288$if(dir)$
288289\ifxetex
289290 % load bidi as late as possible as it modifies e.g. graphicx
290− $if(latex-dir-rtl)$
291− \usepackage[RTLdocument]{bidi}
292− $else$
293291 \usepackage{bidi}
294− $endif$
295292\fi
296293\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
297294 \TeXXeTstate=1
test/writers-lang-and-dir.latex+2−2
@@ -74,8 +74,8 @@
7474\fi
7575\ifxetex
7676 % load bidi as late as possible as it modifies e.g. graphicx
77− \usepackage{bidi}
78− \fi
77+ \usepackage{bidi}
78+\fi
7979\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
8080 \TeXXeTstate=1
8181 \newcommand{\RL}[1]{\beginR #1\endR}