From 0ded648c1a1aa4f7649d89f209f070cef5bbaa7f Mon Sep 17 00:00:00 2001
From: James Knight <james.d.knight@live.com>
Date: Thu, 4 Oct 2018 02:55:35 -0400
Subject: [PATCH 01/16] directive-code: do not force linenos value on run

Now that `highlightlang` directive is deprecated [1], the
`linenothreshold` option is to be used via the `highlight` directive.
The `highlight` directive will walk-through literal blocks to apply a
`linenos` value if:

 1) The literal block has not been explicitly configured with the
     `linenos` option.
 2) If there is enough content (when comparing literal block's line
     count to `linenothreshold`) that `linenos` should be explicitly
     enabled or disabled [2].

While the `hightlight` directive should be able to explicitly define if
a literal block needs to enable line numbers, the logic is always
ignored since the code block and literal include directives already
configures `linenos` when checking for line number-specific options on
the node [3][4]. This effectively prevents `linenothreshold` from being
used.

To allow `linenothreshold` to be used in literal blocks, this commit
disables the explicit configuration `linenos` on a literal block
instance when the `CodeBlock` and `LiteralInclude` directives are
processed.

[1]: b35198d8475fe89aaf9a5224a9832fb394e73cca
[2]: https://github.com/sphinx-doc/sphinx/blob/v1.8.1/sphinx/transforms/post_transforms/code.py#L95-L97
[3]: https://github.com/sphinx-doc/sphinx/blob/v1.8.1/sphinx/directives/code.py#L156-L157
[4]: https://github.com/sphinx-doc/sphinx/blob/v1.8.1/sphinx/directives/code.py#L442-L444

Signed-off-by: James Knight <james.d.knight@live.com>
---
 sphinx/directives/code.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 9ac704c55..73afac4ba 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -154,8 +154,8 @@ class CodeBlock(SphinxDirective):
             code = '\n'.join(lines)
 
         literal = nodes.literal_block(code, code)  # type: nodes.Element
-        literal['linenos'] = 'linenos' in self.options or \
-                             'lineno-start' in self.options
+        if 'linenos' in self.options or 'lineno-start' in self.options:
+            literal['linenos'] = True
         literal['classes'] += self.options.get('class', [])
         if self.arguments:
             # highlight language specified
@@ -451,9 +451,9 @@ class LiteralInclude(SphinxDirective):
                 retnode['language'] = 'udiff'
             elif 'language' in self.options:
                 retnode['language'] = self.options['language']
-            retnode['linenos'] = ('linenos' in self.options or
-                                  'lineno-start' in self.options or
-                                  'lineno-match' in self.options)
+            if ('linenos' in self.options or 'lineno-start' in self.options or
+                    'lineno-match' in self.options):
+                retnode['linenos'] = True
             retnode['classes'] += self.options.get('class', [])
             extra_args = retnode['highlight_args'] = {}
             if 'emphasize-lines' in self.options:

From 3858a62814f1a3d78f7c2cb7b84e34b3dd056b80 Mon Sep 17 00:00:00 2001
From: James Knight <james.d.knight@live.com>
Date: Sat, 16 Feb 2019 21:44:32 -0500
Subject: [PATCH 02/16] test: verify linenothreshold usage

Adding a unit test to verify the use of the `linenothreshold` option
provided by the `highlight` directive [1]. The included document to test
will introduce two sets of `code-block` and `literalinclude` directives
where the first entry generates contents using line numbers and the
second entry generates contents not using line numbers, respectfully.

[1]: https://github.com/sphinx-doc/sphinx/blob/v1.8.4/sphinx/transforms/post_transforms/code.py#L85

Signed-off-by: James Knight <james.d.knight@live.com>
---
 .../test-directive-code/linenothreshold.rst   | 23 +++++++++
 .../test-directive-code/literal-short.inc     |  3 ++
 tests/test_directive_code.py                  | 49 +++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 tests/roots/test-directive-code/linenothreshold.rst
 create mode 100644 tests/roots/test-directive-code/literal-short.inc

