commit/sphinx: 5 new changesets

[commits...@bitbucket.org]

5 new commits in sphinx:

https://bitbucket.org/birkenfeld/sphinx/commits/d296b8f80323/
Changeset: d296b8f80323
User: tk0miya
Date: 2014-10-05 07:27:38+00:00
Summary: Set permanent links to every captions and titles
Affected #: 5 files

diff -r 2bb807ed9ade11c07052638e1e0287d11034913b -r d296b8f80323dec77d2ec457e4bb1c28c30a6c03 sphinx/themes/agogo/static/agogo.css_t
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -97,7 +97,10 @@
h4:hover > a.headerlink,
h5:hover > a.headerlink,
h6:hover > a.headerlink,
-dt:hover > a.headerlink {
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
visibility: visible;
}


diff -r 2bb807ed9ade11c07052638e1e0287d11034913b -r d296b8f80323dec77d2ec457e4bb1c28c30a6c03 sphinx/themes/basic/static/basic.css_t
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -197,7 +197,10 @@
h4:hover > a.headerlink,
h5:hover > a.headerlink,
h6:hover > a.headerlink,
-dt:hover > a.headerlink {
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
visibility: visible;
}


diff -r 2bb807ed9ade11c07052638e1e0287d11034913b -r d296b8f80323dec77d2ec457e4bb1c28c30a6c03 sphinx/themes/scrolls/static/scrolls.css_t
--- a/sphinx/themes/scrolls/static/scrolls.css_t
+++ b/sphinx/themes/scrolls/static/scrolls.css_t
@@ -250,7 +250,10 @@
h5:hover > a.headerlink,
h6:hover > a.headerlink,
dt:hover > a.headerlink,
-dt:hover > a.headerlink {
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
visibility: visible;
}


diff -r 2bb807ed9ade11c07052638e1e0287d11034913b -r d296b8f80323dec77d2ec457e4bb1c28c30a6c03 sphinx/writers/html.py
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -309,6 +309,20 @@
self.add_fignumber(node)

def depart_caption(self, node):
+ if node.parent['ids'] and self.permalink_text and self.builder.add_permalinks:
+ if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
+ figtype = 'code'
+ elif isinstance(node.parent, nodes.figure):
+ figtype = 'image'
+ else:
+ figtype = 'caption'
+
+ self.body.append(u'<a class="headerlink" href="#%s" '
+ % node.parent['ids'][0] +
+ u'title="%s">%s</a>' % (
+ _('Permalink to this %s' % figtype),
+ self.permalink_text))
+
if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
self.body.append('</div>\n')
else:
@@ -589,6 +603,11 @@
u'title="%s">%s' % (
_('Permalink to this headline'),
self.permalink_text))
+ elif close_tag.startswith('</caption>'):
+ self.body.append(u'<a class="headerlink" href="#%s" ' % aname +
+ u'title="%s">%s</a>' % (
+ _('Permalink to this table'),
+ self.permalink_text))

BaseTranslator.depart_title(self, node)


diff -r 2bb807ed9ade11c07052638e1e0287d11034913b -r d296b8f80323dec77d2ec457e4bb1c28c30a6c03 tests/test_directive_code.py
--- a/tests/test_directive_code.py
+++ b/tests/test_directive_code.py
@@ -52,8 +52,11 @@
@with_app('html', testroot='directive-code')
def test_code_block_caption_html(app, status, warning):
app.builder.build(['caption'])
- html = (app.outdir / 'caption.html').text()
- caption = '<div class="code-block-caption">caption <em>test</em> rb</div>'
+ html = (app.outdir / 'caption.html').text(encoding='utf-8')
+ caption = (u'<div class="code-block-caption">'
+ u'caption <em>test</em> rb'
+ u'<a class="headerlink" href="#id1" '
+ u'title="Permalink to this code">\xb6</a></div>')
assert caption in html


@@ -98,8 +101,11 @@
@with_app('html', testroot='directive-code')
def test_literalinclude_caption_html(app, status, warning):
app.builder.build('index')
- html = (app.outdir / 'caption.html').text()
- caption = '<div class="code-block-caption">caption <strong>test</strong> py</div>'
+ html = (app.outdir / 'caption.html').text(encoding='utf-8')
+ caption = (u'<div class="code-block-caption">'
+ u'caption <strong>test</strong> py'
+ u'<a class="headerlink" href="#id2" '
+ u'title="Permalink to this code">\xb6</a></div>')
assert caption in html




