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 #3034 from jfbu/use_sphinxoption_forkeepoldnames

Browse Source 
make sphinx latex style file use a package option
This commit is contained in:
Takeshi KOMIYA 2016-10-12 21:14:51 +09:00 committed by GitHub
commit 54d2084fc4
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/templates/latex/content.tex_t
View File

@ -1,6 +1,6 @@
%% Generated by Sphinx. %% Generated by Sphinx.
\def\sphinxdocclass{<%= docclass %>} \def\sphinxdocclass{<%= docclass %>}
\newif\ifsphinxKeepOldNames <%= keepoldnames %> <%= keepoldnames %>
\documentclass[<%= papersize %>,<%= pointsize %><%= classoptions %>]{<%= wrapperclass %>} \documentclass[<%= papersize %>,<%= pointsize %><%= classoptions %>]{<%= wrapperclass %>}
\ifdefined\pdfpxdimen \ifdefined\pdfpxdimen
\let\sphinxpxdimen\pdfpxdimen\else\newdimen\sphinxpxdimen \let\sphinxpxdimen\pdfpxdimen\else\newdimen\sphinxpxdimen

4
sphinx/texinputs/sphinx.sty
View File

@ -7,6 +7,10 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01] \NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sphinx}[2016/06/10 LaTeX package (Sphinx markup)] \ProvidesPackage{sphinx}[2016/06/10 LaTeX package (Sphinx markup)]
\newif\ifsphinxKeepOldNames \sphinxKeepOldNamestrue
\DeclareOption{dontkeepoldnames}{\sphinxKeepOldNamesfalse}
\DeclareOption*{\PackageWarning{sphinx}{Unknown option `\CurrentOption'}}
\ProcessOptions\relax
% this is the \ltx@ifundefined of ltxcmds.sty, which is loaded by % this is the \ltx@ifundefined of ltxcmds.sty, which is loaded by
% hyperref.sty, but we need it before, and initial ltxcmds.sty % hyperref.sty, but we need it before, and initial ltxcmds.sty

5
sphinx/writers/latex.py
View File

@ -350,9 +350,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
}) })
# set-up boolean for sphinx.sty # set-up boolean for sphinx.sty
if builder.config.latex_keep_old_macro_names: if builder.config.latex_keep_old_macro_names:
self.elements['keepoldnames'] = '\\sphinxKeepOldNamestrue' self.elements['keepoldnames'] = ''
else: else:
self.elements['keepoldnames'] = '\\sphinxKeepOldNamesfalse' self.elements['keepoldnames'] = ('\\PassOptionsToPackage'
'{dontkeepoldnames}{sphinx}')
if document.settings.docclass == 'howto': if document.settings.docclass == 'howto':
docclass = builder.config.latex_docclass.get('howto', 'article') docclass = builder.config.latex_docclass.get('howto', 'article')
else: else: