Merge branch 'stable'

CHANGES

@@ -78,9 +78,16 @@ Documentation
 -------------
 
 
-Release 1.4.5 (in development)
+Release 1.4.6 (in development)
 ==============================
 
+Bugs fixed
+----------
+
+
+Release 1.4.5 (released Jul 13, 2016)
+=====================================
+
 Incompatible changes
 --------------------
 
@@ -103,6 +110,7 @@ Features added
 Bugs fixed
 ----------
 
+* jsdump fix for python 3: fixes the HTML search on python > 3
 * #2676: (latex) Error with verbatim text in captions since Sphinx 1.4.4
 * #2629: memoir class crashes LaTeX. Fixed ``by latex_keep_old_macro_names=False`` (ref 2675)
 * #2684: `sphinx.ext.intersphinx` crashes with six-1.4.1
@@ -126,6 +134,8 @@ Bugs fixed
 * #2723: extra spaces in latex pdf output from multirow cell
 * #2735: latexpdf ``Underfull \hbox (badness 10000)`` warnings from title page
 * #2667: latex crashes if resized images appeared in section title
+* #2763: (html) Provide default value for required ``alt`` attribute for image
+  tags of SVG source, required to validate and now consistent w/ other formats.
 
 
 Release 1.4.4 (released Jun 12, 2016)

sphinx/util/jsdump.py

@@ -19,7 +19,7 @@ from sphinx.util.pycompat import u
 _str_re  = re.compile(r'"(\\\\|\\"|[^"])*"')
 _int_re  = re.compile(r'\d+')
 _name_re = re.compile(r'[a-zA-Z]\w*')
-_nameonly_re = re.compile(r'[a-zA-Z]\w*$')
+_nameonly_re = re.compile(r'[a-zA-Z_][a-zA-Z0-9_]*$')
 
 # escape \, ", control characters and everything outside ASCII
 ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])')

sphinx/writers/html.py

@@ -458,15 +458,14 @@ class HTMLTranslator(BaseTranslator):
             node['uri'] = posixpath.join(self.builder.imgpath,
                                          self.builder.images[olduri])
 
-        if node['uri'].lower().endswith('svg') or \
+        uri = node['uri']
-           node['uri'].lower().endswith('svgz'):
+        if uri.lower().endswith('svg') or uri.lower().endswith('svgz'):
-            atts = {'src': node['uri']}
+            atts = {'src': uri}
             if 'width' in node:
                 atts['width'] = node['width']
             if 'height' in node:
                 atts['height'] = node['height']
-            if 'alt' in node:
+            atts['alt'] = node.get('alt', uri)
-                atts['alt'] = node['alt']
             if 'align' in node:
                 self.body.append('<div align="%s" class="align-%s">' %
                                  (node['align'], node['align']))

tests/test_util_jsdump.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+def test_jsdump():
+    from sphinx.util.jsdump import dumps
+
+    assert dumps({'1a': 1}) == '{"1a":1}'
+    assert dumps({'a1': 1}) == '{a1:1}'
+
+    assert dumps({u'a\xe8': 1}) == '{"a\\u00e8":1}'