https://bitbucket.org/birkenfeld/sphinx/commits/449e1b5d5241/
Changeset: 449e1b5d5241
User: tk0miya
Date: 2014-10-05 11:54:50+00:00
Summary: Refactor creating permalinks on HTML writer
Affected #: 1 file

diff -r d296b8f80323dec77d2ec457e4bb1c28c30a6c03 -r 449e1b5d5241736ac21d5dfc9503da09c006694b sphinx/writers/html.py
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -102,12 +102,7 @@
and node['ids'] and node['first']:
self.body.append('<!--[%s]-->' % node['ids'][0])
def depart_desc_signature(self, node):
- if node['ids'] and self.permalink_text and self.builder.add_permalinks:
- self.body.append(u'<a class="headerlink" href="#%s" '
- % node['ids'][0] +
- u'title="%s">%s</a>' % (
- _('Permalink to this definition'),
- self.permalink_text))
+ self.add_permalink_ref(node, 'definition')
self.body.append('</dt>\n')

def visit_desc_addname(self, node):
@@ -264,6 +259,12 @@
elif isinstance(node.parent, nodes.container):
append_fignumber('code-block', node.parent['ids'][0])

+ def add_permalink_ref(self, node, typename):
+ if node['ids'] and self.permalink_text and self.builder.add_permalinks:
+ title = _('Permalink to this %s' % typename)
+ format = u'<a class="headerlink" href="#%s" title="%s">%s</a>'
+ self.body.append(format % (node['ids'][0], title, self.permalink_text))
+
# overwritten to avoid emitting empty <ul></ul>
def visit_bullet_list(self, node):
if len(node) == 1 and node[0].tagname == 'toctree':
@@ -309,19 +310,11 @@
self.add_fignumber(node)

def depart_caption(self, node):
- if node.parent['ids'] and self.permalink_text and self.builder.add_permalinks:
- if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
- figtype = 'code'
- elif isinstance(node.parent, nodes.figure):
- figtype = 'image'
- else:
- figtype = 'caption'
-
- self.body.append(u'<a class="headerlink" href="#%s" '
- % node.parent['ids'][0] +
- u'title="%s">%s</a>' % (
- _('Permalink to this %s' % figtype),
- self.permalink_text))
+ # append permalink if available
+ if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
+ self.add_permalink_ref(node.parent, 'code')
+ elif isinstance(node.parent, nodes.figure):
+ self.add_permalink_ref(node.parent, 'image')

if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
self.body.append('</div>\n')
@@ -589,25 +582,18 @@
def depart_title(self, node):
close_tag = self.context[-1]
if (self.permalink_text and self.builder.add_permalinks and
- node.parent.hasattr('ids') and node.parent['ids']):
- aname = node.parent['ids'][0]
+ node.parent.hasattr('ids') and node.parent['ids']):
# add permalink anchor
if close_tag.startswith('</h'):
- self.body.append(u'<a class="headerlink" href="#%s" ' % aname +
- u'title="%s">%s</a>' % (
- _('Permalink to this headline'),
- self.permalink_text))
+ self.add_permalink_ref(node.parent, 'headline')
elif close_tag.startswith('</a></h'):
self.body.append(u'</a><a class="headerlink" href="#%s" ' %
- aname +
+ node.parent['ids'][0] +
u'title="%s">%s' % (
_('Permalink to this headline'),
self.permalink_text))
- elif close_tag.startswith('</caption>'):
- self.body.append(u'<a class="headerlink" href="#%s" ' % aname +
- u'title="%s">%s</a>' % (
- _('Permalink to this table'),
- self.permalink_text))
+ elif isinstance(node.parent, nodes.table):
+ self.add_permalink_ref(node.parent, 'table')

BaseTranslator.depart_title(self, node)



https://bitbucket.org/birkenfeld/sphinx/commits/18286737ceac/
Changeset: 18286737ceac
User: tk0miya
Date: 2014-10-05 11:55:46+00:00
Summary: Surround fignum and caption with <span> tag
Affected #: 3 files

diff -r 449e1b5d5241736ac21d5dfc9503da09c006694b -r 18286737ceac2e866b5f4b466a27e6617817730e sphinx/writers/html.py
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -248,9 +248,11 @@
def add_fignumber(self, node):
def append_fignumber(figtype, figure_id):
if figure_id in self.builder.fignumbers.get(figtype, {}):
+ self.body.append(self.starttag(node, 'span', '', CLASS='caption-number'))
prefix = self.builder.config.numfig_prefix.get(figtype, '')
numbers = self.builder.fignumbers[figtype][figure_id]
self.body.append(prefix + '.'.join(map(str, numbers)) + " ")
+ self.body.append('</span>')

