From 654c39a7d2de17149feb180703f371f2f54e41a5 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 21 Jan 2011 19:24:00 -0800
Subject: latex template: move special treatment of \sout.

It needs to be inside the if(strikeout) condition, after
the ulem package is imported; otherwise we try to renewcommand{\sout} when
\sout isn't yet defined.
---
 tests/biblatex-citations.latex | 2 --
 tests/latex-reader.latex       | 2 +-
 tests/lhs-test.latex           | 2 --
 tests/lhs-test.latex+lhs       | 2 --
 tests/natbib-citations.latex   | 2 --
 tests/writer.latex             | 4 ++--
 6 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/biblatex-citations.latex b/tests/biblatex-citations.latex
index 08f49b056..97647cd41 100644
--- a/tests/biblatex-citations.latex
+++ b/tests/biblatex-citations.latex
@@ -5,8 +5,6 @@
 \usepackage{biblatex}
 \bibliography{biblio}
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
-% avoid problems with \sout in headers with hyperref:
-\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
diff --git a/tests/latex-reader.latex b/tests/latex-reader.latex
index 26715da7a..135ee57bb 100644
--- a/tests/latex-reader.latex
+++ b/tests/latex-reader.latex
@@ -6,9 +6,9 @@
 
 \newcommand{\textsubscript}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
 \usepackage[breaklinks=true,unicode=true]{hyperref}
+\usepackage[normalem]{ulem}
 % avoid problems with \sout in headers with hyperref:
 \pdfstringdefDisableCommands{\renewcommand{\sout}{}}
-\usepackage[normalem]{ulem}
 \usepackage{enumerate}
 \usepackage{fancyvrb}
 \usepackage{graphicx}
diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
index 3c5aba598..d34c21090 100644
--- a/tests/lhs-test.latex
+++ b/tests/lhs-test.latex
@@ -3,8 +3,6 @@
 \usepackage[mathletters]{ucs}
 \usepackage[utf8x]{inputenc}
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
-% avoid problems with \sout in headers with hyperref:
-\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs
index 238a045ba..29237f820 100644
--- a/tests/lhs-test.latex+lhs
+++ b/tests/lhs-test.latex+lhs
@@ -5,8 +5,6 @@
 \usepackage{listings}
 \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
-% avoid problems with \sout in headers with hyperref:
-\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
diff --git a/tests/natbib-citations.latex b/tests/natbib-citations.latex
index fdb4e14fc..f4f5cf452 100644
--- a/tests/natbib-citations.latex
+++ b/tests/natbib-citations.latex
@@ -5,8 +5,6 @@
 \usepackage{natbib}
 \bibliographystyle{plainnat}
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
-% avoid problems with \sout in headers with hyperref:
-\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
diff --git a/tests/writer.latex b/tests/writer.latex
index 0337cb56c..e6adff585 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -11,6 +11,8 @@
 }\makeatother
 \usepackage{enumerate}
 \usepackage[normalem]{ulem}
+% avoid problems with \sout in headers with hyperref:
+\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
 \newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
 \usepackage{url}
 \usepackage{graphicx}
@@ -24,8 +26,6 @@
 \let\Oldincludegraphics\includegraphics
 \renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}}
 \usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref}
-% avoid problems with \sout in headers with hyperref:
-\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
-- 
cgit v1.2.3