From 0fd138167ca9c80526c05d839ec8abf4805451ce Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 12 Nov 2015 16:09:41 -0800
Subject: [PATCH] Updated tests for template changes.

---
 tests/lhs-test.latex               |  9 +++------
 tests/lhs-test.latex+lhs           |  9 +++------
 tests/writer.context               | 14 ++++++++------
 tests/writer.latex                 | 11 +++++------
 tests/writers-lang-and-dir.context | 10 ++++++----
 tests/writers-lang-and-dir.latex   |  9 +++------
 6 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
index 0dfe323a9..f7b6eb2d7 100644
--- a/tests/lhs-test.latex
+++ b/tests/lhs-test.latex
@@ -24,12 +24,9 @@
 }{}
 \usepackage{hyperref}
 \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
-\hypersetup{breaklinks=true,
-            unicode=true,            colorlinks=true,
-            citecolor=black,
-            urlcolor=black,
-            linkcolor=black,
-            pdfborder={0 0 0}}
+\hypersetup{unicode=true,
+            pdfborder={0 0 0},
+            breaklinks=true}
 \urlstyle{same}  % don't use monospace font for urls
 \usepackage{color}
 \usepackage{fancyvrb}
diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs
index b025da64b..c9501a2cb 100644
--- a/tests/lhs-test.latex+lhs
+++ b/tests/lhs-test.latex+lhs
@@ -24,12 +24,9 @@
 }{}
 \usepackage{hyperref}
 \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
-\hypersetup{breaklinks=true,
-            unicode=true,            colorlinks=true,
-            citecolor=black,
-            urlcolor=black,
-            linkcolor=black,
-            pdfborder={0 0 0}}
+\hypersetup{unicode=true,
+            pdfborder={0 0 0},
+            breaklinks=true}
 \urlstyle{same}  % don't use monospace font for urls
 \usepackage{listings}
 \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
diff --git a/tests/writer.context b/tests/writer.context
index a2427b363..1f8c3aff7 100644
--- a/tests/writer.context
+++ b/tests/writer.context
@@ -1,17 +1,19 @@
 % Enable hyperlinks
 \setupinteraction
   [state=start,
-  style=normal,
-  color=black,
-  contrastcolor=black,
-  title=Pandoc Test Suite,
-  author=John MacFarlane; Anonymous]
+  title={Pandoc Test Suite},
+  author={John MacFarlane; Anonymous},
+  style=,
+  color=,
+  contrastcolor=]
 % make chapter, section bookmarks visible when opening document
 \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section]
 \setupinteractionscreen[option=bookmark]
 \setuptagging[state=start]
 
-\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes] % use microtypography
+% use microtypography
+\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes,pnum=yes]
+\definefontfeature[smallcaps][smallcaps][protrusion=quality,expansion=quality,onum=yes,pnum=yes]
 \setupalign[hz,hanging]
 \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted
 \setupbodyfont[mainfont]
diff --git a/tests/writer.latex b/tests/writer.latex
index 32f200a27..ceee122a4 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -24,12 +24,11 @@
 }{}
 \usepackage{hyperref}
 \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
-\hypersetup{breaklinks=true,
-            unicode=true,            pdftitle={Pandoc Test Suite},            pdfauthor={John MacFarlane; Anonymous},            colorlinks=true,
-            citecolor=black,
-            urlcolor=black,
-            linkcolor=black,
-            pdfborder={0 0 0}}
+\hypersetup{unicode=true,
+            pdftitle={Pandoc Test Suite},
+            pdfauthor={John MacFarlane; Anonymous},
+            pdfborder={0 0 0},
+            breaklinks=true}
 \urlstyle{same}  % don't use monospace font for urls
 \usepackage{fancyvrb}
 \VerbatimFootnotes % allows verbatim text in footnotes
diff --git a/tests/writers-lang-and-dir.context b/tests/writers-lang-and-dir.context
index 477b808a6..a324c13f5 100644
--- a/tests/writers-lang-and-dir.context
+++ b/tests/writers-lang-and-dir.context
@@ -1,15 +1,17 @@
 % Enable hyperlinks
 \setupinteraction
   [state=start,
-  style=normal,
-  color=black,
-  contrastcolor=black]
+  style=,
+  color=,
+  contrastcolor=]
 % make chapter, section bookmarks visible when opening document
 \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section]
 \setupinteractionscreen[option=bookmark]
 \setuptagging[state=start]
 
-\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes] % use microtypography
+% use microtypography
+\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes,pnum=yes]
+\definefontfeature[smallcaps][smallcaps][protrusion=quality,expansion=quality,onum=yes,pnum=yes]
 \setupalign[hz,hanging]
 \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted
 \setupbodyfont[mainfont]
diff --git a/tests/writers-lang-and-dir.latex b/tests/writers-lang-and-dir.latex
index 93b9ceeb5..3f4ecd5e3 100644
--- a/tests/writers-lang-and-dir.latex
+++ b/tests/writers-lang-and-dir.latex
@@ -24,12 +24,9 @@
 }{}
 \usepackage{hyperref}
 \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
-\hypersetup{breaklinks=true,
-            unicode=true,            colorlinks=true,
-            citecolor=black,
-            urlcolor=black,
-            linkcolor=black,
-            pdfborder={0 0 0}}
+\hypersetup{unicode=true,
+            pdfborder={0 0 0},
+            breaklinks=true}
 \urlstyle{same}  % don't use monospace font for urls
 \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
   \usepackage[shorthands=off,ngerman,british,ngerman,spanish,french,main=english]{babel}