if isinstance(node.parent, nodes.figure):
append_fignumber('figure', node.parent['ids'][0])
@@ -276,6 +278,8 @@
BaseTranslator.visit_title(self, node)
self.add_secnumber(node)
self.add_fignumber(node)
+ if isinstance(node.parent, nodes.table):
+ self.body.append(self.starttag(node, 'span', '', CLASS='caption-text'))

# overwritten
def visit_literal_block(self, node):
@@ -308,8 +312,11 @@
else:
BaseTranslator.visit_caption(self, node)
self.add_fignumber(node)
+ self.body.append(self.starttag(node, 'span', '', CLASS='caption-text'))

def depart_caption(self, node):
+ self.body.append('</span>')
+
# append permalink if available
if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
self.add_permalink_ref(node.parent, 'code')
@@ -593,6 +600,7 @@
_('Permalink to this headline'),
self.permalink_text))
elif isinstance(node.parent, nodes.table):
+ self.body.append('</span>')
self.add_permalink_ref(node.parent, 'table')

BaseTranslator.depart_title(self, node)

diff -r 449e1b5d5241736ac21d5dfc9503da09c006694b -r 18286737ceac2e866b5f4b466a27e6617817730e tests/test_build_html.py
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -305,8 +305,13 @@

def check_xpath(etree, fname, path, check, be_found=True):
nodes = list(etree.findall(path))
- assert nodes != [], ('did not find any node matching xpath '
- '%r in file %s' % (path, fname))
+ if check is None:
+ assert nodes == [], ('found any nodes matching xpath '
+ '%r in file %s' % (path, fname))
+ return
+ else:
+ assert nodes != [], ('did not find any node matching xpath '
+ '%r in file %s' % (path, fname))
if hasattr(check, '__call__'):
check(nodes)
elif not check:
@@ -464,62 +469,24 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2$', True),
- (".//table/caption", '^should be Table 1$', True),
- (".//table/caption", '^should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.4$', True),
- (".//table/caption", '^should be Table 1.1$', True),
- (".//table/caption", '^should be Table 1.2$', True),
- (".//table/caption", '^should be Table 1.3$', True),
- (".//table/caption", '^should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.4$', True),
- (".//table/caption", '^should be Table 2.1$', True),
- (".//table/caption", '^should be Table 2.3$', True),
- (".//table/caption", '^should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.2$', True),
- (".//table/caption", '^should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
],
}

@@ -547,62 +514,72 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.9 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.10 should be Fig.2$', True),
- (".//table/caption", '^Table 9 should be Table 1$', True),
- (".//table/caption", '^Table 10 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^List 9 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^List 10 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.9 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.10 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 9 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 10 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 9 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 10 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.3 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.4 should be Fig.1.4$', True),
- (".//table/caption", '^Table 1 should be Table 1.1$', True),
- (".//table/caption", '^Table 2 should be Table 1.2$', True),
- (".//table/caption", '^Table 3 should be Table 1.3$', True),
- (".//table/caption", '^Table 4 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 3 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 4 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 4 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 3 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.5 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.7 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.8 should be Fig.2.4$', True),
- (".//table/caption", '^Table 5 should be Table 2.1$', True),
- (".//table/caption", '^Table 7 should be Table 2.3$', True),
- (".//table/caption", '^Table 8 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 5 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 7 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 8 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.5 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.7 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.8 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 5 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 7 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 8 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 5 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 7 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 8 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.6 should be Fig.2.2$', True),
- (".//table/caption", '^Table 6 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 6 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.6 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 6 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 6 $', True),
],
}

@@ -626,62 +603,72 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2 should be Fig.2$', True),
- (".//table/caption", '^Table 1 should be Table 1$', True),
- (".//table/caption", '^Table 2 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.2 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.3 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.4 should be Fig.1.4$', True),
- (".//table/caption", '^Table 1.1 should be Table 1.1$', True),
- (".//table/caption", '^Table 1.2 should be Table 1.2$', True),
- (".//table/caption", '^Table 1.3 should be Table 1.3$', True),
- (".//table/caption", '^Table 1.4 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.2 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.3 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.4 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.4 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.3 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.3 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.4 should be Fig.2.4$', True),
- (".//table/caption", '^Table 2.1 should be Table 2.1$', True),
- (".//table/caption", '^Table 2.3 should be Table 2.3$', True),
- (".//table/caption", '^Table 2.4 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.3 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.4 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.4 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.3 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.4 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.2 should be Fig.2.2$', True),
- (".//table/caption", '^Table 2.2 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.2 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.2 $', True),
],
}

