IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
jfbu 2017-03-26 22:27:49 +02:00
commit f5f27c42d8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/texinputs/sphinx.sty
View File

@ -6,7 +6,7 @@
% %
\NeedsTeXFormat{LaTeX2e}[1995/12/01] \NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sphinx}[2017/03/12 v1.6 LaTeX package (Sphinx markup)] \ProvidesPackage{sphinx}[2017/03/26 v1.6 LaTeX package (Sphinx markup)]
% provides \ltx@ifundefined % provides \ltx@ifundefined
% (many packages load ltxcmds: graphicx does for pdftex and lualatex but % (many packages load ltxcmds: graphicx does for pdftex and lualatex but
@ -939,11 +939,11 @@
}} }}
% Same for \url. And also \nolinkurl for coherence. % Same for \url. And also \nolinkurl for coherence.
\protected\def\sphinxurl#1{{% \protected\def\sphinxurl#1{{%
\sphinxunactivateextrasandspace \sphinxunactivateextrasandspace\everyeof{}% (<- precaution for \scantokens)
\endlinechar\m@ne\scantokens{\url{#1}}% \endlinechar\m@ne\scantokens{\url{#1}}%
}} }}
\protected\def\sphinxnolinkurl#1{{% \protected\def\sphinxnolinkurl#1{{%
\sphinxunactivateextrasandspace \sphinxunactivateextrasandspace\everyeof{}%
\endlinechar\m@ne\scantokens{\nolinkurl{#1}}% \endlinechar\m@ne\scantokens{\nolinkurl{#1}}%
}} }}
@ -1328,7 +1328,7 @@
\fi \fi
% fix a space-gobbling issue due to LaTeX's original \do@noligs % fix a space-gobbling issue due to LaTeX's original \do@noligs
\let\do@noligs\sphinx@do@noligs \let\do@noligs\sphinx@do@noligs
\@noligs\endlinechar\m@ne \@noligs\endlinechar\m@ne\everyeof{}% (<- in case inside \sphinxhref)
\expandafter\scantokens \expandafter\scantokens
\fi {\texttt{#1}}}} \fi {\texttt{#1}}}}
\def\sphinx@do@noligs #1{\catcode`#1\active\begingroup\lccode`\~`#1\relax \def\sphinx@do@noligs #1{\catcode`#1\active\begingroup\lccode`\~`#1\relax

2
sphinx/texinputs/sphinxhowto.cls
View File

@ -3,7 +3,7 @@
% %
\NeedsTeXFormat{LaTeX2e}[1995/12/01] \NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{sphinxhowto}[2016/10/12 v1.5 Document class (Sphinx HOWTO)] \ProvidesClass{sphinxhowto}[2017/03/26 v1.6 Document class (Sphinx HOWTO)]
% 'oneside' option overriding the 'twoside' default % 'oneside' option overriding the 'twoside' default
\newif\if@oneside \newif\if@oneside

2
sphinx/texinputs/sphinxmanual.cls
View File

@ -3,7 +3,7 @@
% %
\NeedsTeXFormat{LaTeX2e}[1995/12/01] \NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{sphinxmanual}[2016/10/12 v1.5 Document class (Sphinx manual)] \ProvidesClass{sphinxmanual}[2017/03/26 v1.6 Document class (Sphinx manual)]
% chapters starting at odd pages (overridden by 'openany' document option) % chapters starting at odd pages (overridden by 'openany' document option)
\PassOptionsToClass{openright}{\sphinxdocclass} \PassOptionsToClass{openright}{\sphinxdocclass}