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 pull request #4728 from jfbu/textcomp_warn

Browse Source 
Fix #4727: Option clash for package textcomp
This commit is contained in:
Jean-François B
2018-03-11 10:33:43 +01:00
committed by GitHub
parent e4fd16af9f 90dfce5367
commit 87e8dd16b2
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -23,6 +23,7 @@ Bugs fixed
* #4689: autosummary: unexpectedly strips docstrings containing "i.e." * #4689: autosummary: unexpectedly strips docstrings containing "i.e."
* #4701: viewcode: Misplaced ``<div>`` in viewcode html output * #4701: viewcode: Misplaced ``<div>`` in viewcode html output
* #4444: Don't require numfig to use :numref: on sections * #4444: Don't require numfig to use :numref: on sections
* #4727: Option clash for package textcomp
Testing Testing
-------- --------

1
sphinx/templates/latex/latex.tex_t
View File

@@ -14,6 +14,7 @@
\let\sphinxpxdimen\pdfpxdimen\else\newdimen\sphinxpxdimen \let\sphinxpxdimen\pdfpxdimen\else\newdimen\sphinxpxdimen
\fi \sphinxpxdimen=<%= pxunit %>\relax \fi \sphinxpxdimen=<%= pxunit %>\relax
<%= passoptionstopackages %> <%= passoptionstopackages %>
\PassOptionsToPackage{warn}{textcomp}
<%= inputenc %> <%= inputenc %>
<%= utf8extra %> <%= utf8extra %>
<%= cmappkg %> <%= cmappkg %>

4
sphinx/texinputs/sphinx.sty
View File

@@ -6,7 +6,7 @@
% %
\NeedsTeXFormat{LaTeX2e}[1995/12/01] \NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sphinx}[2017/12/12 v1.7 LaTeX package (Sphinx markup)] \ProvidesPackage{sphinx}[2018/03/11 v1.7.2 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
@@ -39,7 +39,7 @@
\@ifclassloaded{memoir}{}{\RequirePackage{fancyhdr}} \@ifclassloaded{memoir}{}{\RequirePackage{fancyhdr}}
% for \text macro and \iffirstchoice@ conditional even if amsmath not loaded % for \text macro and \iffirstchoice@ conditional even if amsmath not loaded
\RequirePackage{amstext} \RequirePackage{amstext}
\RequirePackage[warn]{textcomp} \RequirePackage{textcomp}% "warn" option issued from template
\RequirePackage{titlesec} \RequirePackage{titlesec}
\@ifpackagelater{titlesec}{2016/03/15}% \@ifpackagelater{titlesec}{2016/03/15}%
{\@ifpackagelater{titlesec}{2016/03/21}% {\@ifpackagelater{titlesec}{2016/03/21}%