@@ -705,62 +692,72 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2 should be Fig.2$', True),
- (".//table/caption", '^Tab_1 should be Table 1$', True),
- (".//table/caption", '^Tab_2 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.2 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.3 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.4 should be Fig.1.4$', True),
- (".//table/caption", '^Tab_1.1 should be Table 1.1$', True),
- (".//table/caption", '^Tab_1.2 should be Table 1.2$', True),
- (".//table/caption", '^Tab_1.3 should be Table 1.3$', True),
- (".//table/caption", '^Tab_1.4 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.2 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.3 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.4 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:1.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.4 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-1.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-1.2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-1.3 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-1.4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.1 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.3 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.4 should be Fig.2.4$', True),
- (".//table/caption", '^Tab_2.1 should be Table 2.1$', True),
- (".//table/caption", '^Tab_2.3 should be Table 2.3$', True),
- (".//table/caption", '^Tab_2.4 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.1 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.3 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.4 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:2.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:2.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.4 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-2.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-2.3 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-2.4 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.2 should be Fig.2.2$', True),
- (".//table/caption", '^Tab_2.2 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.2 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Figure:2.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^Code-2.2 $', True),
],
}

@@ -784,62 +781,72 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2 should be Fig.2$', True),
- (".//table/caption", '^Table 1 should be Table 1$', True),
- (".//table/caption", '^Table 2 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1.1 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1.2 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.2.1 should be Fig.1.4$', True),
- (".//table/caption", '^Table 1.1 should be Table 1.1$', True),
- (".//table/caption", '^Table 1.1.1 should be Table 1.2$', True),
- (".//table/caption", '^Table 1.1.2 should be Table 1.3$', True),
- (".//table/caption", '^Table 1.2.1 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1.1 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1.2 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.2.1 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.1.2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.2.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.1.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.1.2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 1.2.1 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1.1 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1.3 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.2.1 should be Fig.2.4$', True),
- (".//table/caption", '^Table 2.1.1 should be Table 2.1$', True),
- (".//table/caption", '^Table 2.1.3 should be Table 2.3$', True),
- (".//table/caption", '^Table 2.2.1 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1.1 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1.3 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.2.1 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.2.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.1.1 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.1.3 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.2.1 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1.2 should be Fig.2.2$', True),
- (".//table/caption", '^Table 2.1.2 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1.2 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
+ '^Fig.2.1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1.2 $', True),
+ (".//div[@class='code-block-caption']/span[@class='caption-number']",
+ '^List 2.1.2 $', True),
],
}


diff -r 449e1b5d5241736ac21d5dfc9503da09c006694b -r 18286737ceac2e866b5f4b466a27e6617817730e tests/test_directive_code.py
--- a/tests/test_directive_code.py
+++ b/tests/test_directive_code.py
@@ -54,8 +54,8 @@
app.builder.build(['caption'])
html = (app.outdir / 'caption.html').text(encoding='utf-8')
caption = (u'<div class="code-block-caption">'
- u'caption <em>test</em> rb'
- u'<a class="headerlink" href="#id1" '
+ u'<span class="caption-text">caption <em>test</em> rb'
+ u'</span><a class="headerlink" href="#id1" '
u'title="Permalink to this code">\xb6</a></div>')
assert caption in html

@@ -103,8 +103,8 @@
app.builder.build('index')
html = (app.outdir / 'caption.html').text(encoding='utf-8')
caption = (u'<div class="code-block-caption">'
- u'caption <strong>test</strong> py'
- u'<a class="headerlink" href="#id2" '
+ u'<span class="caption-text">caption <strong>test</strong> py'
+ u'</span><a class="headerlink" href="#id2" '
u'title="Permalink to this code">\xb6</a></div>')
assert caption in html



https://bitbucket.org/birkenfeld/sphinx/commits/ede5e88987d5/
Changeset: ede5e88987d5
User: tk0miya
Date: 2014-10-06 04:56:51+00:00
Summary: Fix flake8 violations
Affected #: 1 file