diff --git a/tests/roots/test-directive-code/linenothreshold.rst b/tests/roots/test-directive-code/linenothreshold.rst
new file mode 100644
index 000000000..09ee67efc
--- /dev/null
+++ b/tests/roots/test-directive-code/linenothreshold.rst
@@ -0,0 +1,23 @@
+Code Blocks and Literal Includes with Line Numbers via linenothreshold
+======================================================================
+
+.. highlight:: python
+   :linenothreshold: 5
+
+.. code-block::
+
+   class Foo:
+       pass
+
+   class Bar:
+       def baz():
+       pass
+
+.. code-block::
+
+   # comment
+   value = True
+
+.. literalinclude:: literal.inc
+
+.. literalinclude:: literal-short.inc
diff --git a/tests/roots/test-directive-code/literal-short.inc b/tests/roots/test-directive-code/literal-short.inc
new file mode 100644
index 000000000..7a07a3f7a
--- /dev/null
+++ b/tests/roots/test-directive-code/literal-short.inc
@@ -0,0 +1,3 @@
+# Very small literal include (linenothreshold check)
+
+value = True
diff --git a/tests/test_directive_code.py b/tests/test_directive_code.py
index 8627820b9..2e1a1fde2 100644
--- a/tests/test_directive_code.py
+++ b/tests/test_directive_code.py
@@ -565,3 +565,52 @@ def test_code_block_highlighted(app, status, warning):
     assert codeblocks[1]['language'] == 'python2'
     assert codeblocks[2]['language'] == 'python3'
     assert codeblocks[3]['language'] == 'python2'
+
+
+@pytest.mark.sphinx('html', testroot='directive-code')
+def test_linenothreshold(app, status, warning):
+    app.builder.build(['linenothreshold'])
+    html = (app.outdir / 'linenothreshold.html').text()
+
+    lineos_head = '<td class="linenos"><div class="linenodiv"><pre>'
+    lineos_tail = '</pre></div></td>'
+
+    # code-block using linenothreshold
+    _, matched, html = html.partition(lineos_head +
+                                      '1\n'
+                                      '2\n'
+                                      '3\n'
+                                      '4\n'
+                                      '5\n'
+                                      '6' + lineos_tail)
+    assert matched
+
+    # code-block not using linenothreshold
+    html, matched, _ = html.partition(lineos_head +
+                                      '1\n'
+                                      '2' + lineos_tail)
+    assert not matched
+
+    # literal include using linenothreshold
+    _, matched, html = html.partition(lineos_head +
+                                      ' 1\n'
+                                      ' 2\n'
+                                      ' 3\n'
+                                      ' 4\n'
+                                      ' 5\n'
+                                      ' 6\n'
+                                      ' 7\n'
+                                      ' 8\n'
+                                      ' 9\n'
+                                      '10\n'
+                                      '11\n'
+                                      '12\n'
+                                      '13' + lineos_tail)
+    assert matched
+
+    # literal include not using linenothreshold
+    html, matched, _ = html.partition(lineos_head +
+                                      '1\n'
+                                      '2\n' 
+                                      '3' + lineos_tail)
+    assert not matched

From 55c5168f338d6a9625c789af6c4b9ab04eb5ec93 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <remyabel@gmail.com>
Date: Thu, 21 Feb 2019 20:11:24 -0500
Subject: [PATCH 03/16] #3620: Defer searchindex.js rather than loading it via
 ajax

---
 sphinx/themes/basic/search.html           |  7 +------
 sphinx/themes/basic/static/searchtools.js | 10 ----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/sphinx/themes/basic/search.html b/sphinx/themes/basic/search.html
index 04f0d1de2..7446a8f25 100644
--- a/sphinx/themes/basic/search.html
+++ b/sphinx/themes/basic/search.html
@@ -14,12 +14,7 @@
     <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}"></script>
 {%- endblock %}
 {% block extrahead %}
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
-  </script>
-  {# this is used when loading the search index using $.ajax fails,
-     such as on Chrome for documents on localhost #}
-  <script type="text/javascript" id="searchindexloader"></script>
+  <script type="text/javascript" src="{{ pathto('searchindex.js', 1) }}" defer></script>
   {{ super() }}
 {% endblock %}
 {% block body %}
diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js
index bdc270655..4c5826411 100644
--- a/sphinx/themes/basic/static/searchtools.js
+++ b/sphinx/themes/basic/static/searchtools.js
@@ -75,16 +75,6 @@ var Search = {
       }
   },
 
