Skip to content

Commit e15ce0c

Browse files
committed
Add fallback_to_cm option, cleanup Figure docs
1 parent 2551348 commit e15ce0c

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

proplot/subplots.py

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -748,18 +748,24 @@ class Figure(mfigure.Figure):
748748

749749
def __init__(self,
750750
tight=None,
751-
pad=None, axpad=None, panelpad=None, includepanels=False,
751+
ref=1, pad=None, axpad=None, panelpad=None,
752+
includepanels=False,
752753
autoformat=True,
753-
ref=1, order='C', # documented in subplots but needed here
754-
subplots_kw=None, gridspec_kw=None, subplots_orig_kw=None,
755-
tight_layout=None, constrained_layout=None,
754+
gridspec_kw=None, subplots_kw=None, subplots_orig_kw=None,
755+
fallback_to_cm=None,
756756
**kwargs):
757757
"""
758758
Parameters
759759
----------
760760
tight : bool, optional
761-
Toggles automatic tight layout adjustments. Default is
762-
:rc:`tight`.
761+
Toggles automatic tight layout adjustments. Default is :rc:`tight`.
762+
If you manually specified a spacing in the call to `subplots`, it
763+
will be used to override the tight layout spacing. For example,
764+
with ``left=0.1``, the left margin is set to 0.1 inches wide,
765+
while the remaining margin widths are calculated automatically.
766+
ref : int, optional
767+
The reference subplot number. See `subplots` for details. Default
768+
is ``1``.
763769
pad : float or str, optional
764770
Padding around edge of figure. Units are interpreted by
765771
`~proplot.utils.units`. Default is :rc:`subplots.pad`.
@@ -781,17 +787,18 @@ def __init__(self,
781787
labels when a `~pandas.Series`, `~pandas.DataFrame` or
782788
`~xarray.DataArray` with relevant metadata is passed to a plotting
783789
command.
790+
fallback_to_cm : bool, optional
791+
Whether to replace unavailable glyphs with a glyph from Computer
792+
Modern or the "¤" dummy character. See `mathtext \
793+
<https://matplotlib.org/3.1.1/tutorials/text/mathtext.html#custom-fonts>`__
794+
for details.
784795
gridspec_kw, subplots_kw, subplots_orig_kw
785796
Keywords used for initializing the main gridspec, for initializing
786797
the figure, and original spacing keyword args used for initializing
787798
the figure that override tight layout spacing.
788799
789800
Other parameters
790801
----------------
791-
ref, order
792-
Documented in `subplots`.
793-
tight_layout, constrained_layout
794-
Ignored, because ProPlot uses its own tight layout algorithm.
795802
**kwargs
796803
Passed to `matplotlib.figure.Figure`.
797804
@@ -801,6 +808,8 @@ def __init__(self,
801808
"""
802809
# Initialize first, because need to provide fully initialized figure
803810
# as argument to gridspec, because matplotlib tight_layout does that
811+
tight_layout = kwargs.pop('tight_layout', None)
812+
constrained_layout = kwargs.pop('constrained_layout', None)
804813
if tight_layout or constrained_layout:
805814
_warn_proplot(
806815
f'Ignoring tight_layout={tight_layout} and '
@@ -815,7 +824,7 @@ def __init__(self,
815824
self._auto_format = autoformat
816825
self._auto_tight_layout = _notNone(tight, rc['tight'])
817826
self._include_panels = includepanels
818-
self._order = order # used for configuring panel subplot_grids
827+
self._fallback_to_cm = fallback_to_cm
819828
self._ref_num = ref
820829
self._axes_main = []
821830
self._subplots_orig_kw = subplots_orig_kw

0 commit comments

Comments
 (0)