Updated tests for new latex templates.

3 files changed, 42 insertions, 9 deletions

diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
index f8851900a..647f16396 100644
--- a/tests/lhs-test.latex
+++ b/tests/lhs-test.latex
@@ -1,11 +1,22 @@
 \documentclass{article}
 \usepackage{amssymb,amsmath}
-\usepackage[mathletters]{ucs}
-\usepackage[utf8x]{inputenc}
+\usepackage{iftex}
+\ifXeTeX
+  \usepackage{fontspec,xltxtra,xunicode}
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+\else
+  \ifLuaTeX
+    \usepackage{fontspec}
+    \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \else
+    \usepackage[mathletters]{ucs}
+    \usepackage[utf8x]{inputenc}
+  \fi
+\fi
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
-\setlength{\emergencystretch}{3em}  -- prevent overfull lines
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
 \setcounter{secnumdepth}{0}
 
 
diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs
index 6222866ea..0cd3185db 100644
--- a/tests/lhs-test.latex+lhs
+++ b/tests/lhs-test.latex+lhs
@@ -1,13 +1,24 @@
 \documentclass{article}
 \usepackage{amssymb,amsmath}
-\usepackage[mathletters]{ucs}
-\usepackage[utf8x]{inputenc}
+\usepackage{iftex}
+\ifXeTeX
+  \usepackage{fontspec,xltxtra,xunicode}
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+\else
+  \ifLuaTeX
+    \usepackage{fontspec}
+    \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \else
+    \usepackage[mathletters]{ucs}
+    \usepackage[utf8x]{inputenc}
+  \fi
+\fi
 \usepackage{listings}
 \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
-\setlength{\emergencystretch}{3em}  -- prevent overfull lines
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
 \setcounter{secnumdepth}{0}
 
 
diff --git a/tests/writer.latex b/tests/writer.latex
index b13f93ac4..19a8753f5 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -1,7 +1,18 @@
 \documentclass{article}
 \usepackage{amssymb,amsmath}
-\usepackage[mathletters]{ucs}
-\usepackage[utf8x]{inputenc}
+\usepackage{iftex}
+\ifXeTeX
+  \usepackage{fontspec,xltxtra,xunicode}
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+\else
+  \ifLuaTeX
+    \usepackage{fontspec}
+    \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \else
+    \usepackage[mathletters]{ucs}
+    \usepackage[utf8x]{inputenc}
+  \fi
+\fi
 \usepackage{fancyvrb}
 % Redefine labelwidth for lists; otherwise, the enumerate package will cause
 % markers to extend beyond the left margin.
@@ -28,7 +39,7 @@
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
-\setlength{\emergencystretch}{3em}  -- prevent overfull lines
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
 \setcounter{secnumdepth}{0}
 \VerbatimFootnotes % allows verbatim text in footnotes