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 'usegeometrypackage'

Browse Source
This commit is contained in:
jfbu 2016-10-10 20:55:44 +02:00
commit 861973bfbb
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/config.rst
View File

@ -1675,6 +1675,12 @@ These options influence LaTeX output. See further :doc:`latex`.
example ``100px=1in``, one can use ``'0.01in'`` but it is more precise example ``100px=1in``, one can use ``'0.01in'`` but it is more precise
to use ``'47363sp'``. To obtain ``72px=1in``, use ``'1bp'``. to use ``'47363sp'``. To obtain ``72px=1in``, use ``'1bp'``.
.. versionadded:: 1.5
``'geometry'``
"geometry" package inclusion, the default definition is:
``'\\usepackage[margin=1in,marginparwidth=0.5in]{geometry}'``.
.. versionadded:: 1.5 .. versionadded:: 1.5
``'babel'`` ``'babel'``
"babel" package inclusion, default ``'\\usepackage{babel}'``. "babel" package inclusion, default ``'\\usepackage{babel}'``.

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

@ -6,6 +6,7 @@
\let\sphinxpxdimen\pdfpxdimen\else\newdimen\sphinxpxdimen \let\sphinxpxdimen\pdfpxdimen\else\newdimen\sphinxpxdimen
\fi \sphinxpxdimen=<%= pxunit %>\relax \fi \sphinxpxdimen=<%= pxunit %>\relax
<%= passoptionstopackages %> <%= passoptionstopackages %>
<%= geometry %>
<%= inputenc %> <%= inputenc %>
<%= utf8extra %> <%= utf8extra %>
<%= cmappkg %> <%= cmappkg %>

18
sphinx/texinputs/sphinx.sty
View File

@ -102,24 +102,6 @@
\def\py@TitleColor{\color{TitleColor}} \def\py@TitleColor{\color{TitleColor}}
\fi \fi
% Increase printable page size (copied from fullpage.sty)
\topmargin 0pt
\advance \topmargin by -\headheight
\advance \topmargin by -\headsep
% attempt to work a little better for A4 users
\textheight \paperheight
\advance\textheight by -2in
\oddsidemargin 0pt
\evensidemargin 0pt
%\evensidemargin -.25in % for ``manual size'' documents
\marginparwidth 0.5in
\textwidth \paperwidth
\advance\textwidth by -2in
% Style parameters and macros used by most documents here % Style parameters and macros used by most documents here
\raggedbottom \raggedbottom
\sloppy \sloppy

2
sphinx/writers/latex.py
View File

@ -265,6 +265,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
'classoptions': '', 'classoptions': '',
'extraclassoptions': '', 'extraclassoptions': '',
'passoptionstopackages': '', 'passoptionstopackages': '',
'geometry': '\\usepackage[margin=1in,marginparwidth=0.5in]'
'{geometry}',
'inputenc': '', 'inputenc': '',
'utf8extra': ('\\ifdefined\\DeclareUnicodeCharacter\n' 'utf8extra': ('\\ifdefined\\DeclareUnicodeCharacter\n'
' \\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n' ' \\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n'

2
tests/test_build_latex.py
View File

@ -28,7 +28,7 @@ from test_build_html import ENV_WARNINGS
LATEX_ENGINES = ['pdflatex', 'lualatex', 'xelatex'] LATEX_ENGINES = ['pdflatex', 'lualatex', 'xelatex']
DOCCLASSES = ['howto', 'manual'] DOCCLASSES = ['howto', 'manual']
STYLEFILES = ['article.sty', 'fancyhdr.sty', 'titlesec.sty', 'amsmath.sty', 'framed.sty', STYLEFILES = ['article.sty', 'fancyhdr.sty', 'titlesec.sty', 'amsmath.sty', 'framed.sty',
'color.sty', 'fancyvrb.sty', 'fncychap.sty', 'threeparttable.sty'] 'color.sty', 'fancyvrb.sty', 'threeparttable.sty', 'geometry.sty']
LATEX_WARNINGS = ENV_WARNINGS + """\ LATEX_WARNINGS = ENV_WARNINGS + """\
%(root)s/index.rst:\\d+: WARNING: unknown option: &option %(root)s/index.rst:\\d+: WARNING: unknown option: &option