From ee87338b0bd13cc17c9c42041413be56d43cb7a8 Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Wed, 1 Aug 2018 11:57:53 +0200
Subject: [PATCH] LaTeX: streamline ``\DeclareUnicodeCharacter`` usage

---
 sphinx/writers/latex.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index bf2215a51..3973fcdae 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -137,21 +137,22 @@ ADDITIONAL_SETTINGS = {
     'pdflatex': {
         'inputenc':     '\\usepackage[utf8]{inputenc}',
         'utf8extra':   ('\\ifdefined\\DeclareUnicodeCharacter\n'
-                        ' \\ifdefined\\DeclareUnicodeCharacterAsOptional\n'
-                        '  \\DeclareUnicodeCharacter{"00A0}{\\nobreakspace}\n'
-                        '  \\DeclareUnicodeCharacter{"2500}{\\sphinxunichar{2500}}\n'
-                        '  \\DeclareUnicodeCharacter{"2502}{\\sphinxunichar{2502}}\n'
-                        '  \\DeclareUnicodeCharacter{"2514}{\\sphinxunichar{2514}}\n'
-                        '  \\DeclareUnicodeCharacter{"251C}{\\sphinxunichar{251C}}\n'
-                        '  \\DeclareUnicodeCharacter{"2572}{\\textbackslash}\n'
-                        ' \\else\n'
-                        '  \\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n'
-                        '  \\DeclareUnicodeCharacter{2500}{\\sphinxunichar{2500}}\n'
-                        '  \\DeclareUnicodeCharacter{2502}{\\sphinxunichar{2502}}\n'
-                        '  \\DeclareUnicodeCharacter{2514}{\\sphinxunichar{2514}}\n'
-                        '  \\DeclareUnicodeCharacter{251C}{\\sphinxunichar{251C}}\n'
-                        '  \\DeclareUnicodeCharacter{2572}{\\textbackslash}\n'
-                        ' \\fi\n'
+                        '% support both utf8 and utf8x syntaxes\n'
+                        '\\edef\\sphinxdqmaybe{'
+                        '\\ifdefined\\DeclareUnicodeCharacterAsOptional'
+                        '\\string"\\fi}\n'
+                        '  \\DeclareUnicodeCharacter{\\sphinxdqmaybe00A0}'
+                        '{\\nobreakspace}\n'
+                        '  \\DeclareUnicodeCharacter{\\sphinxdqmaybe2500}'
+                        '{\\sphinxunichar{2500}}\n'
+                        '  \\DeclareUnicodeCharacter{\\sphinxdqmaybe2502}'
+                        '{\\sphinxunichar{2502}}\n'
+                        '  \\DeclareUnicodeCharacter{\\sphinxdqmaybe2514}'
+                        '{\\sphinxunichar{2514}}\n'
+                        '  \\DeclareUnicodeCharacter{\\sphinxdqmaybe251C}'
+                        '{\\sphinxunichar{251C}}\n'
+                        '  \\DeclareUnicodeCharacter{\\sphinxdqmaybe2572}'
+                        '{\\textbackslash}\n'
                         '\\fi'),
     },
     'xelatex': {