diff -r 18286737ceac2e866b5f4b466a27e6617817730e -r ede5e88987d5b33d564368903c8a4b7e40a5755e tests/test_build_html.py
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -469,24 +469,32 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
(".//table/caption/span[@class='caption-number']", None, True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
(".//table/caption/span[@class='caption-number']", None, True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
(".//table/caption/span[@class='caption-number']", None, True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
(".//table/caption/span[@class='caption-number']", None, True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
}

@@ -514,28 +522,28 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.9 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.10 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.9 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.10 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 9 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 10 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 9 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 10 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 9 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 10 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.3 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.4 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.4 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 1 $', True),
(".//table/caption/span[@class='caption-number']",
@@ -544,42 +552,42 @@
'^Table 3 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 4 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 3 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.5 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.7 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.8 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.5 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.7 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.8 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 5 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 7 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 8 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 5 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 7 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 8 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 5 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 7 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 8 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.6 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.6 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 6 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 6 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 6 $', True),
],
}

@@ -603,28 +611,28 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.2 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.3 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.4 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.4 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 1.1 $', True),
(".//table/caption/span[@class='caption-number']",
@@ -633,42 +641,42 @@
'^Table 1.3 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 1.4 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.3 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.3 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.4 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.4 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.3 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.4 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.3 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.4 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.2 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.2 $', True),
],
}

@@ -686,34 +694,37 @@


@gen_with_app(buildername='html', testroot='numfig',
- confoverrides={'numfig': True, 'numfig_prefix': {'figure': 'Figure:', 'table': 'Tab_', 'code-block': 'Code-'}})
+ confoverrides={'numfig': True,
+ 'numfig_prefix': {'figure': 'Figure:',
+ 'table': 'Tab_',
+ 'code-block': 'Code-'}})
def test_numfig_with_prefix(app, status, warning):
app.builder.build_all()

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:1.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:1.2 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:1.3 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:1.4 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.4 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_1.1 $', True),
(".//table/caption/span[@class='caption-number']",
@@ -722,42 +733,42 @@
'^Tab_1.3 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_1.4 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-1.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-1.2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-1.3 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-1.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:2.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:2.3 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:2.4 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.4 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_2.1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_2.3 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_2.4 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-2.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-2.3 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-2.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.4 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Figure:2.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.2 $', True),
(".//table/caption/span[@class='caption-number']",
'^Tab_2.2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^Code-2.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.2 $', True),
],
}

@@ -781,28 +792,28 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.1.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.1.2 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.1.2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.2.1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 1.1 $', True),
(".//table/caption/span[@class='caption-number']",
@@ -811,42 +822,42 @@
'^Table 1.1.2 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 1.2.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.1.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.1.2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 1.2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.2.1 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.1.1 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.1.3 $', True),
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.2.1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.1.1 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.1.3 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.2.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.1.1 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.1.3 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.2.1 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']/span[@class='caption-number']",
- '^Fig.2.1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1.2 $', True),
(".//table/caption/span[@class='caption-number']",
'^Table 2.1.2 $', True),
- (".//div[@class='code-block-caption']/span[@class='caption-number']",
- '^List 2.1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1.2 $', True),
],
}



