Merge with 'stable'

CHANGES

@@ -16,9 +16,16 @@ Documentation
 -------------
 
 
-Release 1.4.1 (in development)
+Release 1.4.2 (in development)
 ==============================
 
+Bugs fixed
+----------
+
+
+Release 1.4.1 (released Apr 12, 2016)
+=====================================
+
 Incompatible changes
 --------------------
 
@@ -42,11 +49,16 @@ Bugs fixed
 * C++, type declarations are now using the prefixes ``typedef``, ``using``, and ``type``,
   depending on the style of declaration.
 * #2413: C++, fix crash on duplicate declarations
-* #2394: Fix Sphinx crashes when html_last_updated_fmt is invalid
+* #2394: Sphinx crashes when html_last_updated_fmt is invalid
 * #2408: dummy builder not available in Makefile and make.bat
-* #2412: Fix hyperlink targets are broken in LaTeX builder
+* #2412: hyperlink targets are broken in LaTeX builder
-* Fix figure directive crashes if non paragraph item is given as caption
+* figure directive crashes if non paragraph item is given as caption
-* #2418: Fix time formats no longer allowed in today_fmt
+* #2418: time formats no longer allowed in today_fmt
+* #2395: Sphinx crashes if unicode character in image filename
+* #2396: "too many values to unpack" in genindex-single
+* #2405: numref link in PDF jumps to the wrong location
+* #2414: missing number in PDF hyperlinks to code listings
+* #2440: wrong import for gmtime. Thanks to Uwe L. Korn.
 
 
 Release 1.4 (released Mar 28, 2016)

sphinx/config.py

@@ -58,7 +58,7 @@ class Config(object):
 
         language = (None, 'env', string_classes),
         locale_dirs = ([], 'env'),
-        figure_language_filename = ('{root}.{language}{ext}', 'env', [str]),
+        figure_language_filename = (u'{root}.{language}{ext}', 'env', [str]),
 
         master_doc = ('contents', 'env'),
         source_suffix = (['.rst'], 'env'),

sphinx/texinputs/sphinx.sty

