summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHong Xu <hong@topbug.net>2015-12-23 19:08:30 -0800
committerHong Xu <hong@topbug.net>2015-12-29 15:14:04 -0800
commitea25284d0a8474aa55de54df23208c88c76a8128 (patch)
tree057d6232e598fc6fe8f3c4fc4de5f7e92d487fe6
parent657ebc2ab00c1bcbc53552f9d092692c583aadf4 (diff)
downloadsphinx-git-ea25284d0a8474aa55de54df23208c88c76a8128.tar.gz
Replace pngmath with imgmath in quickstart.
-rw-r--r--sphinx/quickstart.py16
-rw-r--r--tests/test_quickstart.py2
2 files changed, 9 insertions, 9 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index ffc4961dc..f4514a2b2 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -60,7 +60,7 @@ DEFAULT_VALUE = {
}
EXTENSIONS = ('autodoc', 'doctest', 'intersphinx', 'todo', 'coverage',
- 'pngmath', 'mathjax', 'ifconfig', 'viewcode')
+ 'imgmath', 'mathjax', 'ifconfig', 'viewcode')
PROMPT_PREFIX = '> '
@@ -1255,16 +1255,16 @@ Please indicate if you want to use one of the following Sphinx extensions:''')
if 'ext_coverage' not in d:
do_prompt(d, 'ext_coverage', 'coverage: checks for documentation '
'coverage (y/n)', 'n', boolean)
- if 'ext_pngmath' not in d:
- do_prompt(d, 'ext_pngmath', 'pngmath: include math, rendered '
- 'as PNG images (y/n)', 'n', boolean)
+ if 'ext_imgmath' not in d:
+ do_prompt(d, 'ext_imgmath', 'imgmath: include math, rendered '
+ 'as PNG or SVG images (y/n)', 'n', boolean)
if 'ext_mathjax' not in d:
do_prompt(d, 'ext_mathjax', 'mathjax: include math, rendered in the '
'browser by MathJax (y/n)', 'n', boolean)
- if d['ext_pngmath'] and d['ext_mathjax']:
- print('''Note: pngmath and mathjax cannot be enabled at the same time.
-pngmath has been deselected.''')
- d['ext_pngmath'] = False
+ if d['ext_imgmath'] and d['ext_mathjax']:
+ print('''Note: imgmath and mathjax cannot be enabled at the same time.
+imgmath has been deselected.''')
+ d['ext_imgmath'] = False
if 'ext_ifconfig' not in d:
do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of '
'content based on config values (y/n)', 'n', boolean)
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index 013700417..45ff8671d 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -181,7 +181,7 @@ def test_quickstart_all_answers(tempdir):
'intersphinx': 'no',
'todo': 'y',
'coverage': 'no',
- 'pngmath': 'N',
+ 'imgmath': 'N',
'mathjax': 'no',
'ifconfig': 'no',
'viewcode': 'no',