summaryrefslogtreecommitdiff
path: root/tests/test_markup.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2019-12-16 00:05:35 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2019-12-16 00:05:35 +0900
commit712c20a3d91cd80247c5625782ba8ada2b2c2378 (patch)
treed151c391d9bc18aa2ceffa455efa658bafc1ec29 /tests/test_markup.py
parent5a03cac7d369ea71e1414792df62668ca5fd8190 (diff)
parentcb5fab5db90c2177ede34af876b19e58b9dc1263 (diff)
downloadsphinx-git-712c20a3d91cd80247c5625782ba8ada2b2c2378.tar.gz
Merge branch '2.0'
Diffstat (limited to 'tests/test_markup.py')
-rw-r--r--tests/test_markup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 94d1af951..8e00764fc 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -213,7 +213,7 @@ def get_verifier(verify, verify_re):
':menuselection:`&Foo -&&- &Bar`',
('<p><span class="menuselection"><span class="accelerator">F</span>oo '
'-&amp;- <span class="accelerator">B</span>ar</span></p>'),
- r'\sphinxmenuselection{\sphinxaccelerator{F}oo -\&- \sphinxaccelerator{B}ar}',
+ r'\sphinxmenuselection{\sphinxaccelerator{F}oo \sphinxhyphen{}\&\sphinxhyphen{} \sphinxaccelerator{B}ar}',
),
(
# interpolation of ampersands in guilabel
@@ -221,7 +221,7 @@ def get_verifier(verify, verify_re):
':guilabel:`&Foo -&&- &Bar`',
('<p><span class="guilabel"><span class="accelerator">F</span>oo '
'-&amp;- <span class="accelerator">B</span>ar</span></p>'),
- r'\sphinxguilabel{\sphinxaccelerator{F}oo -\&- \sphinxaccelerator{B}ar}',
+ r'\sphinxguilabel{\sphinxaccelerator{F}oo \sphinxhyphen{}\&\sphinxhyphen{} \sphinxaccelerator{B}ar}',
),
(
# no ampersands in guilabel
@@ -236,7 +236,7 @@ def get_verifier(verify, verify_re):
':option:`--with-option`',
('<p><code( class="xref std std-option docutils literal notranslate")?>'
'<span class="pre">--with-option</span></code></p>$'),
- r'\\sphinxcode{\\sphinxupquote{-{-}with-option}}$',
+ r'\\sphinxcode{\\sphinxupquote{\\sphinxhyphen{}\\sphinxhyphen{}with\\sphinxhyphen{}option}}$',
),
(
# verify smarty-pants quotes