aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorVáclav Haisman <vhaisman@gmail.com>2018-03-18 04:20:57 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2018-03-17 20:20:57 -0700
commit2ddf2257dcba7554606ea96b259e81842c5bcbb3 (patch)
treef95cade91ccb0bbb79efde8e9d300d116aa44ff4 /data
parent90a705c8aff676dff174ebc3bfd45d632f65005f (diff)
downloadpandoc-2ddf2257dcba7554606ea96b259e81842c5bcbb3.tar.gz
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.
Diffstat (limited to 'data')
-rw-r--r--data/templates/default.latex9
1 files changed, 3 insertions, 6 deletions
diff --git a/data/templates/default.latex b/data/templates/default.latex
index c36bf8576..e989f27d9 100644
--- a/data/templates/default.latex
+++ b/data/templates/default.latex
@@ -2,8 +2,9 @@
\PassOptionsToPackage{hyphens}{url}
$if(colorlinks)$
\PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor}
-$endif$
-%
+$endif$$if(dir)$$if(latex-dir-rtl)$
+\PassOptionsToPackage{RTLdocument}{bidi}
+$endif$$endif$%
\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$}
$if(beamer)$
\setbeamertemplate{caption}[numbered]
@@ -287,11 +288,7 @@ $endif$
$if(dir)$
\ifxetex
% load bidi as late as possible as it modifies e.g. graphicx
- $if(latex-dir-rtl)$
- \usepackage[RTLdocument]{bidi}
- $else$
\usepackage{bidi}
- $endif$
\fi
\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
\TeXXeTstate=1