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

Closes #1391: Actually prevent using "pngmath" and "mathjax" extensions at the same time in sphinx-quickstart.

Browse Source
This commit is contained in:
Georg Brandl
2014-03-01 09:23:09 +01:00
parent e736be637a
commit aa2f064e2f
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -15,6 +15,8 @@ Bugs fixed
* #1374: Fix for autosummary generating overly-long summaries if first line * #1374: Fix for autosummary generating overly-long summaries if first line
doesn't end with a period. doesn't end with a period.
* #1383: Fix Python 2.5 compatibility of sphinx-apidoc. * #1383: Fix Python 2.5 compatibility of sphinx-apidoc.
* #1391: Actually prevent using "pngmath" and "mathjax" extensions at the same
time in sphinx-quickstart.
Documentation Documentation
------------- -------------
sphinx/quickstart.py
+1
View File
@@ -1141,6 +1141,7 @@ Please indicate if you want to use one of the following Sphinx extensions:'''
if d['ext_pngmath'] and d['ext_mathjax']: if d['ext_pngmath'] and d['ext_mathjax']:
print '''Note: pngmath and mathjax cannot be enabled at the same time. print '''Note: pngmath and mathjax cannot be enabled at the same time.
pngmath has been deselected.''' pngmath has been deselected.'''
d['ext_pngmath'] = False
if 'ext_ifconfig' not in d: if 'ext_ifconfig' not in d:
do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of ' do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of '
'content based on config values (y/n)', 'n', boolean) 'content based on config values (y/n)', 'n', boolean)