https://bitbucket.org/birkenfeld/sphinx/commits/a005167bf558/
Changeset: a005167bf558
User: shimizukawa
Date: 2014-10-06 12:45:25+00:00
Summary: Merged in tk0miya/sphinx (pull request #304)

numfig feature improvement
Affected #: 6 files

diff -r 6f3b5136c467c265031507c2c77708346d4c3f29 -r a005167bf558d198f58799262891f3909840fe89 sphinx/themes/agogo/static/agogo.css_t
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -97,7 +97,10 @@
h4:hover > a.headerlink,
h5:hover > a.headerlink,
h6:hover > a.headerlink,
-dt:hover > a.headerlink {
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
visibility: visible;
}


diff -r 6f3b5136c467c265031507c2c77708346d4c3f29 -r a005167bf558d198f58799262891f3909840fe89 sphinx/themes/basic/static/basic.css_t
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -197,7 +197,10 @@
h4:hover > a.headerlink,
h5:hover > a.headerlink,
h6:hover > a.headerlink,
-dt:hover > a.headerlink {
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
visibility: visible;
}


diff -r 6f3b5136c467c265031507c2c77708346d4c3f29 -r a005167bf558d198f58799262891f3909840fe89 sphinx/themes/scrolls/static/scrolls.css_t
--- a/sphinx/themes/scrolls/static/scrolls.css_t
+++ b/sphinx/themes/scrolls/static/scrolls.css_t
@@ -250,7 +250,10 @@
h5:hover > a.headerlink,
h6:hover > a.headerlink,
dt:hover > a.headerlink,
-dt:hover > a.headerlink {
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
visibility: visible;
}


diff -r 6f3b5136c467c265031507c2c77708346d4c3f29 -r a005167bf558d198f58799262891f3909840fe89 sphinx/writers/html.py
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -102,12 +102,7 @@
and node['ids'] and node['first']:
self.body.append('<!--[%s]-->' % node['ids'][0])
def depart_desc_signature(self, node):
- if node['ids'] and self.permalink_text and self.builder.add_permalinks:
- self.body.append(u'<a class="headerlink" href="#%s" '
- % node['ids'][0] +
- u'title="%s">%s</a>' % (
- _('Permalink to this definition'),
- self.permalink_text))
+ self.add_permalink_ref(node, 'definition')
self.body.append('</dt>\n')

def visit_desc_addname(self, node):
@@ -253,9 +248,11 @@
def add_fignumber(self, node):
def append_fignumber(figtype, figure_id):
if figure_id in self.builder.fignumbers.get(figtype, {}):
+ self.body.append(self.starttag(node, 'span', '', CLASS='caption-number'))
prefix = self.builder.config.numfig_prefix.get(figtype, '')
numbers = self.builder.fignumbers[figtype][figure_id]
self.body.append(prefix + '.'.join(map(str, numbers)) + " ")
+ self.body.append('</span>')

if isinstance(node.parent, nodes.figure):
append_fignumber('figure', node.parent['ids'][0])
@@ -264,6 +261,12 @@
elif isinstance(node.parent, nodes.container):
append_fignumber('code-block', node.parent['ids'][0])

+ def add_permalink_ref(self, node, typename):
+ if node['ids'] and self.permalink_text and self.builder.add_permalinks:
+ title = _('Permalink to this %s' % typename)
+ format = u'<a class="headerlink" href="#%s" title="%s">%s</a>'
+ self.body.append(format % (node['ids'][0], title, self.permalink_text))
+
# overwritten to avoid emitting empty <ul></ul>
def visit_bullet_list(self, node):
if len(node) == 1 and node[0].tagname == 'toctree':
@@ -275,6 +278,8 @@
BaseTranslator.visit_title(self, node)
self.add_secnumber(node)
self.add_fignumber(node)
+ if isinstance(node.parent, nodes.table):
+ self.body.append(self.starttag(node, 'span', '', CLASS='caption-text'))

# overwritten
def visit_literal_block(self, node):
@@ -307,8 +312,17 @@
else:
BaseTranslator.visit_caption(self, node)
self.add_fignumber(node)
+ self.body.append(self.starttag(node, 'span', '', CLASS='caption-text'))

def depart_caption(self, node):
+ self.body.append('</span>')
+
+ # append permalink if available
+ if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
+ self.add_permalink_ref(node.parent, 'code')
+ elif isinstance(node.parent, nodes.figure):
+ self.add_permalink_ref(node.parent, 'image')
+
if isinstance(node.parent, nodes.container) and node.parent.get('literal_block'):
self.body.append('</div>\n')
else:
@@ -575,20 +589,19 @@
def depart_title(self, node):
close_tag = self.context[-1]
if (self.permalink_text and self.builder.add_permalinks and
- node.parent.hasattr('ids') and node.parent['ids']):
- aname = node.parent['ids'][0]
+ node.parent.hasattr('ids') and node.parent['ids']):
# add permalink anchor
if close_tag.startswith('</h'):
- self.body.append(u'<a class="headerlink" href="#%s" ' % aname +
- u'title="%s">%s</a>' % (
- _('Permalink to this headline'),
- self.permalink_text))
+ self.add_permalink_ref(node.parent, 'headline')
elif close_tag.startswith('</a></h'):
self.body.append(u'</a><a class="headerlink" href="#%s" ' %
- aname +
+ node.parent['ids'][0] +
u'title="%s">%s' % (
_('Permalink to this headline'),
self.permalink_text))
+ elif isinstance(node.parent, nodes.table):
+ self.body.append('</span>')
+ self.add_permalink_ref(node.parent, 'table')

BaseTranslator.depart_title(self, node)


diff -r 6f3b5136c467c265031507c2c77708346d4c3f29 -r a005167bf558d198f58799262891f3909840fe89 tests/test_build_html.py
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -305,8 +305,13 @@

