Merge branch '1.8'

5 files changed, 17 insertions, 6 deletions

diff --git a/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex b/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex
index e1628a9bd..097449cd9 100644
--- a/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex
+++ b/tests/roots/test-latex-table/expects/longtable_having_verbatim.tex
@@ -27,7 +27,6 @@ header2
 
 \endlastfoot
 
-\fvset{hllines={, ,}}%
 \begin{sphinxVerbatimintable}[commandchars=\\\{\}]
 \PYG{n}{hello} \PYG{n}{world}
 \end{sphinxVerbatimintable}
diff --git a/tests/roots/test-latex-table/expects/table_having_verbatim.tex b/tests/roots/test-latex-table/expects/table_having_verbatim.tex
index 40d2f424c..2e2b1dc9a 100644
--- a/tests/roots/test-latex-table/expects/table_having_verbatim.tex
+++ b/tests/roots/test-latex-table/expects/table_having_verbatim.tex
@@ -10,7 +10,6 @@ header1
 header2
 \\
 \hline
-\fvset{hllines={, ,}}%
 \begin{sphinxVerbatimintable}[commandchars=\\\{\}]
 \PYG{n}{hello} \PYG{n}{world}
 \end{sphinxVerbatimintable}
diff --git a/tests/test_directive_code.py b/tests/test_directive_code.py
index 3fa180e78..34e3e525c 100644
--- a/tests/test_directive_code.py
+++ b/tests/test_directive_code.py
@@ -356,6 +356,8 @@ def test_code_block_emphasize_latex(app, status, warning):
     latex = (app.outdir / 'Python.tex').text(encoding='utf-8').replace('\r\n', '\n')
     includes = '\\fvset{hllines={, 5, 6, 13, 14, 15, 24, 25, 26, 27,}}%\n'
     assert includes in latex
+    includes = '\\end{sphinxVerbatim}\n\sphinxresetverbatimhllines\n'
+    assert includes in latex
 
 
 @pytest.mark.sphinx('xml', testroot='directive-code')
diff --git a/tests/test_domain_cpp.py b/tests/test_domain_cpp.py
index 0d47f69b2..3e19efbbf 100644
--- a/tests/test_domain_cpp.py
+++ b/tests/test_domain_cpp.py
@@ -124,8 +124,20 @@ def test_expressions():
                 expr = i + l + u
                 exprCheck(expr, 'L' + expr + 'E')
     for suffix in ['', 'f', 'F', 'l', 'L']:
-        expr = '5.0' + suffix
-        exprCheck(expr, 'L' + expr + 'E')
+        for e in [
+                '5e42', '5e+42', '5e-42',
+                '5.', '5.e42', '5.e+42', '5.e-42',
+                '.5', '.5e42', '.5e+42', '.5e-42',
+                '5.0', '5.0e42','5.0e+42', '5.0e-42']:
+            expr = e + suffix
+            exprCheck(expr, 'L' + expr + 'E')
+        for e in [
+                'ApF', 'Ap+F', 'Ap-F',
+                'A.', 'A.pF', 'A.p+F', 'A.p-F',
+                '.A', '.ApF', '.Ap+F', '.Ap-F',
+                'A.B', 'A.BpF','A.Bp+F', 'A.Bp-F']:
+            expr = "0x" + e + suffix
+            exprCheck(expr, 'L' + expr + 'E')
     exprCheck('"abc\\"cba"', 'LA8_KcE')  # string
     exprCheck('this', 'fpT')
     # character literals
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 98823d665..af119e029 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -224,8 +224,7 @@ def get_verifier(verify, verify_re):
         'verify',
         '::\n\n @Γ\\∞${}',
         None,
-        ('\\fvset{hllines={, ,}}%\n'
-         '\\begin{sphinxVerbatim}[commandchars=\\\\\\{\\}]\n'
+        ('\\begin{sphinxVerbatim}[commandchars=\\\\\\{\\}]\n'
          '@Γ\\PYGZbs{}\\(\\infty\\)\\PYGZdl{}\\PYGZob{}\\PYGZcb{}\n'
          '\\end{sphinxVerbatim}'),
     ),