Skip to content

GitLab

Commit 9ae41c1f authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #1757 from Lnaden/sphinxupdate 

Allow docs to build in Sphinx 1.3.1 and 1.5.1
parents 88da682c 256f47a4
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 2 deletions
docs-source/developerguide/conf.py
View file @ 9ae41c1f
...@@ -185,10 +185,16 @@ latex_elements = { ...@@ -185,10 +185,16 @@ latex_elements = {
\\usepackage{caption} \\usepackage{caption}
\\setcounter{tocdepth}{3} \\setcounter{tocdepth}{3}
\\captionsetup[figure]{labelformat=empty} \\captionsetup[figure]{labelformat=empty}
% Backwards compatibility for sphinx < 1.5
\\let\\DUspan\\null % force DUspan to be defined
\\renewcommand{\DUspan}[2]{% \\renewcommand{\DUspan}[2]{%
\\IfEqCase{#1}{% \\IfEqCase{#1}{%
{code}{\\small{}\\texttt{#2}\\normalsize{}}% {code}{\\small{}\\texttt{#2}\\normalsize{}}
}[\\PackageError{DUspan}{Unrecognized option passed to DUspan: #1}{}]% }[\\PackageError{DUspan}{Unrecognized option passed to DUspan: #1}{}]%
}%
% Sphinx > 1.5 compatibility (github.com/sphinx-doc/sphinx/issues/2231)
\\newcommand{\\DUrolecode}[1]{%
\\small{}\\texttt{#1}\\normalsize{}%
}%""", }%""",
} }
......
docs-source/usersguide/conf.py
View file @ 9ae41c1f
...@@ -185,10 +185,16 @@ latex_elements = { ...@@ -185,10 +185,16 @@ latex_elements = {
\\usepackage{caption} \\usepackage{caption}
\\setcounter{tocdepth}{3} \\setcounter{tocdepth}{3}
\\captionsetup[figure]{labelformat=empty} \\captionsetup[figure]{labelformat=empty}
% Backwards compatibility for sphinx < 1.5
\\let\\DUspan\\null % force DUspan to be defined
\\renewcommand{\DUspan}[2]{% \\renewcommand{\DUspan}[2]{%
\\IfEqCase{#1}{% \\IfEqCase{#1}{%
{code}{\\small{}\\texttt{#2}\\normalsize{}}% {code}{\\small{}\\texttt{#2}\\normalsize{}}
}[\\PackageError{DUspan}{Unrecognized option passed to DUspan: #1}{}]% }[\\PackageError{DUspan}{Unrecognized option passed to DUspan: #1}{}]%
}%
% Sphinx > 1.5 compatibility (github.com/sphinx-doc/sphinx/issues/2231)
\\newcommand{\\DUrolecode}[1]{%
\\small{}\\texttt{#1}\\normalsize{}%
}%""", }%""",
# Omit the index. # Omit the index.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment