summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-02-13 13:16:01 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-02-13 13:16:01 +0000
commit812f2b3c5910dd43b86ba39e54db0e2a3cbc0b10 (patch)
treec328a6ea32d2fd972ab2af9448afb9e31099d5ec
parent26bc74833f1bd0f551e05e9c848fb7d948403159 (diff)
downloaddocutils-812f2b3c5910dd43b86ba39e54db0e2a3cbc0b10.tar.gz
Fix [ 3603246 ] Bug in option "--graphicx-option=auto".
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7602 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--HISTORY.txt1
-rw-r--r--docutils/writers/latex2e/__init__.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY.txt b/HISTORY.txt
index e2f6219ce..082e2738e 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -42,6 +42,7 @@ Changes Since 0.10
English typographic ones.
Activate the SmartQuotes_ transform if you want this feature.
- Fix literal use of babel shorthands (straight quote, tilde, ...).
+ - Fix [ 3603246 ] Bug in option "--graphicx-option=auto".
.. _SmartQuotes: docs/user/config.html#smart-quotes
diff --git a/docutils/writers/latex2e/__init__.py b/docutils/writers/latex2e/__init__.py
index 4d932c07c..5176db724 100644
--- a/docutils/writers/latex2e/__init__.py
+++ b/docutils/writers/latex2e/__init__.py
@@ -555,7 +555,7 @@ PreambleCmds.graphicx_auto = r"""% Check output format
\usepackage{graphicx}
\else
\usepackage[pdftex]{graphicx}
-\fi'))"""
+\fi"""
PreambleCmds.highlight_rules = r"""% basic code highlight:
\providecommand*\DUrolecomment[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
@@ -782,7 +782,7 @@ class CharMaps(object):
0x00b3: ur'\textthreesuperior{}', # ³ SUPERSCRIPT THREE
0x00b4: ur'\textasciiacute{}', # ´ ACUTE ACCENT
0x00b5: ur'\textmu{}', # µ MICRO SIGN
- 0x00b6: ur'\textparagraph{}', # ¶ PILCROW SIGN # not equal to \textpilcrow
+ 0x00b6: ur'\textparagraph{}', # ¶ PILCROW SIGN # != \textpilcrow
0x00b9: ur'\textonesuperior{}', # ¹ SUPERSCRIPT ONE
0x00ba: ur'\textordmasculine{}', # º MASCULINE ORDINAL INDICATOR
0x00bc: ur'\textonequarter{}', # 1/4 FRACTION
@@ -790,7 +790,7 @@ class CharMaps(object):
0x00be: ur'\textthreequarters{}', # 3/4 FRACTION
0x00d7: ur'\texttimes{}', # × MULTIPLICATION SIGN
0x00f7: ur'\textdiv{}', # ÷ DIVISION SIGN
- #
+ # others
0x0192: ur'\textflorin{}', # LATIN SMALL LETTER F WITH HOOK
0x02b9: ur'\textasciiacute{}', # MODIFIER LETTER PRIME
0x02ba: ur'\textacutedbl{}', # MODIFIER LETTER DOUBLE PRIME