summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2007-11-12 13:34:59 +0000
committergrubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2007-11-12 13:34:59 +0000
commitd6ec181a9be99787ba6fcc8b7ccedea7704ad3f5 (patch)
tree3b2dfae20c9e5c53f6e6c4708e749b2f9e80847b
parentcabb0a7800ef0273a8b372f91766e51f6d5eec71 (diff)
downloaddocutils-d6ec181a9be99787ba6fcc8b7ccedea7704ad3f5.tar.gz
latex2e writer : Move usepackage hyperref after stylesheet inclusion.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils/docutils@5462 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--writers/latex2e/__init__.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/writers/latex2e/__init__.py b/writers/latex2e/__init__.py
index dc865c653..2c6ff6e63 100644
--- a/writers/latex2e/__init__.py
+++ b/writers/latex2e/__init__.py
@@ -569,7 +569,9 @@ class LaTeXTranslator(nodes.NodeVisitor):
# ---------
latex_head = '\\documentclass[%s]{%s}\n'
- linking = '\\usepackage[colorlinks=%s,linkcolor=%s,urlcolor=%s]{hyperref}\n'
+ linking = "\\ifthenelse{\\isundefined{\\hypersetup}}{\n" \
+ +"\\usepackage[colorlinks=%s,linkcolor=%s,urlcolor=%s]{hyperref}\n" \
+ +"}{}\n"
stylesheet = '\\input{%s}\n'
# add a generated on day , machine by user using docutils version.
generator = '% generated by Docutils <http://docutils.sourceforge.net/>\n'
@@ -693,7 +695,6 @@ class LaTeXTranslator(nodes.NodeVisitor):
'\\usepackage{color}\n',
'\\usepackage{multirow}\n',
'\\usepackage{ifthen}\n', # before hyperref!
- self.linking % (self.colorlinks, self.hyperlink_color, self.hyperlink_color),
self.typearea,
self.generator,
# latex lengths
@@ -717,6 +718,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
if stylesheet:
settings.record_dependencies.add(stylesheet)
self.head_prefix.append(self.stylesheet % (stylesheet))
+ # hyperref after stylesheet
+ # TODO conditionally if no hyperref is used dont include
+ self.head_prefix.append( self.linking % (
+ self.colorlinks, self.hyperlink_color, self.hyperlink_color))
if self.linking: # and maybe check for pdf
self.pdfinfo = [ ]