def check_xpath(etree, fname, path, check, be_found=True):
nodes = list(etree.findall(path))
- assert nodes != [], ('did not find any node matching xpath '
- '%r in file %s' % (path, fname))
+ if check is None:
+ assert nodes == [], ('found any nodes matching xpath '
+ '%r in file %s' % (path, fname))
+ return
+ else:
+ assert nodes != [], ('did not find any node matching xpath '
+ '%r in file %s' % (path, fname))
if hasattr(check, '__call__'):
check(nodes)
elif not check:
@@ -464,62 +469,32 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2$', True),
- (".//table/caption", '^should be Table 1$', True),
- (".//table/caption", '^should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.1.4$', True),
- (".//table/caption", '^should be Table 1.1$', True),
- (".//table/caption", '^should be Table 1.2$', True),
- (".//table/caption", '^should be Table 1.3$', True),
- (".//table/caption", '^should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.4$', True),
- (".//table/caption", '^should be Table 2.1$', True),
- (".//table/caption", '^should be Table 2.3$', True),
- (".//table/caption", '^should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^should be Fig.2.2$', True),
- (".//table/caption", '^should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", None, True),
+ (".//table/caption/span[@class='caption-number']", None, True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", None, True),
],
}

@@ -547,62 +522,72 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.9 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.10 should be Fig.2$', True),
- (".//table/caption", '^Table 9 should be Table 1$', True),
- (".//table/caption", '^Table 10 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^List 9 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^List 10 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.9 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.10 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 9 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 10 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 9 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 10 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.3 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.4 should be Fig.1.4$', True),
- (".//table/caption", '^Table 1 should be Table 1.1$', True),
- (".//table/caption", '^Table 2 should be Table 1.2$', True),
- (".//table/caption", '^Table 3 should be Table 1.3$', True),
- (".//table/caption", '^Table 4 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 3 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 4 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.5 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.7 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.8 should be Fig.2.4$', True),
- (".//table/caption", '^Table 5 should be Table 2.1$', True),
- (".//table/caption", '^Table 7 should be Table 2.3$', True),
- (".//table/caption", '^Table 8 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 5 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 7 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 8 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.5 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.7 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.8 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 5 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 7 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 8 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 5 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 7 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 8 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.6 should be Fig.2.2$', True),
- (".//table/caption", '^Table 6 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 6 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.6 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 6 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 6 $', True),
],
}

@@ -626,62 +611,72 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2 should be Fig.2$', True),
- (".//table/caption", '^Table 1 should be Table 1$', True),
- (".//table/caption", '^Table 2 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.2 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.3 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.4 should be Fig.1.4$', True),
- (".//table/caption", '^Table 1.1 should be Table 1.1$', True),
- (".//table/caption", '^Table 1.2 should be Table 1.2$', True),
- (".//table/caption", '^Table 1.3 should be Table 1.3$', True),
- (".//table/caption", '^Table 1.4 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.2 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.3 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.4 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.3 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.4 should be Fig.2.4$', True),
- (".//table/caption", '^Table 2.1 should be Table 2.1$', True),
- (".//table/caption", '^Table 2.3 should be Table 2.3$', True),
- (".//table/caption", '^Table 2.4 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.3 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.4 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.4 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.2 should be Fig.2.2$', True),
- (".//table/caption", '^Table 2.2 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.2 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.2 $', True),
],
}

@@ -699,68 +694,81 @@


@gen_with_app(buildername='html', testroot='numfig',
- confoverrides={'numfig': True, 'numfig_prefix': {'figure': 'Figure:', 'table': 'Tab_', 'code-block': 'Code-'}})
+ confoverrides={'numfig': True,
+ 'numfig_prefix': {'figure': 'Figure:',
+ 'table': 'Tab_',
+ 'code-block': 'Code-'}})
def test_numfig_with_prefix(app, status, warning):
app.builder.build_all()

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2 should be Fig.2$', True),
- (".//table/caption", '^Tab_1 should be Table 1$', True),
- (".//table/caption", '^Tab_2 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.2 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.3 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:1.4 should be Fig.1.4$', True),
- (".//table/caption", '^Tab_1.1 should be Table 1.1$', True),
- (".//table/caption", '^Tab_1.2 should be Table 1.2$', True),
- (".//table/caption", '^Tab_1.3 should be Table 1.3$', True),
- (".//table/caption", '^Tab_1.4 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.2 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.3 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^Code-1.4 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:1.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_1.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-1.4 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.1 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.3 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.4 should be Fig.2.4$', True),
- (".//table/caption", '^Tab_2.1 should be Table 2.1$', True),
- (".//table/caption", '^Tab_2.3 should be Table 2.3$', True),
- (".//table/caption", '^Tab_2.4 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.1 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.3 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.4 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.4 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.4 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.4 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Figure:2.2 should be Fig.2.2$', True),
- (".//table/caption", '^Tab_2.2 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^Code-2.2 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Figure:2.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Tab_2.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^Code-2.2 $', True),
],
}