@@ -186,8 +186,12 @@
 \newcommand*\SphinxVerbatimTitle {}
 \newcommand*\SphinxSetupCaptionForVerbatim [2]
 {%
-    \def\SphinxVerbatimTitle{\captionof{#1}{#2}\smallskip }%
+    \needspace{\literalblockneedspace}\vspace{\literalblockcaptiontopvspace}%
+    \def\SphinxVerbatimTitle
+       {\captionof{#1}{\SphinxLiteralBlockLabel #2}\smallskip }%
 }
+% \SphinxLiteralBlockLabel will be set dynamically to hold the label for links
+\newcommand*\SphinxLiteralBlockLabel {}
 
 % \SphinxCustomFBox is copied from framed.sty's \CustomFBox, but
 % #1=title/caption is to be set _above_ the top rule, not _below_
@@ -243,9 +247,19 @@
 
 \renewcommand{\Verbatim}[1][1]{%
   % list starts new par, but we don't want it to be set apart vertically
-  \bgroup\parskip\z@skip
+  \parskip\z@skip
   \smallskip
-  % use customized framed environment
+  % first, let's check if there is a caption
+  \ifx\SphinxVerbatimTitle\empty
+      % there was no caption. Check if nevertheless a label was set.
+      \ifx\SphinxLiteralBlockLabel\empty\else
+      % we require some space to be sure hyperlink target from \phantomsection
+      % will not be separated from upcoming verbatim by a page break
+          \needspace{\literalblockwithoutcaptionneedspace}%
+          \phantomsection\SphinxLiteralBlockLabel
+      \fi
+  \fi
+  % non-empty \SphinxVerbatimTitle has label inside it (in case there is one)
   \let\SphinxFrameTitle\SphinxVerbatimTitle
   \global\Sphinx@myfirstframedpasstrue
   % The list environement is needed to control perfectly the vertical
@@ -265,10 +279,7 @@
   \endOriginalVerbatim
   \endMakeFramed
   \endlist
-  % close group to restore \parskip (and \SphinxFrameTitle)
+  % LaTeX environments always revert local changes on exit, here e.g. \parskip
-  \egroup
-  % reset to empty \SphinxVerbatimTitle
-  \global\let\SphinxVerbatimTitle\empty
 }
 
 
@@ -625,5 +636,6 @@
 \RequirePackage{needspace}
 % if the left page space is less than \literalblockneedsapce, insert page-break
 \newcommand{\literalblockneedspace}{5\baselineskip}
+\newcommand{\literalblockwithoutcaptionneedspace}{1.5\baselineskip}
 % margin before the caption of literal-block
 \newcommand{\literalblockcaptiontopvspace}{0.5\baselineskip}

sphinx/util/i18n.py

@@ -14,7 +14,7 @@ import os
 import re
 import warnings
 from os import path
-from time import time
+from time import gmtime
 from datetime import datetime
 from collections import namedtuple
 
@@ -188,7 +188,7 @@ def format_date(format, date=None, language=None, warn=None):
         # See https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal
         source_date_epoch = os.getenv('SOURCE_DATE_EPOCH')
         if source_date_epoch is not None:
-            date = time.gmtime(float(source_date_epoch))
+            date = gmtime(float(source_date_epoch))
         else:
             date = datetime.now()
 

sphinx/writers/latex.py

@@ -1443,9 +1443,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
     def visit_caption(self, node):
         self.in_caption += 1
         if self.in_container_literal_block:
-            self.body.append('\\needspace{\\literalblockneedspace}')
+            self.body.append('\\SphinxSetupCaptionForVerbatim{literal-block}{')
-            self.body.append('\\vspace{\\literalblockcaptiontopvspace}%')
-            self.body.append('\n\\SphinxSetupCaptionForVerbatim{literal-block}{')
         elif self.in_minipage and isinstance(node.parent, nodes.figure):
             self.body.append('\\captionof{figure}{')
         else:
@@ -1800,6 +1798,15 @@ class LaTeXTranslator(nodes.NodeVisitor):
             # most probably a parsed-literal block -- don't highlight
             self.body.append('\\begin{alltt}\n')
         else:
+            ids = ''
+            for id in self.pop_hyperlink_ids('code-block'):
+                ids += self.hypertarget(id, anchor=False)
+            if node['ids']:
+                # suppress with anchor=False \phantomsection insertion
+                ids += self.hypertarget(node['ids'][0], anchor=False)
+            # LaTeX code will insert \phantomsection prior to \label
+            if ids:
+                self.body.append('\n\\def\\SphinxLiteralBlockLabel{' + ids + '}')
             code = node.astext()
             lang = self.hlsettingstack[-1][0]
             linenos = code.count('\n') >= self.hlsettingstack[-1][1] - 1
@@ -1833,6 +1840,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
             hlcode = hlcode.rstrip()[:-14]  # strip \end{Verbatim}
             self.body.append('\n' + hlcode + '\\end{%sVerbatim}\n' %
                              (self.table and 'Original' or ''))
+            if ids:
+                self.body.append('\\let\\SphinxLiteralBlockLabel\empty\n')
             raise nodes.SkipNode
 
     def depart_literal_block(self, node):
@@ -1991,14 +2000,17 @@ class LaTeXTranslator(nodes.NodeVisitor):
             for id in self.pop_hyperlink_ids('code-block'):
                 ids += self.hypertarget(id, anchor=False)
             if node['ids']:
-                ids += self.hypertarget(node['ids'][0])
+                # suppress with anchor=False \phantomsection insertion
-            self.body.append('\n')
+                ids += self.hypertarget(node['ids'][0], anchor=False)
-            self.context.append(ids + '\n')
+            # define label for use in caption.
+            if ids:
+                self.body.append('\n\\def\\SphinxLiteralBlockLabel{' + ids + '}\n')
 
     def depart_container(self, node):
         if node.get('literal_block'):
             self.in_container_literal_block -= 1
-            self.body.append(self.context.pop())
+            self.body.append('\\let\\SphinxVerbatimTitle\\empty\n')
+            self.body.append('\\let\\SphinxLiteralBlockLabel\\empty\n')
 
     def visit_decoration(self, node):
         pass

tests/roots/test-directive-code/caption.rst

@@ -1,5 +1,13 @@
-Dedent
+Caption
-======
+=======
+
+References
+----------
+
+See :numref:`caption *test* rb` and :numref:`caption **test** py`.
+
+See :ref:`Ruby <name *test* rb>` and :ref:`Python <name **test** py>`.
+
 
 Code blocks
 -----------
@@ -19,3 +27,26 @@ Literal Include
    :language: python
    :caption: caption **test** py
    :lines: 10-11
+
+
+Named Code blocks
+-----------------
+
+.. code-block:: ruby
+   :name: name *test* rb
+   :caption: caption *test* rbnamed
+
+   def ruby?
+       false
+   end
+
+
+Named Literal Include
+---------------------
+
+.. literalinclude:: literal.inc
+   :language: python
+   :name: name **test** py
+   :caption: caption **test** pynamed
+   :lines: 10-11
+

tests/roots/test-directive-code/conf.py

@@ -2,3 +2,5 @@
 
 master_doc = 'index'
 exclude_patterns = ['_build']
+numfig = True
+

tests/roots/test-directive-code/namedblocks.rst

@@ -0,0 +1,28 @@
+Named Blocks
+============
+
+References to named blocks
+--------------------------
+
+See :ref:`the ruby code <some ruby code>` and
+also :ref:`the python code <some python code>`.
+
+
+Named Code block
+----------------
+
+.. code-block:: ruby
+   :name: some ruby code
+
+   def ruby?
+       false
+   end
+
+
+Named Literal Include
+---------------------
+
+.. literalinclude:: literal.inc
+   :language: python
+   :name: some python code
+

tests/roots/test-image-glob/index.rst

@@ -12,3 +12,5 @@ test-image-glob
 .. figure:: img.*
 
    The caption of img
+
+.. image:: testimäge.png

tests/test_directive_code.py

@@ -54,6 +54,7 @@ def test_code_block_caption_html(app, status, warning):
     app.builder.build(['caption'])
     html = (app.outdir / 'caption.html').text(encoding='utf-8')
     caption = (u'<div class="code-block-caption">'
+               u'<span class="caption-number">Listing 1 </span>'
                u'<span class="caption-text">caption <em>test</em> rb'
                u'</span><a class="headerlink" href="#caption-test-rb" '
                u'title="Permalink to this code">\xb6</a></div>')
@@ -65,7 +66,28 @@ def test_code_block_caption_latex(app, status, warning):
     app.builder.build_all()
     latex = (app.outdir / 'Python.tex').text(encoding='utf-8')
     caption = '\\SphinxSetupCaptionForVerbatim{literal-block}{caption \\emph{test} rb}'
+    label = '\\def\\SphinxLiteralBlockLabel{\\label{caption:caption-test-rb}}'
+    link  = '\hyperref[caption:caption-test-rb]' \
+            '{Listing \\ref{caption:caption-test-rb}}'
     assert caption in latex
+    assert label in latex
+    assert link in latex
+
+
+@with_app('latex', testroot='directive-code')
+def test_code_block_namedlink_latex(app, status, warning):
+    app.builder.build_all()
+    latex = (app.outdir / 'Python.tex').text(encoding='utf-8')
+    label1 = '\def\SphinxLiteralBlockLabel{\label{caption:name-test-rb}}'
+    link1  = '\\hyperref[caption:name\\string-test\\string-rb]'\
+             '{\\crossref{\\DUrole{std,std-ref}{Ruby}}'
+    label2 = '\def\SphinxLiteralBlockLabel{\label{namedblocks:some-ruby-code}}'
+    link2  = '\\hyperref[namedblocks:some\\string-ruby\\string-code]'\
+             '{\\crossref{\\DUrole{std,std-ref}{the ruby code}}}'
+    assert label1 in latex
+    assert link1  in latex
+    assert label2 in latex
+    assert link2  in latex
 
 
 @with_app('xml', testroot='directive-code')
@@ -219,6 +241,7 @@ def test_literalinclude_caption_html(app, status, warning):
     app.builder.build('index')
     html = (app.outdir / 'caption.html').text(encoding='utf-8')
     caption = (u'<div class="code-block-caption">'
+               u'<span class="caption-number">Listing 2 </span>'
                u'<span class="caption-text">caption <strong>test</strong> py'
                u'</span><a class="headerlink" href="#caption-test-py" '
                u'title="Permalink to this code">\xb6</a></div>')
@@ -230,7 +253,28 @@ def test_literalinclude_caption_latex(app, status, warning):
     app.builder.build('index')
     latex = (app.outdir / 'Python.tex').text(encoding='utf-8')
     caption = '\\SphinxSetupCaptionForVerbatim{literal-block}{caption \\textbf{test} py}'
+    label = '\\def\\SphinxLiteralBlockLabel{\\label{caption:caption-test-py}}'
+    link  = '\hyperref[caption:caption-test-py]' \
+            '{Listing \\ref{caption:caption-test-py}}'
     assert caption in latex
+    assert label in latex
+    assert link in latex
+
+
+@with_app('latex', testroot='directive-code')
+def test_literalinclude_namedlink_latex(app, status, warning):
+    app.builder.build('index')
+    latex = (app.outdir / 'Python.tex').text(encoding='utf-8')
+    label1 = '\def\SphinxLiteralBlockLabel{\label{caption:name-test-py}}'
+    link1  = '\\hyperref[caption:name\\string-test\\string-py]'\
+             '{\\crossref{\\DUrole{std,std-ref}{Python}}'
+    label2 = '\def\SphinxLiteralBlockLabel{\label{namedblocks:some-python-code}}'
+    link2  = '\\hyperref[namedblocks:some\\string-python\\string-code]'\
+             '{\\crossref{\\DUrole{std,std-ref}{the python code}}}'
+    assert label1 in latex
+    assert link1  in latex
+    assert label2 in latex
+    assert link2  in latex
 
 
 @with_app('xml', testroot='directive-code')

tests/test_intl.py

@@ -841,7 +841,7 @@ def test_image_glob_intl(app, status, warning):
 
 @with_app(buildername='dummy', testroot='image-glob',
           confoverrides={'language': 'xx',
-                         'figure_language_filename': '{root}{ext}.{language}'})
+                         'figure_language_filename': u'{root}{ext}.{language}'})
 def test_image_glob_intl_using_figure_language_filename(app, status, warning):
     app.builder.build_all()