-  loadIndex : function(url) {
-    $.ajax({type: "GET", url: url, data: null,
-            dataType: "script", cache: true,
-            complete: function(jqxhr, textstatus) {
-              if (textstatus != "success") {
-                document.getElementById("searchindexloader").src = url;
-              }
-            }});
-  },
-
   setIndex : function(index) {
     var q;
     this._index = index;

From 524ac7ff0a1b1ccd81365c1a3857cd70947acaf1 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sun, 24 Feb 2019 17:44:59 +0900
Subject: [PATCH 04/16] Fix #6096: html: Anchor links are not added to figures

---
 CHANGES                  | 2 ++
 sphinx/writers/html.py   | 4 +---
 sphinx/writers/html5.py  | 4 +---
 tests/test_build_html.py | 9 +++++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2781cddf8..e6ccfad27 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,8 @@ Features added
 Bugs fixed
 ----------
 
+* #6096: html: Anchor links are not added to figures
+
 Testing
 --------
 
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 454e7c4d2..3eb9a0911 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -509,9 +509,7 @@ class HTMLTranslator(SphinxTranslator, BaseTranslator):
         if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
             self.add_permalink_ref(node.parent, _('Permalink to this code'))
         elif isinstance(node.parent, nodes.figure):
-            image_nodes = node.parent.traverse(nodes.image)
-            target_node = image_nodes and image_nodes[0] or node.parent
-            self.add_permalink_ref(target_node, _('Permalink to this image'))
+            self.add_permalink_ref(node.parent, _('Permalink to this image'))
         elif node.parent.get('toctree'):
             self.add_permalink_ref(node.parent.parent, _('Permalink to this toctree'))
 
diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py
index 5a10c990f..646d6cc31 100644
--- a/sphinx/writers/html5.py
+++ b/sphinx/writers/html5.py
@@ -455,9 +455,7 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
         if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
             self.add_permalink_ref(node.parent, _('Permalink to this code'))
         elif isinstance(node.parent, nodes.figure):
-            image_nodes = node.parent.traverse(nodes.image)
-            target_node = image_nodes and image_nodes[0] or node.parent
-            self.add_permalink_ref(target_node, _('Permalink to this image'))
+            self.add_permalink_ref(node.parent, _('Permalink to this image'))
         elif node.parent.get('toctree'):
             self.add_permalink_ref(node.parent.parent, _('Permalink to this toctree'))
 
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 77c86962e..99d7bf8d4 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -1254,6 +1254,15 @@ def test_html_inventory(app):
                                            'The basic Sphinx documentation for testing')
 
 
+@pytest.mark.sphinx('html', testroot='images', confoverrides={'html_sourcelink_suffix': ''})
+def test_html_anchor_for_figure(app):
+    app.builder.build_all()
+    content = (app.outdir / 'index.html').text()
+    assert ('<p class="caption"><span class="caption-text">The caption of pic</span>'
+            '<a class="headerlink" href="#id1" title="Permalink to this image">¶</a></p>'
+            in content)
+
+
 @pytest.mark.sphinx('html', testroot='directives-raw')
 def test_html_raw_directive(app, status, warning):
     app.builder.build_all()

From 0dec09a0651a458ca5e3830d45f9e1ff1cb156f3 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Fri, 22 Feb 2019 13:15:42 +0900
Subject: [PATCH 05/16] Update warning messages for script_files

---
 sphinx/builders/html.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index bb11bfb4a..2c5ebcd4d 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -109,24 +109,24 @@ class JSContainer(list):
     """The container for JavaScript scripts."""
     def insert(self, index, obj):
         # type: (int, str) -> None
-        warnings.warn('builder.script_files is deprecated. '
-                      'Please use app.add_js_file() instead.',
-                      RemovedInSphinx30Warning, stacklevel=2)
+        warnings.warn('To modify script_files in the theme is deprecated. '
+                      'Please insert a <script> tag directly in your theme instead.',
+                      RemovedInSphinx30Warning, stacklevel=3)
         super().insert(index, obj)
 
     def extend(self, other):  # type: ignore
         # type: (List[str]) -> None
-        warnings.warn('builder.script_files is deprecated. '
-                      'Please use app.add_js_file() instead.',
-                      RemovedInSphinx30Warning, stacklevel=2)
+        warnings.warn('To modify script_files in the theme is deprecated. '
+                      'Please insert a <script> tag directly in your theme instead.',
+                      RemovedInSphinx30Warning, stacklevel=3)
         for item in other:
             self.append(item)
 
     def __iadd__(self, other):  # type: ignore
         # type: (List[str]) -> JSContainer