@@ -784,62 +792,72 @@

expects = {
'index.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1 should be Fig.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2 should be Fig.2$', True),
- (".//table/caption", '^Table 1 should be Table 1$', True),
- (".//table/caption", '^Table 2 should be Table 2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1 should be List 1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2 should be List 2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2 $', True),
],
'foo.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1 should be Fig.1.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1.1 should be Fig.1.2$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.1.2 should be Fig.1.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.1.2.1 should be Fig.1.4$', True),
- (".//table/caption", '^Table 1.1 should be Table 1.1$', True),
- (".//table/caption", '^Table 1.1.1 should be Table 1.2$', True),
- (".//table/caption", '^Table 1.1.2 should be Table 1.3$', True),
- (".//table/caption", '^Table 1.2.1 should be Table 1.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1 should be List 1.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1.1 should be List 1.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.1.2 should be List 1.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 1.2.1 should be List 1.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.1.2 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.1.2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 1.2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 1.2.1 $', True),
],
'bar.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1.1 should be Fig.2.1$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1.3 should be Fig.2.3$', True),
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.2.1 should be Fig.2.4$', True),
- (".//table/caption", '^Table 2.1.1 should be Table 2.1$', True),
- (".//table/caption", '^Table 2.1.3 should be Table 2.3$', True),
- (".//table/caption", '^Table 2.2.1 should be Table 2.4$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1.1 should be List 2.1$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1.3 should be List 2.3$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.2.1 should be List 2.4$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1.1 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1.3 $', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.2.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1.1 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1.3 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.2.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1.1 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1.3 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.2.1 $', True),
],
'baz.html': [
- (".//div[@class='figure']/p[@class='caption']",
- '^Fig.2.1.2 should be Fig.2.2$', True),
- (".//table/caption", '^Table 2.1.2 should be Table 2.2$', True),
- (".//div[@class='code-block-caption']",
- '^List 2.1.2 should be List 2.2$', True),
+ (".//div[@class='figure']/p[@class='caption']/"
+ "span[@class='caption-number']", '^Fig.2.1.2 $', True),
+ (".//table/caption/span[@class='caption-number']",
+ '^Table 2.1.2 $', True),
+ (".//div[@class='code-block-caption']/"
+ "span[@class='caption-number']", '^List 2.1.2 $', True),
],
}


diff -r 6f3b5136c467c265031507c2c77708346d4c3f29 -r a005167bf558d198f58799262891f3909840fe89 tests/test_directive_code.py
--- a/tests/test_directive_code.py
+++ b/tests/test_directive_code.py
@@ -52,8 +52,11 @@
@with_app('html', testroot='directive-code')
def test_code_block_caption_html(app, status, warning):
app.builder.build(['caption'])
- html = (app.outdir / 'caption.html').text()
- caption = '<div class="code-block-caption">caption <em>test</em> rb</div>'
+ html = (app.outdir / 'caption.html').text(encoding='utf-8')
+ caption = (u'<div class="code-block-caption">'
+ u'<span class="caption-text">caption <em>test</em> rb'
+ u'</span><a class="headerlink" href="#id1" '
+ u'title="Permalink to this code">\xb6</a></div>')
assert caption in html


@@ -98,8 +101,11 @@
@with_app('html', testroot='directive-code')
def test_literalinclude_caption_html(app, status, warning):
app.builder.build('index')
- html = (app.outdir / 'caption.html').text()
- caption = '<div class="code-block-caption">caption <strong>test</strong> py</div>'
+ html = (app.outdir / 'caption.html').text(encoding='utf-8')
+ caption = (u'<div class="code-block-caption">'
+ u'<span class="caption-text">caption <strong>test</strong> py'
+ u'</span><a class="headerlink" href="#id2" '
+ u'title="Permalink to this code">\xb6</a></div>')
assert caption in html

Repository URL: https://bitbucket.org/birkenfeld/sphinx/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.