diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-07-30 17:02:49 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-07-30 17:02:49 -0700 |
| commit | cbd0314b1bfd3fa3690abf1d3fbb6245cc348e6b (patch) | |
| tree | f17e1ec235151cdcc43783ac40f788c033b4927b | |
| parent | 7937236e580f5d67f0a500a48c8c07a939572faa (diff) | |
| download | pandoc-cbd0314b1bfd3fa3690abf1d3fbb6245cc348e6b.tar.gz | |
Changes to tests for new latex templates.
| -rw-r--r-- | tests/lhs-test.latex | 11 | ||||
| -rw-r--r-- | tests/lhs-test.latex+lhs | 11 | ||||
| -rw-r--r-- | tests/writer.latex | 11 |
3 files changed, 15 insertions, 18 deletions
diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex index a3acd98da..307fd948f 100644 --- a/tests/lhs-test.latex +++ b/tests/lhs-test.latex @@ -1,19 +1,18 @@ \documentclass{article} \usepackage{amssymb,amsmath} -\usepackage{iftex} -\ifXeTeX +\usepackage{ifxetex,ifluatex} +\ifxetex \usepackage{fontspec,xltxtra,xunicode} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} \else - \ifLuaTeX + \ifluatex \usepackage{fontspec} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} \else - \usepackage[mathletters]{ucs} - \usepackage[utf8x]{inputenc} + \usepackage[utf8]{inputenc} \fi \fi -\ifXeTeX +\ifxetex \usepackage[setpagesize=false, % page size defined by xetex unicode=false, % unicode breaks when used with xetex xetex]{hyperref} diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs index 94f8db9f7..4d36dc532 100644 --- a/tests/lhs-test.latex+lhs +++ b/tests/lhs-test.latex+lhs @@ -1,21 +1,20 @@ \documentclass{article} \usepackage{amssymb,amsmath} -\usepackage{iftex} -\ifXeTeX +\usepackage{ifxetex,ifluatex} +\ifxetex \usepackage{fontspec,xltxtra,xunicode} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} \else - \ifLuaTeX + \ifluatex \usepackage{fontspec} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} \else - \usepackage[mathletters]{ucs} - \usepackage[utf8x]{inputenc} + \usepackage[utf8]{inputenc} \fi \fi \usepackage{listings} \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} -\ifXeTeX +\ifxetex \usepackage[setpagesize=false, % page size defined by xetex unicode=false, % unicode breaks when used with xetex xetex]{hyperref} diff --git a/tests/writer.latex b/tests/writer.latex index 9ef8d8f33..5c2594ec7 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -1,16 +1,15 @@ \documentclass{article} \usepackage{amssymb,amsmath} -\usepackage{iftex} -\ifXeTeX +\usepackage{ifxetex,ifluatex} +\ifxetex \usepackage{fontspec,xltxtra,xunicode} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} \else - \ifLuaTeX + \ifluatex \usepackage{fontspec} \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} \else - \usepackage[mathletters]{ucs} - \usepackage[utf8x]{inputenc} + \usepackage[utf8]{inputenc} \fi \fi \usepackage{fancyvrb} @@ -32,7 +31,7 @@ \makeatother \let\Oldincludegraphics\includegraphics \renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}} -\ifXeTeX +\ifxetex \usepackage[setpagesize=false, % page size defined by xetex unicode=false, % unicode breaks when used with xetex xetex]{hyperref} |