-        warnings.warn('builder.script_files is deprecated. '
-                      'Please use app.add_js_file() instead.',
-                      RemovedInSphinx30Warning, stacklevel=2)
+        warnings.warn('To modify script_files in the theme is deprecated. '
+                      'Please insert a <script> tag directly in your theme instead.',
+                      RemovedInSphinx30Warning, stacklevel=3)
         for item in other:
             self.append(item)
         return self

From fa63dfe0f7a152fae3b2389d1feb3676187dc214 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sun, 24 Feb 2019 20:42:37 +0900
Subject: [PATCH 06/16] Update CHANGES for PR #5508

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index e6ccfad27..e231419de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ Bugs fixed
 ----------
 
 * #6096: html: Anchor links are not added to figures
+* #5508: ``linenothreshold`` option for ``highlight`` directive was ignored
 
 Testing
 --------

From 832c81a2caceb7741ecc27200aeb8cda6f065419 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 25 Feb 2019 23:59:51 +0900
Subject: [PATCH 07/16] Update CHANGES for PR #6091

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index e231419de..699437b66 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ Bugs fixed
 ----------
 
 * #6096: html: Anchor links are not added to figures
+* #3620: html: Defer searchindex.js rather than loading it via ajax
 * #5508: ``linenothreshold`` option for ``highlight`` directive was ignored
 
 Testing

From ceef713e7937dd9f16b1ba2114885a1a64067f51 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Wed, 27 Feb 2019 01:09:43 +0900
Subject: [PATCH 08/16] docs: Remove a term "new" from config values

---
 doc/usage/extensions/autodoc.rst     | 2 +-
 doc/usage/extensions/autosummary.rst | 2 +-
 doc/usage/extensions/coverage.rst    | 2 +-
 doc/usage/extensions/extlinks.rst    | 2 +-
 doc/usage/extensions/graphviz.rst    | 2 +-
 doc/usage/extensions/intersphinx.rst | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/usage/extensions/autodoc.rst b/doc/usage/extensions/autodoc.rst
index cb41cb07d..6d7ba8272 100644
--- a/doc/usage/extensions/autodoc.rst
+++ b/doc/usage/extensions/autodoc.rst
@@ -315,7 +315,7 @@ inserting them into the page source under a suitable :rst:dir:`py:module`,
 Configuration
 -------------
 
-There are also new config values that you can set:
+There are also config values that you can set:
 
 .. confval:: autoclass_content
 
diff --git a/doc/usage/extensions/autosummary.rst b/doc/usage/extensions/autosummary.rst
index eeb522950..d1ac0ad32 100644
--- a/doc/usage/extensions/autosummary.rst
+++ b/doc/usage/extensions/autosummary.rst
@@ -131,7 +131,7 @@ Generating stub pages automatically
 -----------------------------------
 
 If you do not want to create stub pages with :program:`sphinx-autogen`, you can
-also use this new config value:
+also use these config values:
 
 .. confval:: autosummary_generate
 
diff --git a/doc/usage/extensions/coverage.rst b/doc/usage/extensions/coverage.rst
index 94d4c6fe4..1fb9b1850 100644
--- a/doc/usage/extensions/coverage.rst
+++ b/doc/usage/extensions/coverage.rst
@@ -13,7 +13,7 @@ This extension features one additional builder, the :class:`CoverageBuilder`.
 
 .. todo:: Write this section.
 
-Several new configuration values can be used to specify what the builder
+Several configuration values can be used to specify what the builder
 should check:
 
 .. confval:: coverage_ignore_modules
diff --git a/doc/usage/extensions/extlinks.rst b/doc/usage/extensions/extlinks.rst
index d818ba09b..e1d729f5c 100644
--- a/doc/usage/extensions/extlinks.rst
+++ b/doc/usage/extensions/extlinks.rst
@@ -18,7 +18,7 @@ tracker, at :samp:`https://github.com/sphinx-doc/sphinx/issues/{num}`.  Typing
 this URL again and again is tedious, so you can use :mod:`~sphinx.ext.extlinks`
 to avoid repeating yourself.
 
-The extension adds one new config value:
+The extension adds a config value:
 
 .. confval:: extlinks
 
