diff options
Diffstat (limited to 'sphinx')
| -rw-r--r-- | sphinx/domains/std.py | 4 | ||||
| -rw-r--r-- | sphinx/texinputs/sphinx.sty | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index c351a15af..9869f71aa 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -712,13 +712,13 @@ class StandardDomain(Domain): else: title = env.config.numfig_format.get(figtype, '') - if figname is None and '%{name}' in title: + if figname is None and '{name}' in title: logger.warning('the link has no caption: %s', title, location=node) return contnode else: fignum = '.'.join(map(str, fignumber)) if '{name}' in title or 'number' in title: - # new style format (cf. "Fig.%{number}") + # new style format (cf. "Fig.{number}") if figname: newtitle = title.format(name=figname, number=fignum) else: diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 249e9ed9d..cc85ef935 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -1082,8 +1082,14 @@ % make commands known to non-Sphinx document classes \providecommand*{\sphinxtableofcontents}{\tableofcontents} -\providecommand*{\sphinxthebibliography}{\thebibliography} -\providecommand*{\sphinxtheindex}{\theindex} +\spx@ifundefined{sphinxthebibliography} + {\newenvironment + {sphinxthebibliography}{\begin{thebibliography}}{\end{thebibliography}}% + } + {}% else clause of ifundefined +\spx@ifundefined{sphinxtheindex} + {\newenvironment{sphinxtheindex}{\begin{theindex}}{\end{theindex}}}% + {}% else clause of ifundefined % remove LaTeX's cap on nesting depth if 'maxlistdepth' key used. % This is a hack, which works with the standard classes: it assumes \@toodeep |