IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update error message for conflict of math extensions

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-04-28 14:08:10 +09:00
parent 9eae1a1c6e
commit b602370951
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/ext/imgmath.py
View File

@ -270,7 +270,7 @@ def setup(app):
try: try:
mathbase_setup(app, (html_visit_math, None), (html_visit_displaymath, None)) mathbase_setup(app, (html_visit_math, None), (html_visit_displaymath, None))
except ExtensionError: except ExtensionError:
raise ExtensionError('sphinx.ext.imgmath: other math package is already installed') raise ExtensionError('sphinx.ext.imgmath: other math package is already loaded')
app.add_config_value('imgmath_image_format', 'png', 'html') app.add_config_value('imgmath_image_format', 'png', 'html')
app.add_config_value('imgmath_dvipng', 'dvipng', 'html') app.add_config_value('imgmath_dvipng', 'dvipng', 'html')

2
sphinx/ext/mathjax.py
View File

@ -66,7 +66,7 @@ def setup(app):
try: try:
mathbase_setup(app, (html_visit_math, None), (html_visit_displaymath, None)) mathbase_setup(app, (html_visit_math, None), (html_visit_displaymath, None))
except ExtensionError: except ExtensionError:
raise ExtensionError('sphinx.ext.mathjax: other math package is already installed') raise ExtensionError('sphinx.ext.mathjax: other math package is already loaded')
# more information for mathjax secure url is here: # more information for mathjax secure url is here:
# http://docs.mathjax.org/en/latest/start.html#secure-access-to-the-cdn # http://docs.mathjax.org/en/latest/start.html#secure-access-to-the-cdn

2
sphinx/ext/pngmath.py
View File

@ -242,7 +242,7 @@ def setup(app):
try: try:
mathbase_setup(app, (html_visit_math, None), (html_visit_displaymath, None)) mathbase_setup(app, (html_visit_math, None), (html_visit_displaymath, None))
except ExtensionError: except ExtensionError:
raise ExtensionError('sphinx.ext.pngmath: other math package is already installed') raise ExtensionError('sphinx.ext.pngmath: other math package is already loaded')
app.add_config_value('pngmath_dvipng', 'dvipng', 'html') app.add_config_value('pngmath_dvipng', 'dvipng', 'html')
app.add_config_value('pngmath_latex', 'latex', 'html') app.add_config_value('pngmath_latex', 'latex', 'html')