diff --git a/doc/usage/extensions/graphviz.rst b/doc/usage/extensions/graphviz.rst
index f87f1a4b7..bb50465ad 100644
--- a/doc/usage/extensions/graphviz.rst
+++ b/doc/usage/extensions/graphviz.rst
@@ -90,7 +90,7 @@ It adds these directives:
 .. versionadded:: 1.6
    All three directives support a ``name`` option to set the label to graph.
 
-There are also these new config values:
+There are also these config values:
 
 .. confval:: graphviz_dot
 
diff --git a/doc/usage/extensions/intersphinx.rst b/doc/usage/extensions/intersphinx.rst
index cfda53e8f..0b2070400 100644
--- a/doc/usage/extensions/intersphinx.rst
+++ b/doc/usage/extensions/intersphinx.rst
@@ -43,7 +43,7 @@ Configuration
 -------------
 
 To use Intersphinx linking, add ``'sphinx.ext.intersphinx'`` to your
-:confval:`extensions` config value, and use these new config values to activate
+:confval:`extensions` config value, and use these config values to activate
 linking:
 
 .. confval:: intersphinx_mapping

From ec307996172bfe23d46dfacdb0bbaf1caf7412c5 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Wed, 27 Feb 2019 23:29:17 +0900
Subject: [PATCH 09/16] Revert "C++, conditionally disable test on
 sys.maxunicode"

This reverts commit 2a544b4ec3bce0bd6c11d7fda8df5a04013eca1f.
---
 tests/test_domain_cpp.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/test_domain_cpp.py b/tests/test_domain_cpp.py
