aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------data/templates14
-rw-r--r--tests/lhs-test.latex10
-rw-r--r--tests/lhs-test.latex+lhs10
-rw-r--r--tests/writer.latex10
4 files changed, 34 insertions, 10 deletions
diff --git a/data/templates b/data/templates
-Subproject 229ec44bb6ae116d5cf613bba0486f3757f9cd0
+Subproject cddd99ccb2aad9056b16f712b4d37a2bbecdcf4
diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
index 626a74cfa..2d0373e76 100644
--- a/tests/lhs-test.latex
+++ b/tests/lhs-test.latex
@@ -23,6 +23,8 @@
\usepackage{microtype}
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{}
+\makeatletter
+\@ifpackageloaded{hyperref}{}{%
\ifxetex
\usepackage[setpagesize=false, % page size defined by xetex
unicode=false, % unicode breaks when used with xetex
@@ -30,7 +32,13 @@
\else
\usepackage[unicode=true]{hyperref}
\fi
-\usepackage[usenames,dvipsnames]{color}
+}
+\@ifpackageloaded{color}{
+ \PassOptionsToPackage{usenames,dvipsnames}{color}
+}{%
+ \usepackage[usenames,dvipsnames]{color}
+}
+\makeatother
\hypersetup{breaklinks=true,
bookmarks=true,
pdfauthor={},
diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs
index 029789ba8..101025c02 100644
--- a/tests/lhs-test.latex+lhs
+++ b/tests/lhs-test.latex+lhs
@@ -23,6 +23,8 @@
\usepackage{microtype}
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{}
+\makeatletter
+\@ifpackageloaded{hyperref}{}{%
\ifxetex
\usepackage[setpagesize=false, % page size defined by xetex
unicode=false, % unicode breaks when used with xetex
@@ -30,7 +32,13 @@
\else
\usepackage[unicode=true]{hyperref}
\fi
-\usepackage[usenames,dvipsnames]{color}
+}
+\@ifpackageloaded{color}{
+ \PassOptionsToPackage{usenames,dvipsnames}{color}
+}{%
+ \usepackage[usenames,dvipsnames]{color}
+}
+\makeatother
\hypersetup{breaklinks=true,
bookmarks=true,
pdfauthor={},
diff --git a/tests/writer.latex b/tests/writer.latex
index 8b34777fa..0e5ac8131 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -23,6 +23,8 @@
\usepackage{microtype}
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{}
+\makeatletter
+\@ifpackageloaded{hyperref}{}{%
\ifxetex
\usepackage[setpagesize=false, % page size defined by xetex
unicode=false, % unicode breaks when used with xetex
@@ -30,7 +32,13 @@
\else
\usepackage[unicode=true]{hyperref}
\fi
-\usepackage[usenames,dvipsnames]{color}
+}
+\@ifpackageloaded{color}{
+ \PassOptionsToPackage{usenames,dvipsnames}{color}
+}{%
+ \usepackage[usenames,dvipsnames]{color}
+}
+\makeatother
\hypersetup{breaklinks=true,
bookmarks=true,
pdfauthor={John MacFarlane; Anonymous},