10000 Fix #5573: Use SVG in docs by mdboom · Pull Request #5677 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix #5573: Use SVG in docs #5677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2015
Merged

Fix #5573: Use SVG in docs #5677

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c66e1
Fix #5573: Use SVG in docs
mdboom Dec 14, 2015
f6b15c5
Fix format parsing
mdboom Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
10000
Diff view
Diff view
Prev Previous commit
Fix format parsing
  • Loading branch information
@mdboom
mdboom committed Dec 15, 2015
commit f6b15c5dd50ac97c42359bcf387699c13728a58e
35 changes: 17 additions & 18 deletions lib/matplotlib/sphinxext/plot_directive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,16 +537,7 @@ def clear_state(plot_rcparams, close=True):
matplotlib.rcParams.update(plot_rcparams)


def render_figures(code, code_path, output_dir, output_base, context,
function_name, config, context_reset=False,
close_figs=False):
"""
Run a pyplot script and save the images in *output_dir*.

Save the images under *output_dir* with file names derived from
*output_base*
"""
# -- Parse format list
def get_plot_formats(config):
default_dpi = {'png': 80, 'hires.png': 200, 'pdf': 200}
formats = []
plot_formats = config.plot_formats
Expand All @@ -562,10 +553,23 @@ def render_figures(code, code_path, output_dir, output_base, context,
formats.append((str(suffix), int(dpi)))
else:
formats.append((fmt, default_dpi.get(fmt, 80)))
elif type(fmt) in (tuple, list) and len(fmt)==2:
elif type(fmt) in (tuple, list) and len(fmt) == 2:
formats.append((str(fmt[0]), int(fmt[1])))
else:
raise PlotError('invalid image format "%r" in plot_formats' % fmt)
return formats


def render_figures(code, code_path, output_dir, output_base, context,
function_name, config, context_reset=False,
close_figs=False):
"""
Run a pyplot script and save the images in *output_dir*.

Save the images under *output_dir* with file names derived from
*output_base*
"""
formats = get_plot_formats(config)

# -- Try to determine if all images already exist

Expand Down 684E Expand Up @@ -665,13 +669,8 @@ def run(arguments, content, options, state_machine, state, lineno):
config = document.settings.env.config
nofigs = 'nofigs' in options

plot_formats = config.plot_formats
if isinstance(plot_formats, six.string_types):
# String Sphinx < 1.3, Split on , to mimic
# Sphinx 1.3 and later. Sphinx 1.3 always
# returns a list.
plot_formats = plot_formats.split(',')
default_fmt = plot_formats[0][0]
formats = get_plot_formats(config)
default_fmt = formats[0][0]

options.setdefault('include-source', config.plot_include_source)
keep_context = 'context' in options
Expand Down
0