Updated tests for changes in latex template.

3 files changed, 49 insertions, 45 deletions

diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
index 30475bdba..41a1da57c 100644
--- a/tests/lhs-test.latex
+++ b/tests/lhs-test.latex
@@ -1,19 +1,21 @@
 \documentclass[]{article}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
 \usepackage{amssymb,amsmath}
-\usepackage{ifxetex,ifluatex}
+\usepackage{iftex}
 \usepackage{fixltx2e} % provides \textsubscript
-\ifxetex
-  \usepackage{fontspec,xltxtra,xunicode}
-  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-  \newcommand{\euro}{€}
+\ifPDFTeX % use microtype with pdflatex if available
+  \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
+\fi
+\ifPDFTeX
+  \usepackage[utf8]{inputenc}
 \else
-  \ifluatex
-    \usepackage{fontspec}
-    \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-    \newcommand{\euro}{€}
-  \else
-    \usepackage[utf8]{inputenc}
+  \usepackage{fontspec}
+  \ifXeTeX
+    \usepackage{xltxtra,xunicode}
   \fi
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \newcommand{\euro}{€}
 \fi
 \usepackage{color}
 \usepackage{fancyvrb}
@@ -35,7 +37,7 @@
 \newcommand{\RegionMarkerTok}[1]{{#1}}
 \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}}
 \newcommand{\NormalTok}[1]{{#1}}
-\ifxetex
+\ifXeTeX
   \usepackage[setpagesize=false, % page size defined by xetex
               unicode=false, % unicode breaks when used with xetex
               xetex]{hyperref}
@@ -48,15 +50,15 @@
             pdftitle={},
             colorlinks=true,
             urlcolor=blue,
-            linkcolor=black,
+            linkcolor=blue,
             pdfborder={0 0 0}}
-% Uncomment next line if you want links as footnotes instead of hotlinks:
-% \renewcommand{\href}[2]{#2\footnote{\url{#1}}}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setlength{\emergencystretch}{3em}  % prevent overfull lines
 \setcounter{secnumdepth}{0}
 
+\author{}
+\date{}
 
 \begin{document}
 
diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs
index e372ed359..a5250e6ee 100644
--- a/tests/lhs-test.latex+lhs
+++ b/tests/lhs-test.latex+lhs
@@ -1,23 +1,25 @@
 \documentclass[]{article}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
 \usepackage{amssymb,amsmath}
-\usepackage{ifxetex,ifluatex}
+\usepackage{iftex}
 \usepackage{fixltx2e} % provides \textsubscript
-\ifxetex
-  \usepackage{fontspec,xltxtra,xunicode}
-  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-  \newcommand{\euro}{€}
+\ifPDFTeX % use microtype with pdflatex if available
+  \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
+\fi
+\ifPDFTeX
+  \usepackage[utf8]{inputenc}
 \else
-  \ifluatex
-    \usepackage{fontspec}
-    \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-    \newcommand{\euro}{€}
-  \else
-    \usepackage[utf8]{inputenc}
+  \usepackage{fontspec}
+  \ifXeTeX
+    \usepackage{xltxtra,xunicode}
   \fi
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \newcommand{\euro}{€}
 \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}
@@ -30,15 +32,15 @@
             pdftitle={},
             colorlinks=true,
             urlcolor=blue,
-            linkcolor=black,
+            linkcolor=blue,
             pdfborder={0 0 0}}
-% Uncomment next line if you want links as footnotes instead of hotlinks:
-% \renewcommand{\href}[2]{#2\footnote{\url{#1}}}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setlength{\emergencystretch}{3em}  % prevent overfull lines
 \setcounter{secnumdepth}{0}
 
+\author{}
+\date{}
 
 \begin{document}
 
diff --git a/tests/writer.latex b/tests/writer.latex
index 402126a78..92af3c218 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -1,19 +1,21 @@
 \documentclass[]{article}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
 \usepackage{amssymb,amsmath}
-\usepackage{ifxetex,ifluatex}
+\usepackage{iftex}
 \usepackage{fixltx2e} % provides \textsubscript
-\ifxetex
-  \usepackage{fontspec,xltxtra,xunicode}
-  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-  \newcommand{\euro}{€}
+\ifPDFTeX % use microtype with pdflatex if available
+  \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
+\fi
+\ifPDFTeX
+  \usepackage[utf8]{inputenc}
 \else
-  \ifluatex
-    \usepackage{fontspec}
-    \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-    \newcommand{\euro}{€}
-  \else
-    \usepackage[utf8]{inputenc}
+  \usepackage{fontspec}
+  \ifXeTeX
+    \usepackage{xltxtra,xunicode}
   \fi
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \newcommand{\euro}{€}
 \fi
 \usepackage{fancyvrb}
 % Redefine labelwidth for lists; otherwise, the enumerate package will cause
@@ -33,7 +35,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}
@@ -46,10 +48,8 @@
             pdftitle={Pandoc Test Suite},
             colorlinks=true,
             urlcolor=blue,
-            linkcolor=black,
+            linkcolor=blue,
             pdfborder={0 0 0}}
-% Uncomment next line if you want links as footnotes instead of hotlinks:
-% \renewcommand{\href}[2]{#2\footnote{\url{#1}}}
 \usepackage[normalem]{ulem}
 % avoid problems with \sout in headers with hyperref:
 \pdfstringdefDisableCommands{\renewcommand{\sout}{}}