index 4d7d3e592..0cd3445a5 100644
--- a/tests/test_domain_cpp.py
+++ b/tests/test_domain_cpp.py
@@ -9,7 +9,6 @@
 """
 
 import re
-import sys
 
 import pytest
 
@@ -152,9 +151,8 @@ def test_expressions():
         exprCheck(p + "'\\x0A'", t + "10")
         exprCheck(p + "'\\u0a42'", t + "2626")
         exprCheck(p + "'\\u0A42'", t + "2626")
-        if sys.maxunicode > 65535:
-            exprCheck(p + "'\\U0001f34c'", t + "127820")
-            exprCheck(p + "'\\U0001F34C'", t + "127820")
+        exprCheck(p + "'\\U0001f34c'", t + "127820")
+        exprCheck(p + "'\\U0001F34C'", t + "127820")
 
     # TODO: user-defined lit
     exprCheck('(... + Ns)', '(... + Ns)', id4='flpl2Ns')

From 1522baf58aa4368bbc268fa112ed35089fbc85c2 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Wed, 27 Feb 2019 23:55:22 +0900
Subject: [PATCH 10/16] Fix #6113: html: Table cells and list items have large
 margins

---
 CHANGES                                | 1 +
 sphinx/themes/basic/static/basic.css_t | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 699437b66..85b225e31 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ Bugs fixed
 
 * #6096: html: Anchor links are not added to figures
 * #3620: html: Defer searchindex.js rather than loading it via ajax
+* #6113: html: Table cells and list items have large margins
 * #5508: ``linenothreshold`` option for ``highlight`` directive was ignored
 
 Testing
diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index ec30e8432..90a14286f 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -401,11 +401,13 @@ table.citation td {
     border-bottom: none;
 }
 
+th > p:first-child,
 td > p:first-child {
     margin-top: 0px;
 }
 
-td > p:only-child {
+th > p:last-child,
+td > p:last-child {
     margin-bottom: 0px;
 }
 
@@ -482,7 +484,7 @@ li > p:first-child {
     margin-top: 0px;
 }
 
-li > p:only-child {
+li > p:last-child {
     margin-bottom: 0px;
 }
 

From 6c244bdd696ac320d02735cf1724b047515a7847 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 28 Feb 2019 01:39:29 +0900
Subject: [PATCH 11/16] Fix #6067: LaTeX: images having a target are
 concatenated to next line

---
 CHANGES                           |  1 +
 sphinx/writers/latex.py           |  4 ++++
 tests/roots/test-images/index.rst |  3 +++
 tests/test_build_latex.py         | 10 +++++++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 65f39e538..eb2898927 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ Bugs fixed
 * LaTeX: Remove extraneous space after author names on PDF title page (refs: #6004)
 * #6026: LaTeX: A cross reference to definition list does not work
 * #6046: LaTeX: ``TypeError`` is raised when invalid latex_elements given
+* #6067: LaTeX: images having a target are concatenated to next line
 * #6019: imgconverter: Including multipage PDF fails
 * #6047: autodoc: ``autofunction`` emits a warning for method objects
 
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 7cef81ff4..65e64a61b 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1987,6 +1987,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
             for id in node.get('ids'):
                 anchor = not self.in_caption
                 self.body += self.hypertarget(id, anchor=anchor)
+        if not self.is_inline(node):
+            self.body.append('\n')
         uri = node.get('refuri', '')
         if not uri and node.get('refid'):
             uri = '%' + self.curfilestack[-1] + '#' + node['refid']
@@ -2039,6 +2041,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
     def depart_reference(self, node):
         # type: (nodes.Node) -> None
         self.body.append(self.context.pop())
+        if not self.is_inline(node):
+            self.body.append('\n')
 
     def visit_number_reference(self, node):
         # type: (nodes.Node) -> None
diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst
index d1478fab1..577dd0f88 100644
--- a/tests/roots/test-images/index.rst
+++ b/tests/roots/test-images/index.rst
@@ -15,6 +15,9 @@ test-image
 
 .. image:: testimäge.png
 
+.. image:: rimg.png
+   :target: https://www.sphinx-doc.org/
+
 .. a remote image
 .. image:: https://www.python.org/static/img/python-logo.png
 
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index b81d2a3fe..fe092113e 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -1184,16 +1184,24 @@ def test_latex_raw_directive(app, status, warning):
 
 
 @pytest.mark.sphinx('latex', testroot='images')
-def test_latex_remote_images(app, status, warning):
+def test_latex_images(app, status, warning):
     app.builder.build_all()
 
     result = (app.outdir / 'Python.tex').text(encoding='utf8')
+
+    # images are copied
     assert '\\sphinxincludegraphics{{python-logo}.png}' in result
     assert (app.outdir / 'python-logo.png').exists()
+
+    # not found images
     assert '\\sphinxincludegraphics{{NOT_EXIST}.PNG}' not in result
     assert ('WARNING: Could not fetch remote image: '
             'http://example.com/NOT_EXIST.PNG [404]' in warning.getvalue())
 
+    # an image having target
+    assert ('\\sphinxhref{https://www.sphinx-doc.org/}'
+            '{\\sphinxincludegraphics{{rimg}.png}}\n\n' in result)
+
 
 @pytest.mark.sphinx('latex', testroot='latex-index')
 def test_latex_index(app, status, warning):

From 9c2e7b6798c51cf631af5918fc217992ad944e2f Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 28 Feb 2019 02:03:59 +0900
Subject: [PATCH 12/16] Fix #6067: LaTeX: images having a target are not
 aligned even if specified

---
 CHANGES                           | 1 +
 sphinx/writers/latex.py           | 8 ++++++--
 tests/roots/test-images/index.rst | 4 ++++
 tests/test_build_latex.py         | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index eb2898927..82ad1cdee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ Bugs fixed
 * #6026: LaTeX: A cross reference to definition list does not work
 * #6046: LaTeX: ``TypeError`` is raised when invalid latex_elements given
 * #6067: LaTeX: images having a target are concatenated to next line
+* #6067: LaTeX: images having a target are not aligned even if specified
 * #6019: imgconverter: Including multipage PDF fails
 * #6047: autodoc: ``autofunction`` emits a warning for method objects
 
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 65e64a61b..0eafc0af9 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1655,7 +1655,11 @@ class LaTeXTranslator(nodes.NodeVisitor):
                     # in reverse order
         post = []   # type: List[unicode]
         include_graphics_options = []
-        is_inline = self.is_inline(node)
+        has_hyperlink = isinstance(node.parent, nodes.reference)
+        if has_hyperlink:
+            is_inline = self.is_inline(node.parent)
+        else:
+            is_inline = self.is_inline(node)
         if 'width' in attrs:
             if 'scale' in attrs:
                 w = self.latex_image_length(attrs['width'], attrs['scale'])
@@ -1697,7 +1701,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         if self.in_parsed_literal:
             pre.append('{\\sphinxunactivateextrasandspace ')
             post.append('}')
-        if not is_inline:
+        if not is_inline and not has_hyperlink:
             pre.append('\n\\noindent')
             post.append('\n')
         pre.reverse()
diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst
index 577dd0f88..67b742b27 100644
--- a/tests/roots/test-images/index.rst
+++ b/tests/roots/test-images/index.rst
@@ -18,6 +18,10 @@ test-image
 .. image:: rimg.png
    :target: https://www.sphinx-doc.org/
 
+.. image:: rimg.png
+   :align: center
+   :target: https://www.python.org/
+
 .. a remote image
 .. image:: https://www.python.org/static/img/python-logo.png
 
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index fe092113e..03558cd92 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -1202,6 +1202,10 @@ def test_latex_images(app, status, warning):
     assert ('\\sphinxhref{https://www.sphinx-doc.org/}'
             '{\\sphinxincludegraphics{{rimg}.png}}\n\n' in result)
 
+    # a centerized image having target
+    assert ('\\sphinxhref{https://www.python.org/}{{\\hspace*{\\fill}'
+            '\\sphinxincludegraphics{{rimg}.png}\\hspace*{\\fill}}}\n\n' in result)
+
 
 @pytest.mark.sphinx('latex', testroot='latex-index')
 def test_latex_index(app, status, warning):

From 6f973d410be58c5fb2aca5fb6337dff61abc92fe Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Wed, 27 Feb 2019 23:20:40 +0900
Subject: [PATCH 13/16] Fix #6028: graphviz: Ensure the graphviz filenames are
 reproducible

---
 CHANGES                | 1 +
 sphinx/ext/graphviz.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 65f39e538..11e9c6137 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ Bugs fixed
 * #6046: LaTeX: ``TypeError`` is raised when invalid latex_elements given
 * #6019: imgconverter: Including multipage PDF fails
 * #6047: autodoc: ``autofunction`` emits a warning for method objects
+* #6028: graphviz: Ensure the graphviz filenames are reproducible
 
 Testing
 --------
diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index b62d80254..2971f4016 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -194,9 +194,7 @@ class GraphvizSimple(SphinxDirective):
         node = graphviz()
         node['code'] = '%s %s {\n%s\n}\n' % \
                        (self.name, self.arguments[0], '\n'.join(self.content))
-        node['options'] = {
-            'docname': path.splitext(self.state.document.current_source)[0],
-        }
+        node['options'] = {'docname': self.env.docname}
         if 'graphviz_dot' in self.options:
             node['options']['graphviz_dot'] = self.options['graphviz_dot']
         if 'alt' in self.options:

From 0377adb82e7b848c4c50989606772cbd3abec113 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 28 Feb 2019 01:05:37 +0900
Subject: [PATCH 14/16] Fix #6068: doctest: ``skipif`` option may remove the
 code block from documentation

---
 CHANGES               |  1 +
 sphinx/ext/doctest.py | 29 +++++++++++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 11e9c6137..e4b1dd3c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ Bugs fixed
 * #6019: imgconverter: Including multipage PDF fails
 * #6047: autodoc: ``autofunction`` emits a warning for method objects
 * #6028: graphviz: Ensure the graphviz filenames are reproducible
+* #6068: doctest: ``skipif`` option may remove the code block from documentation
 
 Testing
 --------
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index f0c418ccf..52f286c02 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.py
@@ -90,16 +90,6 @@ class TestDirective(SphinxDirective):
 
     def run(self):
         # type: () -> List[nodes.Node]
-        if 'skipif' in self.options:
-            condition = self.options['skipif']
-            context = {}  # type: Dict[str, Any]
-            if self.config.doctest_global_setup:
-                exec(self.config.doctest_global_setup, context)
-            should_skip = eval(condition, context)
-            if self.config.doctest_global_cleanup:
-                exec(self.config.doctest_global_cleanup, context)
-            if should_skip:
-                return []
         # use ordinary docutils nodes for test code: they get special attributes
         # so that our builder recognizes them, and the other builders are happy.
         code = '\n'.join(self.content)
@@ -161,6 +151,8 @@ class TestDirective(SphinxDirective):
                 self.state.document.reporter.warning(
                     __("'%s' is not a valid pyversion option") % spec,
                     line=self.lineno)
+        if 'skipif' in self.options:
+            node['skipif'] = self.options['skipif']
         return [node]
 
 
@@ -411,6 +403,20 @@ Doctest summary
             return node.line - 1
         return None
 
+    def skipped(self, node):
+        # type: (nodes.Element) -> bool
+        if 'skipif' not in node:
+            return False
+        else:
+            condition = node['skipif']
+            context = {}  # type: Dict[str, Any]
+            if self.config.doctest_global_setup:
+                exec(self.config.doctest_global_setup, context)
+            should_skip = eval(condition, context)
+            if self.config.doctest_global_cleanup:
+                exec(self.config.doctest_global_cleanup, context)
+            return should_skip
+
     def test_doc(self, docname, doctree):
         # type: (unicode, nodes.Node) -> None
         groups = {}  # type: Dict[unicode, TestGroup]
@@ -437,6 +443,9 @@ Doctest summary
                 return isinstance(node, (nodes.literal_block, nodes.comment)) \
                     and 'testnodetype' in node
         for node in doctree.traverse(condition):
+            if self.skipped(node):
+                continue
+
             source = node['test'] if 'test' in node else node.astext()
             filename = self.get_filename_for_node(node, docname)
             line_number = self.get_line_number(node)

From 57a7f76c7769973fca35a9860482a07dedc618ed Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sat, 2 Mar 2019 17:38:54 +0900
Subject: [PATCH 15/16] Fix texinfo: ``make install-info`` causes syntax error

---
 CHANGES                           |  1 +
 sphinx/templates/texinfo/Makefile | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 85b225e31..4dc27fc8e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ Bugs fixed
 * #3620: html: Defer searchindex.js rather than loading it via ajax
 * #6113: html: Table cells and list items have large margins
 * #5508: ``linenothreshold`` option for ``highlight`` directive was ignored
+* texinfo: ``make install-info`` causes syntax error
 
 Testing
 --------
diff --git a/sphinx/templates/texinfo/Makefile b/sphinx/templates/texinfo/Makefile
index 276a66136..81c60f502 100644
--- a/sphinx/templates/texinfo/Makefile
+++ b/sphinx/templates/texinfo/Makefile
@@ -17,15 +17,15 @@ html: $(addsuffix .html,$(ALLDOCS))
 pdf: $(addsuffix .pdf,$(ALLDOCS))
 
 install-info: info
-	for f in *.info; do \\
-	  cp -t $(infodir) "$$f" && \\
-	  $(INSTALL_INFO) --info-dir=$(infodir) "$$f" ; \\
+	for f in *.info; do \
+	  cp -t $(infodir) "$$f" && \
+	  $(INSTALL_INFO) --info-dir=$(infodir) "$$f" ; \
 	done
 
 uninstall-info: info
-	for f in *.info; do \\
-	  rm -f "$(infodir)/$$f"  ; \\
-	  $(INSTALL_INFO) --delete --info-dir=$(infodir) "$$f" ; \\
+	for f in *.info; do \
+	  rm -f "$(infodir)/$$f"  ; \
+	  $(INSTALL_INFO) --delete --info-dir=$(infodir) "$$f" ; \
 	done
 
 %.info: %.texi

From 3987734c18e46728131ecc6e88a0631999551931 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sat, 2 Mar 2019 17:41:48 +0900
Subject: [PATCH 16/16] Fix texinfo: ``make install-info`` fails on macOS

---
 CHANGES                           | 1 +
 sphinx/templates/texinfo/Makefile | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 4dc27fc8e..f952c826a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ Bugs fixed
 * #6113: html: Table cells and list items have large margins
 * #5508: ``linenothreshold`` option for ``highlight`` directive was ignored
 * texinfo: ``make install-info`` causes syntax error
+* texinfo: ``make install-info`` fails on macOS
 
 Testing
 --------
diff --git a/sphinx/templates/texinfo/Makefile b/sphinx/templates/texinfo/Makefile
index 81c60f502..8befee3ca 100644
--- a/sphinx/templates/texinfo/Makefile
+++ b/sphinx/templates/texinfo/Makefile
@@ -18,7 +18,8 @@ pdf: $(addsuffix .pdf,$(ALLDOCS))
 
 install-info: info
 	for f in *.info; do \
-	  cp -t $(infodir) "$$f" && \
+	  mkdir -p $(infodir) && \
+	  cp "$$f" $(infodir) && \
 	  $(INSTALL_INFO) --info-dir=$(infodir) "$$f" ; \
 	done