IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2026-09-03 20:52:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix imgmath: crashes on showing error messages if image generation failed

Browse Source
This commit is contained in:
Takeshi KOMIYA
2016-11-21 20:06:23 +09:00
parent 36ca4ae393
commit 9690be4943
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -13,6 +13,7 @@ Bugs fixed
* #3150: Fix query word splitter in JavaScript. It behaves as same as Python's regular expression. * #3150: Fix query word splitter in JavaScript. It behaves as same as Python's regular expression.
* #3093: gettext build broken on substituted images. * #3093: gettext build broken on substituted images.
* #3093: gettext build broken on image node under ``note`` directive. * #3093: gettext build broken on image node under ``note`` directive.
* imgmath: crashes on showing error messages if image generation failed
Release 1.4.8 (released Oct 1, 2016) Release 1.4.8 (released Oct 1, 2016)
==================================== ====================================
sphinx/ext/imgmath.py
+3 -2
View File
@@ -245,10 +245,11 @@ def html_visit_displaymath(self, node):
try: try:
fname, depth = render_math(self, latex) fname, depth = render_math(self, latex)
except MathExtError as exc: except MathExtError as exc:
sm = nodes.system_message(str(exc), type='WARNING', level=2, msg = text_type(exc)
sm = nodes.system_message(msg, type='WARNING', level=2,
backrefs=[], source=node['latex']) backrefs=[], source=node['latex'])
sm.walkabout(self) sm.walkabout(self)
self.builder.warn('inline latex %r: ' % node['latex'] + str(exc)) self.builder.warn('inline latex %r: ' % node['latex'] + msg)
raise nodes.SkipNode raise nodes.SkipNode
self.body.append(self.starttag(node, 'div', CLASS='math')) self.body.append(self.starttag(node, 'div', CLASS='math'))
self.body.append('<p>') self.body.append('<p>')
sphinx/ext/pngmath.py
+3 -2
View File
@@ -218,10 +218,11 @@ def html_visit_displaymath(self, node):
try: try:
fname, depth = render_math(self, latex) fname, depth = render_math(self, latex)
except MathExtError as exc: except MathExtError as exc:
sm = nodes.system_message(str(exc), type='WARNING', level=2, msg = text_type(exc)
sm = nodes.system_message(msg, type='WARNING', level=2,
backrefs=[], source=node['latex']) backrefs=[], source=node['latex'])
sm.walkabout(self) sm.walkabout(self)
self.builder.warn('inline latex %r: ' % node['latex'] + str(exc)) self.builder.warn('inline latex %r: ' % node['latex'] + msg)
raise nodes.SkipNode raise nodes.SkipNode
self.body.append(self.starttag(node, 'div', CLASS='math')) self.body.append(self.starttag(node, 'div', CLASS='math'))
self.body.append('<p>') self.body.append('<p>')